diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bf410d66348..d1aaa00f8e8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <uses-permission android:name="com.google.android.providers.gmail.permission.READ_GMAIL" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
+    <uses-permission android:name="android.permission.DEVICE_POWER" />
     <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
     <uses-permission android:name="android.permission.VIBRATE" />
@@ -15,6 +16,7 @@
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.MASTER_CLEAR" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
     <uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
@@ -64,7 +66,7 @@
         <!-- Wireless Controls -->
 
         <activity android:name="WirelessSettings" 
-                android:label="@string/radio_controls_title"
+                android:label="@string/wireless_networks_settings_title"
                 >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -103,7 +105,7 @@
 
         <activity android:name="ApnSettings" android:label="@string/apn_settings"
                   android:configChanges="orientation|keyboardHidden"
-                  android:launchMode="singleInstance" 
+                  android:launchMode="singleTask"
                 >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -124,6 +126,10 @@
                 <category android:name="com.android.settings.SHORTCUT" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.bluetooth.devicepicker.action.LAUNCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
 
         <activity android:name=".vpn.VpnSettings"
@@ -176,7 +182,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="LanguageSettings" android:label="@string/language_picker_title"
+        <activity android:name="LanguageSettings"
+                android:label="@string/language_keyboard_settings_title"
                 android:clearTaskOnLaunch="true"
                 >
             <intent-filter>
@@ -209,7 +216,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="SoundAndDisplaySettings" android:label="@string/sound_and_display_settings"
+        <activity android:name="SoundAndDisplaySettings"
+                android:label="@string/sound_and_display_settings_title"
                 android:clearTaskOnLaunch="true"
                 >
             <intent-filter>
@@ -217,6 +225,7 @@
                 <action android:name="com.android.settings.SOUND_SETTINGS" />
                 <action android:name="com.android.settings.DISPLAY_SETTINGS" />
                 <action android:name="android.settings.DISPLAY_SETTINGS" />
+                <action android:name="android.settings.SOUND_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
@@ -241,6 +250,15 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="SettingsSafetyLegalActivity"
+                android:label="@string/settings_safetylegal_activity_title"
+                android:theme="@*android:style/Theme.Dialog.Alert">
+            <intent-filter>
+                <action android:name="android.settings.SAFETY" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="ApplicationSettings" android:label="@string/applications_settings_header"
                 >
             <intent-filter>
@@ -274,7 +292,20 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="SecuritySettings" android:label="@string/security_settings_title"
+        <activity android:name="RunningServices"
+                  android:label="@string/runningservices_settings_title"
+                  android:clearTaskOnLaunch="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.MONKEY" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+        </activity>
+        
+        <activity android:name="SecuritySettings"
+                android:label="@string/location_security_settings_title"
                 android:configChanges="orientation|keyboardHidden"
                 android:clearTaskOnLaunch="true"
                 >
@@ -282,14 +313,34 @@
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.SECURITY_SETTINGS" />
                 <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
-                <action android:name="android.security.ADD_CREDENTIAL" />
-                <action android:name="android.security.UNLOCK_CREDENTIAL_STORAGE" />
+                <action android:name="android.credentials.UNLOCK" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
         </activity>
 
+        <activity android:name="CredentialInstaller"
+                android:label="@string/credential_installer_activity_title">
+            <intent-filter>
+                <action android:name="android.credentials.SYSTEM_INSTALL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="PrivacySettings"
+                android:label="@string/privacy_settings_title"
+                android:configChanges="orientation|keyboardHidden"
+                android:clearTaskOnLaunch="true"
+                >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.PRIVACY_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="IccLockSettings" android:label="@string/sim_lock_settings"
                 android:process="com.android.phone">
             <intent-filter>
@@ -299,10 +350,12 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="AccessibilitySettings" android:label="@string/accessibility_settings_title"
-                android:theme="@android:style/Theme.NoTitleBar">
+        <activity android:name="AccessibilitySettings"
+                android:label="@string/accessibility_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.ACCESSIBILITY_SETTINGS" />
+                <!-- Wtf...  this action is bogus!  Can we remove it? -->
                 <action android:name="ACCESSIBILITY_FEEDBACK_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
@@ -353,7 +406,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".deviceinfo.Memory" android:label="@string/storage_settings_title">
+        <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" />
@@ -424,25 +478,46 @@
         <activity android:name=".bluetooth.ConnectSpecificProfilesActivity"
                   android:label="@string/bluetooth_connect_specific_profiles_title" />
 
-        <activity android:name=".bluetooth.BluetoothPinDialog"
-                  android:label="@string/bluetooth_pin_entry"
+        <activity android:name=".bluetooth.BluetoothPairingDialog"
+                  android:label="@string/bluetooth_pairing_request"
+                  android:excludeFromRecents="true"
                   android:theme="@*android:style/Theme.Dialog.Alert">
             <intent-filter>
-                <action android:name="android.bluetooth.intent.action.PAIRING_REQUEST" />
+                <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-        <receiver android:name=".bluetooth.BluetoothPinRequest">
+        <activity android:name=".bluetooth.RequestPermissionActivity"
+                  android:label="@string/bluetooth_permission_request"
+                  android:excludeFromRecents="true"
+                  android:permission="android.permission.BLUETOOTH"
+                  android:theme="@*android:style/Theme.Dialog.Alert">
             <intent-filter>
-                <action android:name="android.bluetooth.intent.action.PAIRING_REQUEST" />
-                <action android:name="android.bluetooth.intent.action.PAIRING_CANCEL" />
+                <action android:name="android.bluetooth.adapter.action.REQUEST_DISCOVERABLE" />
+                <action android:name="android.bluetooth.adapter.action.REQUEST_ENABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".bluetooth.RequestPermissionHelperActivity"
+                  android:label="@string/bluetooth_pairing_request"
+                  android:excludeFromRecents="true"
+                  android:permission="android.permission.BLUETOOTH"
+                  android:theme="@*android:style/Theme.Dialog.Alert">
+        </activity>
+
+        <receiver android:name=".bluetooth.BluetoothPairingRequest">
+            <intent-filter>
+                <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
+                <action android:name="android.bluetooth.device.action.PAIRING_CANCEL" />
             </intent-filter>
         </receiver>
 
         <activity android:name="ActivityPicker"
                 android:label="@string/activity_picker_label"
-                android:theme="@*android:style/Theme.Dialog.Alert">
+                android:theme="@*android:style/Theme.Dialog.Alert"
+                android:finishOnCloseSystemDialogs="true">
             <intent-filter>
                 <action android:name="android.intent.action.PICK_ACTIVITY" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -545,7 +620,8 @@
         <!-- Standard picker for widgets -->
         <activity android:name="AppWidgetPickActivity"
                 android:label="@string/widget_picker_title"
-                android:theme="@*android:style/Theme.Dialog.Alert">
+                android:theme="@*android:style/Theme.Dialog.Alert"
+                android:finishOnCloseSystemDialogs="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_PICK" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -590,7 +666,7 @@
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
                 <action android:name="android.net.conn.BACKGROUND_DATA_SETTING_CHANGED" />
-                <action android:name="android.bluetooth.intent.action.BLUETOOTH_STATE_CHANGED" />
+                <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
                 <action android:name="android.intent.action.CLOSE_SYSTEM_DIALOGS" /> <!-- pick up misc changes -->
             </intent-filter>
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />
diff --git a/res/drawable-hdpi/app_gauge.9.png b/res/drawable-hdpi/app_gauge.9.png
new file mode 100644
index 00000000000..ac79d21cdc1
Binary files /dev/null and b/res/drawable-hdpi/app_gauge.9.png differ
diff --git a/res/drawable-hdpi/app_settings.png b/res/drawable-hdpi/app_settings.png
new file mode 100644
index 00000000000..68b6ec6ba03
Binary files /dev/null and b/res/drawable-hdpi/app_settings.png differ
diff --git a/res/drawable-hdpi/appwidget_bg.9.png b/res/drawable-hdpi/appwidget_bg.9.png
new file mode 100644
index 00000000000..3b29eae77be
Binary files /dev/null and b/res/drawable-hdpi/appwidget_bg.9.png differ
diff --git a/res/drawable-hdpi/appwidget_inner_focus_c.9.png b/res/drawable-hdpi/appwidget_inner_focus_c.9.png
new file mode 100644
index 00000000000..a949bd2c3b6
Binary files /dev/null and b/res/drawable-hdpi/appwidget_inner_focus_c.9.png differ
diff --git a/res/drawable-hdpi/appwidget_inner_focus_l.9.png b/res/drawable-hdpi/appwidget_inner_focus_l.9.png
new file mode 100644
index 00000000000..4aaca6c504c
Binary files /dev/null and b/res/drawable-hdpi/appwidget_inner_focus_l.9.png differ
diff --git a/res/drawable-hdpi/appwidget_inner_focus_r.9.png b/res/drawable-hdpi/appwidget_inner_focus_r.9.png
new file mode 100644
index 00000000000..1fc0f900af9
Binary files /dev/null and b/res/drawable-hdpi/appwidget_inner_focus_r.9.png differ
diff --git a/res/drawable-hdpi/appwidget_inner_press_c.9.png b/res/drawable-hdpi/appwidget_inner_press_c.9.png
new file mode 100644
index 00000000000..ca6f16cd1df
Binary files /dev/null and b/res/drawable-hdpi/appwidget_inner_press_c.9.png differ
diff --git a/res/drawable-hdpi/appwidget_inner_press_l.9.png b/res/drawable-hdpi/appwidget_inner_press_l.9.png
new file mode 100644
index 00000000000..642eb3d326b
Binary files /dev/null and b/res/drawable-hdpi/appwidget_inner_press_l.9.png differ
diff --git a/res/drawable-hdpi/appwidget_inner_press_r.9.png b/res/drawable-hdpi/appwidget_inner_press_r.9.png
new file mode 100644
index 00000000000..5e1f70a39bc
Binary files /dev/null and b/res/drawable-hdpi/appwidget_inner_press_r.9.png differ
diff --git a/res/drawable-hdpi/appwidget_settings_divider.9.png b/res/drawable-hdpi/appwidget_settings_divider.9.png
new file mode 100644
index 00000000000..01a03bf6ae1
Binary files /dev/null and b/res/drawable-hdpi/appwidget_settings_divider.9.png differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_mid_c.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_c.9.png
new file mode 100644
index 00000000000..7b053c88f6f
Binary files /dev/null and b/res/drawable-hdpi/appwidget_settings_ind_mid_c.9.png differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_mid_l.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_l.9.png
new file mode 100644
index 00000000000..97e00f67135
Binary files /dev/null and b/res/drawable-hdpi/appwidget_settings_ind_mid_l.9.png differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_mid_r.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_r.9.png
new file mode 100644
index 00000000000..2922fc384f4
Binary files /dev/null and b/res/drawable-hdpi/appwidget_settings_ind_mid_r.9.png differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_off_c.9.png b/res/drawable-hdpi/appwidget_settings_ind_off_c.9.png
new file mode 100644
index 00000000000..10b02968cdb
Binary files /dev/null and b/res/drawable-hdpi/appwidget_settings_ind_off_c.9.png differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_off_l.9.png b/res/drawable-hdpi/appwidget_settings_ind_off_l.9.png
new file mode 100644
index 00000000000..5f217349eaa
Binary files /dev/null and b/res/drawable-hdpi/appwidget_settings_ind_off_l.9.png differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_off_r.9.png b/res/drawable-hdpi/appwidget_settings_ind_off_r.9.png
new file mode 100644
index 00000000000..c7d5dd7c9b7
Binary files /dev/null and b/res/drawable-hdpi/appwidget_settings_ind_off_r.9.png differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_on_c.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_c.9.png
new file mode 100644
index 00000000000..8b9872b5ad2
Binary files /dev/null and b/res/drawable-hdpi/appwidget_settings_ind_on_c.9.png differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_on_l.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_l.9.png
new file mode 100644
index 00000000000..0c80f61c18f
Binary files /dev/null and b/res/drawable-hdpi/appwidget_settings_ind_on_l.9.png differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_on_r.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_r.9.png
new file mode 100644
index 00000000000..f1f0b3d2356
Binary files /dev/null and b/res/drawable-hdpi/appwidget_settings_ind_on_r.9.png differ
diff --git a/res/drawable-hdpi/dotted_line_480px.png b/res/drawable-hdpi/dotted_line_480px.png
new file mode 100644
index 00000000000..4c25bae3853
Binary files /dev/null and b/res/drawable-hdpi/dotted_line_480px.png differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off.png b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off.png
new file mode 100644
index 00000000000..be96dd951fb
Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off.png differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on.png b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on.png
new file mode 100644
index 00000000000..0b7ccc66065
Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on.png differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_mid.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_mid.png
new file mode 100644
index 00000000000..c258d1c8323
Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_brightness_mid.png differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_off.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_off.png
new file mode 100644
index 00000000000..1bbde2d43fc
Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_brightness_off.png differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_on.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_on.png
new file mode 100644
index 00000000000..296ccb354cc
Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_brightness_on.png differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_gps_off.png b/res/drawable-hdpi/ic_appwidget_settings_gps_off.png
new file mode 100644
index 00000000000..ec6bcde68d5
Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_gps_off.png differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_gps_on.png b/res/drawable-hdpi/ic_appwidget_settings_gps_on.png
new file mode 100644
index 00000000000..e52caa41660
Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_gps_on.png differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_sync_off.png b/res/drawable-hdpi/ic_appwidget_settings_sync_off.png
new file mode 100644
index 00000000000..a0a46a58eab
Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_sync_off.png differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_sync_on.png b/res/drawable-hdpi/ic_appwidget_settings_sync_on.png
new file mode 100644
index 00000000000..1342751a663
Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_sync_on.png differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_wifi_off.png b/res/drawable-hdpi/ic_appwidget_settings_wifi_off.png
new file mode 100644
index 00000000000..cafb195378b
Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_wifi_off.png differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_wifi_on.png b/res/drawable-hdpi/ic_appwidget_settings_wifi_on.png
new file mode 100644
index 00000000000..c6ac993ddff
Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_wifi_on.png differ
diff --git a/res/drawable-hdpi/ic_bt_cellphone.png b/res/drawable-hdpi/ic_bt_cellphone.png
new file mode 100644
index 00000000000..a3571ad8ecf
Binary files /dev/null and b/res/drawable-hdpi/ic_bt_cellphone.png differ
diff --git a/res/drawable-hdpi/ic_bt_headphones_a2dp.png b/res/drawable-hdpi/ic_bt_headphones_a2dp.png
new file mode 100644
index 00000000000..777094ee3a1
Binary files /dev/null and b/res/drawable-hdpi/ic_bt_headphones_a2dp.png differ
diff --git a/res/drawable-hdpi/ic_bt_headset_hfp.png b/res/drawable-hdpi/ic_bt_headset_hfp.png
new file mode 100644
index 00000000000..6450b4b9b6a
Binary files /dev/null and b/res/drawable-hdpi/ic_bt_headset_hfp.png differ
diff --git a/res/drawable-hdpi/ic_bt_laptop.png b/res/drawable-hdpi/ic_bt_laptop.png
new file mode 100644
index 00000000000..6a04c1d9234
Binary files /dev/null and b/res/drawable-hdpi/ic_bt_laptop.png differ
diff --git a/res/drawable-hdpi/ic_btn_next.png b/res/drawable-hdpi/ic_btn_next.png
new file mode 100644
index 00000000000..ad00a956a8e
Binary files /dev/null and b/res/drawable-hdpi/ic_btn_next.png differ
diff --git a/res/drawable-hdpi/ic_launcher_settings.png b/res/drawable-hdpi/ic_launcher_settings.png
new file mode 100644
index 00000000000..ff34a7ffcc4
Binary files /dev/null and b/res/drawable-hdpi/ic_launcher_settings.png differ
diff --git a/res/drawable-hdpi/ic_menu_3d_globe.png b/res/drawable-hdpi/ic_menu_3d_globe.png
new file mode 100644
index 00000000000..0858fec50be
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_3d_globe.png differ
diff --git a/res/drawable-hdpi/ic_menu_add.png b/res/drawable-hdpi/ic_menu_add.png
new file mode 100644
index 00000000000..65cc01eb7e4
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_add.png differ
diff --git a/res/drawable-hdpi/ic_menu_filter_settings.png b/res/drawable-hdpi/ic_menu_filter_settings.png
new file mode 100644
index 00000000000..a6777e92798
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_filter_settings.png differ
diff --git a/res/drawable-hdpi/ic_menu_scan_network.png b/res/drawable-hdpi/ic_menu_scan_network.png
new file mode 100644
index 00000000000..196ece002eb
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_scan_network.png differ
diff --git a/res/drawable-hdpi/ic_network_signal_0.png b/res/drawable-hdpi/ic_network_signal_0.png
new file mode 100644
index 00000000000..6bbf947514b
Binary files /dev/null and b/res/drawable-hdpi/ic_network_signal_0.png differ
diff --git a/res/drawable-hdpi/ic_network_signal_1.png b/res/drawable-hdpi/ic_network_signal_1.png
new file mode 100644
index 00000000000..d3aa559e30a
Binary files /dev/null and b/res/drawable-hdpi/ic_network_signal_1.png differ
diff --git a/res/drawable-hdpi/ic_network_signal_2.png b/res/drawable-hdpi/ic_network_signal_2.png
new file mode 100644
index 00000000000..9c4828517f5
Binary files /dev/null and b/res/drawable-hdpi/ic_network_signal_2.png differ
diff --git a/res/drawable-hdpi/ic_network_signal_3.png b/res/drawable-hdpi/ic_network_signal_3.png
new file mode 100644
index 00000000000..3e94fc5ab9b
Binary files /dev/null and b/res/drawable-hdpi/ic_network_signal_3.png differ
diff --git a/res/drawable-hdpi/ic_network_signal_4.png b/res/drawable-hdpi/ic_network_signal_4.png
new file mode 100644
index 00000000000..e29b3aec3e6
Binary files /dev/null and b/res/drawable-hdpi/ic_network_signal_4.png differ
diff --git a/res/drawable-hdpi/ic_popup_brightness.png b/res/drawable-hdpi/ic_popup_brightness.png
new file mode 100644
index 00000000000..a68b44f686e
Binary files /dev/null and b/res/drawable-hdpi/ic_popup_brightness.png differ
diff --git a/res/drawable-hdpi/ic_settings_about.png b/res/drawable-hdpi/ic_settings_about.png
new file mode 100755
index 00000000000..ea8234a2443
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_about.png differ
diff --git a/res/drawable-hdpi/ic_settings_accessibility.png b/res/drawable-hdpi/ic_settings_accessibility.png
new file mode 100755
index 00000000000..8390084d405
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_accessibility.png differ
diff --git a/res/drawable-hdpi/ic_settings_applications.png b/res/drawable-hdpi/ic_settings_applications.png
new file mode 100755
index 00000000000..5cea33f487a
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_applications.png differ
diff --git a/res/drawable-hdpi/ic_settings_bluetooth.png b/res/drawable-hdpi/ic_settings_bluetooth.png
new file mode 100644
index 00000000000..3d9015fc862
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_bluetooth.png differ
diff --git a/res/drawable-hdpi/ic_settings_call.png b/res/drawable-hdpi/ic_settings_call.png
new file mode 100755
index 00000000000..e1c7fea3635
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_call.png differ
diff --git a/res/drawable-hdpi/ic_settings_cell_standby.png b/res/drawable-hdpi/ic_settings_cell_standby.png
new file mode 100644
index 00000000000..262a8609387
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_cell_standby.png differ
diff --git a/res/drawable-hdpi/ic_settings_date_time.png b/res/drawable-hdpi/ic_settings_date_time.png
new file mode 100755
index 00000000000..dd479276a55
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_date_time.png differ
diff --git a/res/drawable-hdpi/ic_settings_display.png b/res/drawable-hdpi/ic_settings_display.png
new file mode 100644
index 00000000000..20568d22772
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_display.png differ
diff --git a/res/drawable-hdpi/ic_settings_language.png b/res/drawable-hdpi/ic_settings_language.png
new file mode 100755
index 00000000000..475b04e0a94
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_language.png differ
diff --git a/res/drawable-hdpi/ic_settings_phone_idle.png b/res/drawable-hdpi/ic_settings_phone_idle.png
new file mode 100644
index 00000000000..fd66f84acfe
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_phone_idle.png differ
diff --git a/res/drawable-hdpi/ic_settings_privacy.png b/res/drawable-hdpi/ic_settings_privacy.png
new file mode 100644
index 00000000000..5fb60c2e094
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_privacy.png differ
diff --git a/res/drawable-hdpi/ic_settings_search.png b/res/drawable-hdpi/ic_settings_search.png
new file mode 100755
index 00000000000..ec07f370313
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_search.png differ
diff --git a/res/drawable-hdpi/ic_settings_security.png b/res/drawable-hdpi/ic_settings_security.png
new file mode 100755
index 00000000000..54fb7996d0a
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_security.png differ
diff --git a/res/drawable-hdpi/ic_settings_sound_display.png b/res/drawable-hdpi/ic_settings_sound_display.png
new file mode 100755
index 00000000000..6ed90399ece
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_sound_display.png differ
diff --git a/res/drawable-hdpi/ic_settings_speech.png b/res/drawable-hdpi/ic_settings_speech.png
new file mode 100755
index 00000000000..8268f64af64
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_speech.png differ
diff --git a/res/drawable-hdpi/ic_settings_storage.png b/res/drawable-hdpi/ic_settings_storage.png
new file mode 100755
index 00000000000..fbdc5487fce
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_storage.png differ
diff --git a/res/drawable-hdpi/ic_settings_sync.png b/res/drawable-hdpi/ic_settings_sync.png
new file mode 100755
index 00000000000..d8544d97b7e
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_sync.png differ
diff --git a/res/drawable-hdpi/ic_settings_voice_calls.png b/res/drawable-hdpi/ic_settings_voice_calls.png
new file mode 100644
index 00000000000..3cb7e49025c
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_voice_calls.png differ
diff --git a/res/drawable-hdpi/ic_settings_wifi.png b/res/drawable-hdpi/ic_settings_wifi.png
new file mode 100644
index 00000000000..b8c3eaad35c
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_wifi.png differ
diff --git a/res/drawable-hdpi/ic_settings_wireless.png b/res/drawable-hdpi/ic_settings_wireless.png
new file mode 100755
index 00000000000..b96ad00156a
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_wireless.png differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1.png b/res/drawable-hdpi/ic_wifi_lock_signal_1.png
new file mode 100644
index 00000000000..688df559d3e
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_1.png differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2.png b/res/drawable-hdpi/ic_wifi_lock_signal_2.png
new file mode 100644
index 00000000000..a88675b6a4b
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_2.png differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3.png b/res/drawable-hdpi/ic_wifi_lock_signal_3.png
new file mode 100644
index 00000000000..1b8e15acbd7
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_3.png differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4.png b/res/drawable-hdpi/ic_wifi_lock_signal_4.png
new file mode 100644
index 00000000000..9ad64328fe6
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_4.png differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_1.png b/res/drawable-hdpi/ic_wifi_signal_1.png
new file mode 100644
index 00000000000..b27f69bfa04
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_1.png differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_2.png b/res/drawable-hdpi/ic_wifi_signal_2.png
new file mode 100644
index 00000000000..5ea37f22ea9
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_2.png differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_3.png b/res/drawable-hdpi/ic_wifi_signal_3.png
new file mode 100644
index 00000000000..f8c0221ded8
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_3.png differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_4.png b/res/drawable-hdpi/ic_wifi_signal_4.png
new file mode 100644
index 00000000000..b62bf35a70e
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_4.png differ
diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png
new file mode 100644
index 00000000000..c30cc55a430
Binary files /dev/null and b/res/drawable-hdpi/icon.png differ
diff --git a/res/drawable-hdpi/lock_anim_00.png b/res/drawable-hdpi/lock_anim_00.png
new file mode 100644
index 00000000000..08732e44f7b
Binary files /dev/null and b/res/drawable-hdpi/lock_anim_00.png differ
diff --git a/res/drawable-hdpi/lock_anim_02.png b/res/drawable-hdpi/lock_anim_02.png
new file mode 100644
index 00000000000..495b2da490a
Binary files /dev/null and b/res/drawable-hdpi/lock_anim_02.png differ
diff --git a/res/drawable-hdpi/lock_anim_04.png b/res/drawable-hdpi/lock_anim_04.png
new file mode 100644
index 00000000000..8201fd94d54
Binary files /dev/null and b/res/drawable-hdpi/lock_anim_04.png differ
diff --git a/res/drawable-hdpi/lock_anim_06.png b/res/drawable-hdpi/lock_anim_06.png
new file mode 100644
index 00000000000..dac09e1573c
Binary files /dev/null and b/res/drawable-hdpi/lock_anim_06.png differ
diff --git a/res/drawable-hdpi/lock_anim_08.png b/res/drawable-hdpi/lock_anim_08.png
new file mode 100644
index 00000000000..07f7e347728
Binary files /dev/null and b/res/drawable-hdpi/lock_anim_08.png differ
diff --git a/res/drawable-hdpi/lock_anim_10.png b/res/drawable-hdpi/lock_anim_10.png
new file mode 100644
index 00000000000..adb981d257e
Binary files /dev/null and b/res/drawable-hdpi/lock_anim_10.png differ
diff --git a/res/drawable-hdpi/lock_anim_12.png b/res/drawable-hdpi/lock_anim_12.png
new file mode 100644
index 00000000000..3ccdc850b20
Binary files /dev/null and b/res/drawable-hdpi/lock_anim_12.png differ
diff --git a/res/drawable-hdpi/lock_anim_14.png b/res/drawable-hdpi/lock_anim_14.png
new file mode 100644
index 00000000000..2f40d9e4996
Binary files /dev/null and b/res/drawable-hdpi/lock_anim_14.png differ
diff --git a/res/drawable/app_gauge.9.png b/res/drawable-mdpi/app_gauge.9.png
similarity index 100%
rename from res/drawable/app_gauge.9.png
rename to res/drawable-mdpi/app_gauge.9.png
diff --git a/res/drawable/app_settings.png b/res/drawable-mdpi/app_settings.png
similarity index 100%
rename from res/drawable/app_settings.png
rename to res/drawable-mdpi/app_settings.png
diff --git a/res/drawable-mdpi/appwidget_bg.9.png b/res/drawable-mdpi/appwidget_bg.9.png
new file mode 100644
index 00000000000..afe41b671e0
Binary files /dev/null and b/res/drawable-mdpi/appwidget_bg.9.png differ
diff --git a/res/drawable-mdpi/appwidget_inner_focus_c.9.png b/res/drawable-mdpi/appwidget_inner_focus_c.9.png
new file mode 100644
index 00000000000..1450e65b11f
Binary files /dev/null and b/res/drawable-mdpi/appwidget_inner_focus_c.9.png differ
diff --git a/res/drawable-mdpi/appwidget_inner_focus_l.9.png b/res/drawable-mdpi/appwidget_inner_focus_l.9.png
new file mode 100644
index 00000000000..6e8f100e4c1
Binary files /dev/null and b/res/drawable-mdpi/appwidget_inner_focus_l.9.png differ
diff --git a/res/drawable-mdpi/appwidget_inner_focus_r.9.png b/res/drawable-mdpi/appwidget_inner_focus_r.9.png
new file mode 100644
index 00000000000..bc8757b88c6
Binary files /dev/null and b/res/drawable-mdpi/appwidget_inner_focus_r.9.png differ
diff --git a/res/drawable-mdpi/appwidget_inner_press_c.9.png b/res/drawable-mdpi/appwidget_inner_press_c.9.png
new file mode 100644
index 00000000000..bd542bac6e9
Binary files /dev/null and b/res/drawable-mdpi/appwidget_inner_press_c.9.png differ
diff --git a/res/drawable-mdpi/appwidget_inner_press_l.9.png b/res/drawable-mdpi/appwidget_inner_press_l.9.png
new file mode 100644
index 00000000000..575ecf4e13a
Binary files /dev/null and b/res/drawable-mdpi/appwidget_inner_press_l.9.png differ
diff --git a/res/drawable-mdpi/appwidget_inner_press_r.9.png b/res/drawable-mdpi/appwidget_inner_press_r.9.png
new file mode 100644
index 00000000000..79eaea35a68
Binary files /dev/null and b/res/drawable-mdpi/appwidget_inner_press_r.9.png differ
diff --git a/res/drawable-mdpi/appwidget_settings_divider.9.png b/res/drawable-mdpi/appwidget_settings_divider.9.png
new file mode 100644
index 00000000000..73c9a27492b
Binary files /dev/null and b/res/drawable-mdpi/appwidget_settings_divider.9.png differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_mid_c.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_c.9.png
new file mode 100644
index 00000000000..fee031d76e7
Binary files /dev/null and b/res/drawable-mdpi/appwidget_settings_ind_mid_c.9.png differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_mid_l.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_l.9.png
new file mode 100644
index 00000000000..6549420f138
Binary files /dev/null and b/res/drawable-mdpi/appwidget_settings_ind_mid_l.9.png differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_mid_r.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_r.9.png
new file mode 100644
index 00000000000..ab124522ef9
Binary files /dev/null and b/res/drawable-mdpi/appwidget_settings_ind_mid_r.9.png differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_off_c.9.png b/res/drawable-mdpi/appwidget_settings_ind_off_c.9.png
new file mode 100644
index 00000000000..d9440f37209
Binary files /dev/null and b/res/drawable-mdpi/appwidget_settings_ind_off_c.9.png differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_off_l.9.png b/res/drawable-mdpi/appwidget_settings_ind_off_l.9.png
new file mode 100644
index 00000000000..a10a47abae1
Binary files /dev/null and b/res/drawable-mdpi/appwidget_settings_ind_off_l.9.png differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_off_r.9.png b/res/drawable-mdpi/appwidget_settings_ind_off_r.9.png
new file mode 100644
index 00000000000..ce766d031c3
Binary files /dev/null and b/res/drawable-mdpi/appwidget_settings_ind_off_r.9.png differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_on_c.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_c.9.png
new file mode 100644
index 00000000000..72a86231d9b
Binary files /dev/null and b/res/drawable-mdpi/appwidget_settings_ind_on_c.9.png differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_on_l.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_l.9.png
new file mode 100644
index 00000000000..75f6f74c982
Binary files /dev/null and b/res/drawable-mdpi/appwidget_settings_ind_on_l.9.png differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_on_r.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_r.9.png
new file mode 100644
index 00000000000..0f8975cb286
Binary files /dev/null and b/res/drawable-mdpi/appwidget_settings_ind_on_r.9.png differ
diff --git a/res/drawable/dotted_line_480px.png b/res/drawable-mdpi/dotted_line_480px.png
similarity index 100%
rename from res/drawable/dotted_line_480px.png
rename to res/drawable-mdpi/dotted_line_480px.png
diff --git a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off.png b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off.png
new file mode 100644
index 00000000000..fd2572e212a
Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off.png differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on.png b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on.png
new file mode 100644
index 00000000000..99441d410a7
Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on.png differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_mid.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_mid.png
new file mode 100644
index 00000000000..5ffef7a37b9
Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_brightness_mid.png differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_off.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_off.png
new file mode 100644
index 00000000000..6e3ee2ed4ad
Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_brightness_off.png differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_on.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_on.png
new file mode 100644
index 00000000000..b0f741a406a
Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_brightness_on.png differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_gps_off.png b/res/drawable-mdpi/ic_appwidget_settings_gps_off.png
new file mode 100644
index 00000000000..c0dd0502fc9
Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_gps_off.png differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_gps_on.png b/res/drawable-mdpi/ic_appwidget_settings_gps_on.png
new file mode 100644
index 00000000000..b6913dfe730
Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_gps_on.png differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_sync_off.png b/res/drawable-mdpi/ic_appwidget_settings_sync_off.png
new file mode 100644
index 00000000000..58fdf56477f
Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_sync_off.png differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_sync_on.png b/res/drawable-mdpi/ic_appwidget_settings_sync_on.png
new file mode 100644
index 00000000000..2b062ec7332
Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_sync_on.png differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_wifi_off.png b/res/drawable-mdpi/ic_appwidget_settings_wifi_off.png
new file mode 100644
index 00000000000..0736b136b60
Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_wifi_off.png differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_wifi_on.png b/res/drawable-mdpi/ic_appwidget_settings_wifi_on.png
new file mode 100644
index 00000000000..a76c36c0adf
Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_wifi_on.png differ
diff --git a/res/drawable/ic_bt_cellphone.png b/res/drawable-mdpi/ic_bt_cellphone.png
similarity index 100%
rename from res/drawable/ic_bt_cellphone.png
rename to res/drawable-mdpi/ic_bt_cellphone.png
diff --git a/res/drawable/ic_bt_headphones_a2dp.png b/res/drawable-mdpi/ic_bt_headphones_a2dp.png
similarity index 100%
rename from res/drawable/ic_bt_headphones_a2dp.png
rename to res/drawable-mdpi/ic_bt_headphones_a2dp.png
diff --git a/res/drawable/ic_bt_headset_hfp.png b/res/drawable-mdpi/ic_bt_headset_hfp.png
similarity index 100%
rename from res/drawable/ic_bt_headset_hfp.png
rename to res/drawable-mdpi/ic_bt_headset_hfp.png
diff --git a/res/drawable/ic_bt_laptop.png b/res/drawable-mdpi/ic_bt_laptop.png
similarity index 100%
rename from res/drawable/ic_bt_laptop.png
rename to res/drawable-mdpi/ic_bt_laptop.png
diff --git a/res/drawable/ic_btn_next.png b/res/drawable-mdpi/ic_btn_next.png
similarity index 100%
rename from res/drawable/ic_btn_next.png
rename to res/drawable-mdpi/ic_btn_next.png
diff --git a/res/drawable/ic_launcher_settings.png b/res/drawable-mdpi/ic_launcher_settings.png
similarity index 100%
rename from res/drawable/ic_launcher_settings.png
rename to res/drawable-mdpi/ic_launcher_settings.png
diff --git a/res/drawable/ic_menu_3d_globe.png b/res/drawable-mdpi/ic_menu_3d_globe.png
similarity index 100%
rename from res/drawable/ic_menu_3d_globe.png
rename to res/drawable-mdpi/ic_menu_3d_globe.png
diff --git a/res/drawable/ic_menu_add.png b/res/drawable-mdpi/ic_menu_add.png
similarity index 100%
rename from res/drawable/ic_menu_add.png
rename to res/drawable-mdpi/ic_menu_add.png
diff --git a/res/drawable/ic_menu_filter_settings.png b/res/drawable-mdpi/ic_menu_filter_settings.png
similarity index 100%
rename from res/drawable/ic_menu_filter_settings.png
rename to res/drawable-mdpi/ic_menu_filter_settings.png
diff --git a/res/drawable/ic_menu_scan_network.png b/res/drawable-mdpi/ic_menu_scan_network.png
similarity index 100%
rename from res/drawable/ic_menu_scan_network.png
rename to res/drawable-mdpi/ic_menu_scan_network.png
diff --git a/res/drawable/ic_network_signal_0.png b/res/drawable-mdpi/ic_network_signal_0.png
similarity index 100%
rename from res/drawable/ic_network_signal_0.png
rename to res/drawable-mdpi/ic_network_signal_0.png
diff --git a/res/drawable/ic_network_signal_1.png b/res/drawable-mdpi/ic_network_signal_1.png
similarity index 100%
rename from res/drawable/ic_network_signal_1.png
rename to res/drawable-mdpi/ic_network_signal_1.png
diff --git a/res/drawable/ic_network_signal_2.png b/res/drawable-mdpi/ic_network_signal_2.png
similarity index 100%
rename from res/drawable/ic_network_signal_2.png
rename to res/drawable-mdpi/ic_network_signal_2.png
diff --git a/res/drawable/ic_network_signal_3.png b/res/drawable-mdpi/ic_network_signal_3.png
similarity index 100%
rename from res/drawable/ic_network_signal_3.png
rename to res/drawable-mdpi/ic_network_signal_3.png
diff --git a/res/drawable/ic_network_signal_4.png b/res/drawable-mdpi/ic_network_signal_4.png
similarity index 100%
rename from res/drawable/ic_network_signal_4.png
rename to res/drawable-mdpi/ic_network_signal_4.png
diff --git a/res/drawable/ic_popup_brightness.png b/res/drawable-mdpi/ic_popup_brightness.png
similarity index 100%
rename from res/drawable/ic_popup_brightness.png
rename to res/drawable-mdpi/ic_popup_brightness.png
diff --git a/res/drawable-mdpi/ic_settings_about.png b/res/drawable-mdpi/ic_settings_about.png
new file mode 100755
index 00000000000..b84d9447738
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_about.png differ
diff --git a/res/drawable-mdpi/ic_settings_accessibility.png b/res/drawable-mdpi/ic_settings_accessibility.png
new file mode 100755
index 00000000000..71663ee3895
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_accessibility.png differ
diff --git a/res/drawable-mdpi/ic_settings_applications.png b/res/drawable-mdpi/ic_settings_applications.png
new file mode 100755
index 00000000000..745ff2a1598
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_applications.png differ
diff --git a/res/drawable-mdpi/ic_settings_bluetooth.png b/res/drawable-mdpi/ic_settings_bluetooth.png
new file mode 100644
index 00000000000..8cf80c0420d
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_bluetooth.png differ
diff --git a/res/drawable-mdpi/ic_settings_call.png b/res/drawable-mdpi/ic_settings_call.png
new file mode 100755
index 00000000000..b4cf0db14c7
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_call.png differ
diff --git a/res/drawable-mdpi/ic_settings_cell_standby.png b/res/drawable-mdpi/ic_settings_cell_standby.png
new file mode 100644
index 00000000000..0ac7b5d1741
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_cell_standby.png differ
diff --git a/res/drawable-mdpi/ic_settings_date_time.png b/res/drawable-mdpi/ic_settings_date_time.png
new file mode 100755
index 00000000000..cc8d774d892
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_date_time.png differ
diff --git a/res/drawable-mdpi/ic_settings_display.png b/res/drawable-mdpi/ic_settings_display.png
new file mode 100644
index 00000000000..b676b85f83e
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_display.png differ
diff --git a/res/drawable-mdpi/ic_settings_language.png b/res/drawable-mdpi/ic_settings_language.png
new file mode 100755
index 00000000000..df271d6d426
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_language.png differ
diff --git a/res/drawable-mdpi/ic_settings_phone_idle.png b/res/drawable-mdpi/ic_settings_phone_idle.png
new file mode 100644
index 00000000000..7734b09d9db
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_phone_idle.png differ
diff --git a/res/drawable-mdpi/ic_settings_privacy.png b/res/drawable-mdpi/ic_settings_privacy.png
new file mode 100644
index 00000000000..30ba3173177
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_privacy.png differ
diff --git a/res/drawable-mdpi/ic_settings_search.png b/res/drawable-mdpi/ic_settings_search.png
new file mode 100755
index 00000000000..8e13de315e2
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_search.png differ
diff --git a/res/drawable-mdpi/ic_settings_security.png b/res/drawable-mdpi/ic_settings_security.png
new file mode 100755
index 00000000000..7e4868c1f5b
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_security.png differ
diff --git a/res/drawable-mdpi/ic_settings_sound_display.png b/res/drawable-mdpi/ic_settings_sound_display.png
new file mode 100755
index 00000000000..73c93bdf160
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_sound_display.png differ
diff --git a/res/drawable-mdpi/ic_settings_speech.png b/res/drawable-mdpi/ic_settings_speech.png
new file mode 100755
index 00000000000..042e7cc799b
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_speech.png differ
diff --git a/res/drawable-mdpi/ic_settings_storage.png b/res/drawable-mdpi/ic_settings_storage.png
new file mode 100755
index 00000000000..a209f6ff110
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_storage.png differ
diff --git a/res/drawable-mdpi/ic_settings_sync.png b/res/drawable-mdpi/ic_settings_sync.png
new file mode 100755
index 00000000000..71bf5f1d2c7
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_sync.png differ
diff --git a/res/drawable-mdpi/ic_settings_voice_calls.png b/res/drawable-mdpi/ic_settings_voice_calls.png
new file mode 100644
index 00000000000..89d04d742b5
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_voice_calls.png differ
diff --git a/res/drawable-mdpi/ic_settings_wifi.png b/res/drawable-mdpi/ic_settings_wifi.png
new file mode 100644
index 00000000000..e8f31299eb7
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_wifi.png differ
diff --git a/res/drawable-mdpi/ic_settings_wireless.png b/res/drawable-mdpi/ic_settings_wireless.png
new file mode 100755
index 00000000000..1eac153d2a0
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_wireless.png differ
diff --git a/res/drawable/ic_wifi_lock_signal_1.png b/res/drawable-mdpi/ic_wifi_lock_signal_1.png
similarity index 100%
rename from res/drawable/ic_wifi_lock_signal_1.png
rename to res/drawable-mdpi/ic_wifi_lock_signal_1.png
diff --git a/res/drawable/ic_wifi_lock_signal_2.png b/res/drawable-mdpi/ic_wifi_lock_signal_2.png
similarity index 100%
rename from res/drawable/ic_wifi_lock_signal_2.png
rename to res/drawable-mdpi/ic_wifi_lock_signal_2.png
diff --git a/res/drawable/ic_wifi_lock_signal_3.png b/res/drawable-mdpi/ic_wifi_lock_signal_3.png
similarity index 100%
rename from res/drawable/ic_wifi_lock_signal_3.png
rename to res/drawable-mdpi/ic_wifi_lock_signal_3.png
diff --git a/res/drawable/ic_wifi_lock_signal_4.png b/res/drawable-mdpi/ic_wifi_lock_signal_4.png
similarity index 100%
rename from res/drawable/ic_wifi_lock_signal_4.png
rename to res/drawable-mdpi/ic_wifi_lock_signal_4.png
diff --git a/res/drawable/ic_wifi_signal_1.png b/res/drawable-mdpi/ic_wifi_signal_1.png
similarity index 100%
rename from res/drawable/ic_wifi_signal_1.png
rename to res/drawable-mdpi/ic_wifi_signal_1.png
diff --git a/res/drawable/ic_wifi_signal_2.png b/res/drawable-mdpi/ic_wifi_signal_2.png
similarity index 100%
rename from res/drawable/ic_wifi_signal_2.png
rename to res/drawable-mdpi/ic_wifi_signal_2.png
diff --git a/res/drawable/ic_wifi_signal_3.png b/res/drawable-mdpi/ic_wifi_signal_3.png
similarity index 100%
rename from res/drawable/ic_wifi_signal_3.png
rename to res/drawable-mdpi/ic_wifi_signal_3.png
diff --git a/res/drawable/ic_wifi_signal_4.png b/res/drawable-mdpi/ic_wifi_signal_4.png
similarity index 100%
rename from res/drawable/ic_wifi_signal_4.png
rename to res/drawable-mdpi/ic_wifi_signal_4.png
diff --git a/res/drawable/icon.png b/res/drawable-mdpi/icon.png
similarity index 100%
rename from res/drawable/icon.png
rename to res/drawable-mdpi/icon.png
diff --git a/res/drawable/lock_anim_00.png b/res/drawable-mdpi/lock_anim_00.png
similarity index 100%
rename from res/drawable/lock_anim_00.png
rename to res/drawable-mdpi/lock_anim_00.png
diff --git a/res/drawable/lock_anim_02.png b/res/drawable-mdpi/lock_anim_02.png
similarity index 100%
rename from res/drawable/lock_anim_02.png
rename to res/drawable-mdpi/lock_anim_02.png
diff --git a/res/drawable/lock_anim_04.png b/res/drawable-mdpi/lock_anim_04.png
similarity index 100%
rename from res/drawable/lock_anim_04.png
rename to res/drawable-mdpi/lock_anim_04.png
diff --git a/res/drawable/lock_anim_06.png b/res/drawable-mdpi/lock_anim_06.png
similarity index 100%
rename from res/drawable/lock_anim_06.png
rename to res/drawable-mdpi/lock_anim_06.png
diff --git a/res/drawable/lock_anim_08.png b/res/drawable-mdpi/lock_anim_08.png
similarity index 100%
rename from res/drawable/lock_anim_08.png
rename to res/drawable-mdpi/lock_anim_08.png
diff --git a/res/drawable/lock_anim_10.png b/res/drawable-mdpi/lock_anim_10.png
similarity index 100%
rename from res/drawable/lock_anim_10.png
rename to res/drawable-mdpi/lock_anim_10.png
diff --git a/res/drawable/lock_anim_12.png b/res/drawable-mdpi/lock_anim_12.png
similarity index 100%
rename from res/drawable/lock_anim_12.png
rename to res/drawable-mdpi/lock_anim_12.png
diff --git a/res/drawable/lock_anim_14.png b/res/drawable-mdpi/lock_anim_14.png
similarity index 100%
rename from res/drawable/lock_anim_14.png
rename to res/drawable-mdpi/lock_anim_14.png
diff --git a/res/drawable/appwidget_bg.9.png b/res/drawable/appwidget_bg.9.png
deleted file mode 100644
index 688d131cd84..00000000000
Binary files a/res/drawable/appwidget_bg.9.png and /dev/null differ
diff --git a/res/drawable/appwidget_outer.xml b/res/drawable/appwidget_button_center.xml
similarity index 66%
rename from res/drawable/appwidget_outer.xml
rename to res/drawable/appwidget_button_center.xml
index d6f3cb6261b..194b3574af6 100644
--- a/res/drawable/appwidget_outer.xml
+++ b/res/drawable/appwidget_button_center.xml
@@ -16,18 +16,13 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_window_focused="false" android:state_enabled="true"
-        android:drawable="@drawable/appwidget_outer_default" />
-
     <item android:state_pressed="true"
-        android:drawable="@drawable/appwidget_outer_pressed" />
+        android:drawable="@drawable/appwidget_inner_press_c" />
 
     <item android:state_focused="true" android:state_enabled="true"
-        android:drawable="@drawable/appwidget_outer_selected" />
-
-    <item android:state_enabled="true"
-        android:drawable="@drawable/appwidget_outer_default" />
+        android:state_window_focused="true"
+        android:drawable="@drawable/appwidget_inner_focus_c" />
 
     <item
-         android:drawable="@drawable/appwidget_outer_default" />
+         android:drawable="@android:color/transparent" />
 </selector>
diff --git a/res/drawable/appwidget_inner.xml b/res/drawable/appwidget_button_left.xml
similarity index 66%
rename from res/drawable/appwidget_inner.xml
rename to res/drawable/appwidget_button_left.xml
index fc7bb6dc254..cbbce866b6d 100644
--- a/res/drawable/appwidget_inner.xml
+++ b/res/drawable/appwidget_button_left.xml
@@ -16,18 +16,13 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_window_focused="false" android:state_enabled="true"
-        android:drawable="@drawable/appwidget_inner_default" />
-
     <item android:state_pressed="true"
-        android:drawable="@drawable/appwidget_inner_pressed" />
+        android:drawable="@drawable/appwidget_inner_press_l" />
 
     <item android:state_focused="true" android:state_enabled="true"
-        android:drawable="@drawable/appwidget_inner_selected" />
-
-    <item android:state_enabled="true"
-        android:drawable="@drawable/appwidget_inner_default" />
+        android:state_window_focused="true"
+        android:drawable="@drawable/appwidget_inner_focus_l" />
 
     <item
-         android:drawable="@drawable/appwidget_inner_default" />
+         android:drawable="@android:color/transparent" />
 </selector>
diff --git a/res/drawable/appwidget_button_right.xml b/res/drawable/appwidget_button_right.xml
new file mode 100644
index 00000000000..9623f543786
--- /dev/null
+++ b/res/drawable/appwidget_button_right.xml
@@ -0,0 +1,28 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"
+        android:drawable="@drawable/appwidget_inner_press_r" />
+
+    <item android:state_focused="true" android:state_enabled="true"
+        android:state_window_focused="true"
+        android:drawable="@drawable/appwidget_inner_focus_r" />
+
+    <item
+         android:drawable="@android:color/transparent" />
+</selector>
diff --git a/res/drawable/appwidget_inner_default.9.png b/res/drawable/appwidget_inner_default.9.png
deleted file mode 100644
index f7e9db4d7cc..00000000000
Binary files a/res/drawable/appwidget_inner_default.9.png and /dev/null differ
diff --git a/res/drawable/appwidget_inner_pressed.9.png b/res/drawable/appwidget_inner_pressed.9.png
deleted file mode 100644
index e2b62b79d0b..00000000000
Binary files a/res/drawable/appwidget_inner_pressed.9.png and /dev/null differ
diff --git a/res/drawable/appwidget_inner_selected.9.png b/res/drawable/appwidget_inner_selected.9.png
deleted file mode 100644
index b6773915f5d..00000000000
Binary files a/res/drawable/appwidget_inner_selected.9.png and /dev/null differ
diff --git a/res/drawable/appwidget_outer_default.9.png b/res/drawable/appwidget_outer_default.9.png
deleted file mode 100644
index d84e56a4070..00000000000
Binary files a/res/drawable/appwidget_outer_default.9.png and /dev/null differ
diff --git a/res/drawable/appwidget_outer_pressed.9.png b/res/drawable/appwidget_outer_pressed.9.png
deleted file mode 100644
index 5348fef5510..00000000000
Binary files a/res/drawable/appwidget_outer_pressed.9.png and /dev/null differ
diff --git a/res/drawable/appwidget_outer_selected.9.png b/res/drawable/appwidget_outer_selected.9.png
deleted file mode 100644
index c6d5df77b2f..00000000000
Binary files a/res/drawable/appwidget_outer_selected.9.png and /dev/null differ
diff --git a/res/drawable/ic_power_system.png b/res/drawable/ic_power_system.png
new file mode 100755
index 00000000000..cce518787b5
Binary files /dev/null and b/res/drawable/ic_power_system.png differ
diff --git a/res/drawable/widget_btn_bluetooth.png b/res/drawable/widget_btn_bluetooth.png
deleted file mode 100644
index f32d0b266fb..00000000000
Binary files a/res/drawable/widget_btn_bluetooth.png and /dev/null differ
diff --git a/res/drawable/widget_btn_bluetooth_gray.png b/res/drawable/widget_btn_bluetooth_gray.png
deleted file mode 100644
index a633554d667..00000000000
Binary files a/res/drawable/widget_btn_bluetooth_gray.png and /dev/null differ
diff --git a/res/drawable/widget_btn_bluetooth_off.png b/res/drawable/widget_btn_bluetooth_off.png
deleted file mode 100644
index c0ef641ed15..00000000000
Binary files a/res/drawable/widget_btn_bluetooth_off.png and /dev/null differ
diff --git a/res/drawable/widget_btn_brightness.png b/res/drawable/widget_btn_brightness.png
deleted file mode 100644
index 9a7c7b91965..00000000000
Binary files a/res/drawable/widget_btn_brightness.png and /dev/null differ
diff --git a/res/drawable/widget_btn_brightness_off.png b/res/drawable/widget_btn_brightness_off.png
deleted file mode 100644
index 46dc508ac9e..00000000000
Binary files a/res/drawable/widget_btn_brightness_off.png and /dev/null differ
diff --git a/res/drawable/widget_btn_gps.png b/res/drawable/widget_btn_gps.png
deleted file mode 100644
index b21e8c8bff1..00000000000
Binary files a/res/drawable/widget_btn_gps.png and /dev/null differ
diff --git a/res/drawable/widget_btn_gps_off.png b/res/drawable/widget_btn_gps_off.png
deleted file mode 100644
index 042fefb0e65..00000000000
Binary files a/res/drawable/widget_btn_gps_off.png and /dev/null differ
diff --git a/res/drawable/widget_btn_sync.png b/res/drawable/widget_btn_sync.png
deleted file mode 100644
index 6133233d372..00000000000
Binary files a/res/drawable/widget_btn_sync.png and /dev/null differ
diff --git a/res/drawable/widget_btn_sync_off.png b/res/drawable/widget_btn_sync_off.png
deleted file mode 100644
index 192cad88d73..00000000000
Binary files a/res/drawable/widget_btn_sync_off.png and /dev/null differ
diff --git a/res/drawable/widget_btn_wifi.png b/res/drawable/widget_btn_wifi.png
deleted file mode 100644
index 2d396810bd2..00000000000
Binary files a/res/drawable/widget_btn_wifi.png and /dev/null differ
diff --git a/res/drawable/widget_btn_wifi_gray.png b/res/drawable/widget_btn_wifi_gray.png
deleted file mode 100644
index 76f36e84de8..00000000000
Binary files a/res/drawable/widget_btn_wifi_gray.png and /dev/null differ
diff --git a/res/drawable/widget_btn_wifi_off.png b/res/drawable/widget_btn_wifi_off.png
deleted file mode 100644
index 9b70cf1e215..00000000000
Binary files a/res/drawable/widget_btn_wifi_off.png and /dev/null differ
diff --git a/res/layout-land/widget.xml b/res/layout-land/widget.xml
deleted file mode 100644
index fdafd7d405e..00000000000
--- a/res/layout-land/widget.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/main"
-        android:layout_width="@dimen/appwidget_width"
-        android:layout_height="@dimen/appwidget_height"
-        android:gravity="center"
-        android:background="@drawable/appwidget_bg" >
-
-        <ImageButton
-            android:id="@+id/btn_wifi"
-            android:layout_width="79dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_outer"
-            android:layout_gravity="center_horizontal"
-        />
-
-        <ImageButton
-            android:id="@+id/btn_bluetooth"
-            android:layout_width="79dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_inner"
-            android:layout_gravity="center_horizontal"
-        />
-
-        <ImageButton
-            android:id="@+id/btn_gps"
-            android:layout_width="79dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_inner"
-            android:layout_gravity="center_horizontal"
-        />
-
-        <ImageButton
-            android:id="@+id/btn_sync"
-            android:layout_width="79dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_inner"
-            android:layout_gravity="center_horizontal"
-        />
-
-        <ImageButton
-            android:id="@+id/btn_brightness"
-            android:layout_width="79dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_inner"
-            android:layout_gravity="center_horizontal"
-        />
-
-    </LinearLayout>
diff --git a/res/layout/battery_info.xml b/res/layout/battery_info.xml
index 62f5d691048..1016ad18ccb 100644
--- a/res/layout/battery_info.xml
+++ b/res/layout/battery_info.xml
@@ -26,6 +26,12 @@
         <TextView android:id="@+id/status" style="@style/info_value" />
     </LinearLayout>
 
+    <!-- Battery Status -->
+    <LinearLayout style="@style/entry_layout">
+        <TextView android:text="@string/battery_info_power_label" style="@style/info_label" />
+        <TextView android:id="@+id/power" style="@style/info_value" />
+    </LinearLayout>
+
     <!-- Battery Level -->
     <LinearLayout style="@style/entry_layout">
         <TextView android:text="@string/battery_info_level_label" style="@style/info_label" />
diff --git a/res/layout/bluetooth_discoverable.xml b/res/layout/bluetooth_discoverable.xml
new file mode 100644
index 00000000000..3673774a994
--- /dev/null
+++ b/res/layout/bluetooth_discoverable.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="fill_parent"
+    android:layout_width="fill_parent">
+
+    <TextView
+        android:id="@+id/message"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="20dip"
+        android:paddingRight="20dip"
+        android:gravity="center_horizontal"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+</ScrollView>
diff --git a/res/layout/choose_lock_pattern.xml b/res/layout/choose_lock_pattern.xml
index b4472ba65d8..78ab8b4e474 100644
--- a/res/layout/choose_lock_pattern.xml
+++ b/res/layout/choose_lock_pattern.xml
@@ -21,39 +21,49 @@
     android:layout_height="fill_parent"
     android:background="@color/black">
 
-    <TextView android:id="@+id/headerText"
+    <!-- takes up all space above button bar at bottom -->
+    <LinearLayout
+        android:orientation="vertical"
         android:layout_width="fill_parent"
         android:layout_height="0dip"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:textSize="18sp"/>
+        android:layout_weight="1">
 
-    <View
-         android:background="@*android:drawable/code_lock_top"
-         android:layout_width="fill_parent"
-         android:layout_height="2dip" />
-    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content" />
-    <View
-         android:background="@*android:drawable/code_lock_bottom"
-         android:layout_width="fill_parent"
-         android:layout_height="8dip" />
+        <TextView android:id="@+id/headerText"
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:textSize="18sp"/>
+
+        <View
+             android:background="@*android:drawable/code_lock_top"
+             android:layout_width="fill_parent"
+             android:layout_height="2dip" />
+        <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content" />
+
+        <!-- bottom line looks bad when button bar is their too, omit in this case -->
+        <!--View
+             android:background="@*android:drawable/code_lock_bottom"
+             android:layout_width="fill_parent"
+             android:layout_height="8dip" /-->
+
+        <TextView android:id="@+id/footerText"
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:textSize="14sp"/>
+
+    </LinearLayout>
 
-    <!-- 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"/>
 
-    <!-- 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_height="wrap_content"
             android:layout_width="140dip"
@@ -61,14 +71,12 @@
             android:singleLine="true"
             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_height="wrap_content"
             android:layout_width="140dip"
diff --git a/res/layout/compute_sizes.xml b/res/layout/compute_sizes.xml
index 1c8e96648d2..b32ba5885b0 100755
--- a/res/layout/compute_sizes.xml
+++ b/res/layout/compute_sizes.xml
@@ -23,7 +23,7 @@
         android:drawSelectorOnTop="false"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content" />
-    <TextView android:id="@+id/empty_view"
+    <TextView android:id="@android:id/empty"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:paddingLeft="20dip"
diff --git a/res/layout/cstor_set_password_dialog_view.xml b/res/layout/credentials_password_dialog.xml
similarity index 62%
rename from res/layout/cstor_set_password_dialog_view.xml
rename to res/layout/credentials_password_dialog.xml
index eda317ab538..c23cc684c1c 100644
--- a/res/layout/cstor_set_password_dialog_view.xml
+++ b/res/layout/credentials_password_dialog.xml
@@ -24,40 +24,37 @@
             android:layout_height="fill_parent"
             android:padding="15dip">
 
-        <TextView android:id="@+id/cstor_first_time_hint"
+        <TextView android:id="@+id/hint"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/vpn_connect_normal_text_size"
-                android:text="@string/cstor_first_time_hint"
-                android:layout_marginBottom="10sp" />
+                android:text="@string/credentials_first_time_hint"
+                android:layout_marginBottom="10sp"
+                android:visibility="gone"/>
 
-        <TextView android:id="@+id/cstor_error"
+        <TextView android:id="@+id/error"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:textColor="@color/red"
                 android:textStyle="bold"
-                android:text="@string/cstor_password_empty_error" />
+                android:visibility="gone"/>
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/cstor_old_password_block"
-                android:orientation="vertical"
+        <TextView android:id="@+id/old_password_prompt"
+        	android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/credentials_old_password"
+                android:visibility="gone"/>
+        <EditText android:id="@+id/old_password"
                 android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                >
-            <TextView android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/cstor_old_password" />
-            <EditText android:id="@+id/cstor_old_password"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:password="True"
-                    android:singleLine="True"/>
-        </LinearLayout>
+                android:layout_height="wrap_content"
+                android:password="True"
+                android:singleLine="True"
+                android:visibility="gone"/>
 
         <TextView android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/cstor_new_password" />
-        <EditText android:id="@+id/cstor_new_password"
+                android:text="@string/credentials_new_password" />
+        <EditText android:id="@+id/new_password"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:password="True"
@@ -65,8 +62,8 @@
 
         <TextView android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/cstor_confirm_password" />
-        <EditText android:id="@+id/cstor_confirm_password"
+                android:text="@string/credentials_confirm_password" />
+        <EditText android:id="@+id/confirm_password"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:password="True"
diff --git a/res/layout/cstor_unlock_dialog_view.xml b/res/layout/credentials_unlock_dialog.xml
similarity index 81%
rename from res/layout/cstor_unlock_dialog_view.xml
rename to res/layout/credentials_unlock_dialog.xml
index 895306a39e7..2ba2acecb12 100644
--- a/res/layout/cstor_unlock_dialog_view.xml
+++ b/res/layout/credentials_unlock_dialog.xml
@@ -24,20 +24,22 @@
             android:layout_height="fill_parent"
             android:padding="15dip">
 
-        <TextView android:id="@+id/cstor_access_dialog_hint_from_action"
+        <TextView android:id="@+id/hint"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/vpn_connect_normal_text_size"
-                android:text="@string/cstor_access_dialog_hint_from_action"
-                android:layout_marginBottom="10sp" />
+                android:text="@string/credentials_unlock_hint"
+                android:layout_marginBottom="10sp"
+                android:visibility="gone"/>
 
-        <TextView android:id="@+id/cstor_error"
+        <TextView android:id="@+id/error"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:textColor="@color/red"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                android:visibility="gone"/>
 
-        <EditText android:id="@+id/cstor_password"
+        <EditText android:id="@+id/old_password"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:password="True"
diff --git a/res/layout/cstor_name_credential_dialog_view.xml b/res/layout/cstor_name_credential_dialog_view.xml
deleted file mode 100644
index 33688bd25cf..00000000000
--- a/res/layout/cstor_name_credential_dialog_view.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:orientation="vertical"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:padding="15dip">
-
-        <TextView android:id="@+id/cstor_name_credential_hint"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/vpn_connect_normal_text_size"
-                android:text="@string/cstor_name_credential_hint"
-                android:layout_marginBottom="10sp" />
-
-        <TextView android:id="@+id/cstor_error"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:textColor="@color/red"
-                android:textStyle="bold" />
-
-        <TextView android:id="@+id/cstor_credential_name_title"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/cstor_credential_name" />
-        <EditText android:id="@+id/cstor_credential_name"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:singleLine="True"/>
-
-        <LinearLayout android:id="@+id/cstor_credential_password_container"
-                xmlns:android="http://schemas.android.com/apk/res/android"
-                android:orientation="vertical"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:padding="0dip">
-            <TextView android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/cstor_credential_password" />
-            <EditText android:id="@+id/cstor_credential_password"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:password="True"
-                    android:singleLine="True"/>
-        </LinearLayout>
-
-        <TextView android:id="@+id/cstor_credential_info_title"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/cstor_credential_info" />
-        <TextView android:id="@+id/cstor_credential_info"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content" />
-
-    </LinearLayout>
-</ScrollView>
diff --git a/res/layout/dialog_edittext.xml b/res/layout/dialog_edittext.xml
index 9ef1205a8aa..0dcf673f2ed 100644
--- a/res/layout/dialog_edittext.xml
+++ b/res/layout/dialog_edittext.xml
@@ -24,6 +24,7 @@
         android:id="@+id/edittext"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:maxLength="50"
     />
         
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml
index 13d3b1006d5..2810604fffc 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -304,7 +304,7 @@
                 android:layout_centerHorizontal="true"
                 android:layout_width="150dip"
                 android:text="@string/clear_activities"
-                 android:layout_height="wrap_content" />
+                android:layout_height="wrap_content" />
         </RelativeLayout>
 
         <!-- Other controls section -->
@@ -320,6 +320,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_alignParentTop="true"
                 android:layout_centerHorizontal="true"
+                android:paddingTop="6dip"
                 android:layout_width="150dip"
                 android:text="@string/force_stop"
                 android:layout_height="wrap_content" />
diff --git a/res/layout/preference_dialog_brightness.xml b/res/layout/preference_dialog_brightness.xml
new file mode 100644
index 00000000000..071beed475e
--- /dev/null
+++ b/res/layout/preference_dialog_brightness.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+
+     Copyright (C) 2009 Motorola, Inc.
+     March 23, 2009 - Motorola - Allow automatic brightness changes.
+-->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="vertical"
+            android:gravity="center_horizontal"
+            android:paddingBottom="20dip">
+
+        <ImageView android:id="@android:id/icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="20dip" />
+
+        <CheckBox android:id="@+id/automatic_mode"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/automatic_brightness"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_marginTop="6dip"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip" />
+
+        <SeekBar android:id="@*android:id/seekbar"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:padding="20dip" />
+
+    </LinearLayout>
+</ScrollView>
diff --git a/res/layout/preference_icon.xml b/res/layout/preference_icon.xml
new file mode 100644
index 00000000000..03f4e709268
--- /dev/null
+++ b/res/layout/preference_icon.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2006 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Layout for a Preference in a PreferenceActivity. The
+     Preference is able to place a specific widget for its particular
+     type in the "widget_frame" layout. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+android:id/widget_frame"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingRight="?android:attr/scrollbarSize">
+    
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="6dip"
+        android:layout_marginRight="6dip"
+        android:layout_gravity="center" />
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="2dip"
+        android:layout_marginRight="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_weight="1">
+
+        <TextView android:id="@+android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <TextView android:id="@+android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignLeft="@android:id/title"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:maxLines="2" />
+
+    </RelativeLayout>
+
+</LinearLayout>
diff --git a/res/layout/running_services.xml b/res/layout/running_services.xml
new file mode 100644
index 00000000000..120a1135bed
--- /dev/null
+++ b/res/layout/running_services.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+ * Copyright (C) 2008 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.
+ -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	    android:layout_width="fill_parent"
+	    android:layout_height="fill_parent"
+	    android:orientation="vertical">
+    <FrameLayout
+		    android:layout_width="fill_parent"
+		    android:layout_height="0px"
+		    android:layout_weight="1">
+	    <ListView android:id="@android:id/list"
+	            android:layout_width="fill_parent" 
+	            android:layout_height="fill_parent"
+	            android:drawSelectorOnTop="false"
+	            android:fastScrollEnabled="true" />
+	    <TextView android:id="@android:id/empty"
+	            android:layout_width="fill_parent"
+	            android:layout_height="fill_parent"
+	            android:gravity="center"
+	            android:text="@string/no_running_services"
+	            android:textAppearance="?android:attr/textAppearanceLarge" />
+    </FrameLayout>
+    <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:background="?android:attr/colorForeground"
+            android:padding="4dp">
+        <TextView android:id="@+id/backgroundText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textAppearance="?android:attr/textAppearanceSmallInverse"
+            android:color="?android:attr/textColorPrimaryInverse"
+            android:singleLine="true" />
+        <TextView android:id="@+id/foregroundText"
+            android:layout_gravity="center_vertical|right"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:textAppearance="?android:attr/textAppearanceSmallInverse"
+            android:color="?android:attr/textColorPrimaryInverse"
+            android:singleLine="true" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout/running_services_item.xml b/res/layout/running_services_item.xml
new file mode 100644
index 00000000000..2728c76f433
--- /dev/null
+++ b/res/layout/running_services_item.xml
@@ -0,0 +1,86 @@
+<?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:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="vertical"
+    android:gravity="fill" >
+
+    <ImageView android:id="@+id/separator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="?android:attr/listDivider"/>
+    
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="horizontal"
+        android:paddingRight="6dip"
+        android:paddingLeft="6dip"
+        android:gravity="center_vertical" >
+    
+        <ImageView android:id="@+id/icon"
+            android:layout_width="@android:dimen/app_icon_size"
+            android:layout_height="@android:dimen/app_icon_size"
+            android:layout_marginLeft="5dip"
+            android:layout_marginRight="11dip"
+            android:layout_gravity="center_vertical"
+            android:scaleType="fitCenter"/>
+    
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content" >
+            <LinearLayout
+                android:orientation="horizontal"
+                android:baselineAlignedChildIndex="0"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
+	            <TextView android:id="@+id/name"
+	                android:layout_width="wrap_content"
+	                android:layout_height="wrap_content"
+                    android:layout_weight="1"
+	                android:textAppearance="?android:attr/textAppearanceMedium"
+	                android:textStyle="bold"
+	                android:singleLine="true"
+	                android:ellipsize="marquee"
+	                android:layout_marginBottom="2dip" />
+                <TextView android:id="@+id/size"
+                    android:layout_gravity="center_vertical|right"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:singleLine="true"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+            </LinearLayout>
+                <TextView android:id="@+id/description"
+                    android:layout_marginTop="-4dip"
+                    android:layout_gravity="center_vertical|left"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingRight="4dip"
+                    android:singleLine="true"
+                    android:ellipsize="marquee"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout/widget.xml b/res/layout/widget.xml
index dc404695464..1e22dbe1c1b 100644
--- a/res/layout/widget.xml
+++ b/res/layout/widget.xml
@@ -14,51 +14,166 @@
      limitations under the License.
 -->
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/main"
-        android:layout_width="@dimen/appwidget_width"
-        android:layout_height="@dimen/appwidget_height"
-        android:gravity="center"
-        android:background="@drawable/appwidget_bg" >
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/main"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:gravity="center"
+    android:background="@drawable/appwidget_bg" >
 
-        <ImageButton
-            android:id="@+id/btn_wifi"
-            android:layout_width="57dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_outer"
-            android:layout_gravity="center_horizontal"
+    <LinearLayout
+        android:id="@+id/btn_wifi"
+        android:layout_width="0dip"
+        android:layout_weight="1"
+        android:layout_height="fill_parent"
+        android:background="@drawable/appwidget_button_left"
+        android:clickable="true"
+        android:focusable="true"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/img_wifi"
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:scaleType="center"
+            />
+
+        <ImageView
+            android:id="@+id/ind_wifi"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:scaleType="fitXY"
+            />
+        </LinearLayout>
+
+    <ImageView
+        android:layout_width="1dip"
+        android:layout_height="fill_parent"
+        android:background="@drawable/appwidget_settings_divider"
         />
 
-        <ImageButton
-            android:id="@+id/btn_bluetooth"
-            android:layout_width="57dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_inner"
-            android:layout_gravity="center_horizontal"
-        />
+    <LinearLayout
+        android:id="@+id/btn_bluetooth"
+        android:layout_width="0dip"
+        android:layout_weight="1"
+        android:layout_height="fill_parent"
+        android:background="@drawable/appwidget_button_center"
+        android:clickable="true"
+        android:focusable="true"
+        android:orientation="vertical">
 
-        <ImageButton
-            android:id="@+id/btn_gps"
-            android:layout_width="57dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_inner"
-            android:layout_gravity="center_horizontal"
-        />
+        <ImageView
+            android:id="@+id/img_bluetooth"
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:scaleType="center"
+            />
 
-        <ImageButton
-            android:id="@+id/btn_sync"
-            android:layout_width="57dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_inner"
-            android:layout_gravity="center_horizontal"
-        />
-
-        <ImageButton
-            android:id="@+id/btn_brightness"
-            android:layout_width="57dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_inner"
-            android:layout_gravity="center_horizontal"
-        />
+        <ImageView
+            android:id="@+id/ind_bluetooth"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:scaleType="fitXY"
+            />
 
     </LinearLayout>
+
+    <ImageView
+        android:layout_width="1dip"
+        android:layout_height="fill_parent"
+        android:background="@drawable/appwidget_settings_divider"
+        />
+
+    <LinearLayout
+        android:id="@+id/btn_gps"
+        android:layout_width="0dip"
+        android:layout_weight="1"
+        android:layout_height="fill_parent"
+        android:background="@drawable/appwidget_button_center"
+        android:clickable="true"
+        android:focusable="true"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/img_gps"
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:scaleType="center"
+            />
+
+        <ImageView
+            android:id="@+id/ind_gps"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:scaleType="fitXY"
+            />
+    </LinearLayout>
+
+    <ImageView
+        android:layout_width="1dip"
+        android:layout_height="fill_parent"
+        android:background="@drawable/appwidget_settings_divider"
+        />    
+
+    <LinearLayout
+        android:id="@+id/btn_sync"
+        android:layout_width="0dip"
+        android:layout_weight="1"
+        android:layout_height="fill_parent"
+        android:background="@drawable/appwidget_button_center"
+        android:clickable="true"
+        android:focusable="true"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/img_sync"
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:scaleType="center"
+            />
+
+        <ImageView
+            android:id="@+id/ind_sync"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:scaleType="fitXY"
+            />
+    </LinearLayout>
+
+    <ImageView
+        android:layout_width="1dip"
+        android:layout_height="fill_parent"
+        android:background="@drawable/appwidget_settings_divider"
+        />
+
+    <LinearLayout
+        android:id="@+id/btn_brightness"
+        android:layout_width="0dip"
+        android:layout_weight="1"
+        android:layout_height="fill_parent"
+        android:background="@drawable/appwidget_button_right"
+        android:clickable="true"
+        android:focusable="true"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/img_brightness"
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:scaleType="center"
+            />
+
+        <ImageView
+            android:id="@+id/ind_brightness"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:scaleType="fitXY"
+            />
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/wifi_ap_configure.xml b/res/layout/wifi_ap_configure.xml
index f8eb39a62bd..f816ae5b4ac 100644
--- a/res/layout/wifi_ap_configure.xml
+++ b/res/layout/wifi_ap_configure.xml
@@ -39,14 +39,13 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/wifi_type_ssid" />
-            
+
         <EditText android:id="@+id/ssid_edit"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dip"
-                android:singleLine="true" />
-    
-    
+                android:singleLine="true"
+                android:inputType="textNoSuggestions" />
     
         <!-- Security -->
         
@@ -105,17 +104,6 @@
                 <Spinner android:id="@+id/client_certificate_spinner"
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content" />
-                <TextView android:id="@+id/private_key_passwd_text"
-                        style="?android:attr/textAppearanceSmallInverse"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dip"
-                        android:text="@string/please_type_private_key_passwd" />
-                <EditText android:id="@+id/private_key_passwd_edit"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dip"
-                        android:singleLine="true" />
                 <TextView android:id="@+id/identity_text"
                         style="?android:attr/textAppearanceSmallInverse"
                         android:layout_width="fill_parent"
@@ -126,7 +114,8 @@
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="2dip"
-                        android:singleLine="true" />
+                        android:singleLine="true"
+                        android:inputType="textNoSuggestions" />
                 <TextView android:id="@+id/anonymous_identity_text"
                         style="?android:attr/textAppearanceSmallInverse"
                         android:layout_width="fill_parent"
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 9245ed4a5f5..b92df048891 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -24,13 +24,23 @@
     <item msgid="5345178126174698955">"Tichomoří"</item>
     <item msgid="8392017019801393511">"Všechny"</item>
   </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"Žádné animace"</item>
+    <item msgid="6291186755504776720">"Některé animace"</item>
+    <item msgid="3856065399819979491">"Všechny animace"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"Nezobrazují se žádné animace oken"</item>
+    <item msgid="4460915688877708508">"Zobrazují se některé animace oken"</item>
+    <item msgid="488968798204105119">"Zobrazují se všechny animace oken"</item>
+  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 sekund"</item>
     <item msgid="8881760709354815449">"30 sekund"</item>
     <item msgid="7589406073232279088">"1 minuta"</item>
     <item msgid="7001195990902244174">"2 minuty"</item>
     <item msgid="5721688686241190620">"10 minut"</item>
-    <item msgid="1781492122915870416">"Nevypínat"</item>
+    <item msgid="7156442995039264948">"30 min."</item>
   </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Velmi pomalá"</item>
@@ -58,18 +68,14 @@
     <item msgid="2923732046112398627">"Automaticky"</item>
     <item msgid="5434666299123318296">"Žádné"</item>
     <item msgid="3159594845889645948">"WEP"</item>
-    <item msgid="6303607119537134095">"WPA personal"</item>
-    <item msgid="1977424472734732392">"WPA2 personal"</item>
-    <item msgid="5185669984217684689">"WPA-EAP"</item>
-    <item msgid="8643206823103498303">"IEEE 802.1x"</item>
+    <item msgid="1687348101566181433">"WPA/WPA2 PSK"</item>
+    <item msgid="329777238762866787">"802.1x Enterprise"</item>
   </string-array>
   <string-array name="wifi_security_without_auto_entries">
     <item msgid="4402120432904877907">"Žádné"</item>
     <item msgid="2329148995431627488">"WEP"</item>
-    <item msgid="2296204649410509235">"WPA personal"</item>
-    <item msgid="8928468573279595315">"WPA2 personal"</item>
-    <item msgid="8319241197948974314">"WPA-EAP"</item>
-    <item msgid="2222409752754955757">"IEEE 802.1x"</item>
+    <item msgid="6903317668294332381">"WPA/WPA2 PSK"</item>
+    <item msgid="7280821339307729710">"802.1x Enterprise"</item>
   </string-array>
   <string-array name="wifi_wep_type">
     <item msgid="1497433962958697183">"Automaticky"</item>
@@ -108,7 +114,7 @@
     <item msgid="1818786254010764570">"Žádné"</item>
     <item msgid="6189918678874123056">"PAP"</item>
     <item msgid="1524112260493662517">"MSCHAP"</item>
-    <item msgid="1586767102985419413">"MSCHAP2"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
@@ -116,4 +122,10 @@
     <item msgid="3165868966179561687">"Výstraha"</item>
     <item msgid="6038758039030476855">"Vibrace"</item>
   </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"Žádné"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP nebo CHAP"</item>
+  </string-array>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 8b364b0ee61..fe0c73d59c0 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -15,6 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"Ano"</string>
+    <string name="no" msgid="6731231425810196216">"Ne"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Neznámé"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Zapnout rádio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Vypnout rádio"</string>
@@ -56,6 +58,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
     <string name="sdcard_setting" msgid="5922637503871474866">"Karta SD"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Stav baterie:"</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"Napájecí konektor:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Měřítko baterie:"</string>
     <string name="battery_info_level_label" msgid="8706526709307788737">"Stav baterie:"</string>
     <string name="battery_info_health_label" msgid="6416051542741886958">"Zdraví baterie:"</string>
@@ -75,6 +78,11 @@
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"Vybíjení"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nenabíjí se"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Plná"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Odpojeno"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"Neznámé"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Neznámé"</string>
     <string name="battery_info_health_good" msgid="8070356565806711806">"Dobrá"</string>
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"Přehřátá"</string>
@@ -104,6 +112,12 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Požadavek na párování zařízení Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Požadavek na párování"</string>
     <string name="bluetooth_notif_message" msgid="5381418499788668724">"Povolit párování se zařízením "</string>
+    <string name="device_picker" msgid="8721012448931226323">"Výběr zařízení Bluetooth"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Požadavek na povolení zařízení Bluetooth"</string>
+    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Aplikace v telefonu požaduje povolení zapnout připojení Bluetooth. Chcete toto povolení udělit?"</string>
+    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Aplikace v telefonu požaduje povolení nastavit telefon do viditelného režimu na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Chcete toto povolení udělit?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Aplikace v telefonu požaduje povolení zapnout připojení Bluetooth a nastavit telefonu do viditelného režimu na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Chcete toto povolení udělit?"</string>
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Zapínání zařízení Bluetooth..."</string>
     <string name="date_and_time" msgid="4114084177056654663">"Nastavení data a času"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -196,7 +210,8 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Vypne všechna bezdrátová připojení"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Vypínání bezdrátových připojení..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Povolování bezdrátových připojení..."</string>
-    <string name="radio_controls_title" msgid="8356991079873437337">"Bezdrátové sítě"</string>
+    <string name="radio_controls_title" msgid="5868688473587168882">"Bezdrátová připojení a sítě"</string>
+    <string name="wireless_networks_settings_title" msgid="149274247949769551">"Nastavení bezdrátového připojení a sítě"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Spravovat Wi-Fi, Bluetooth, režim V letadle, mobilní sítě a sítě VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Datové služby při roamingu"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Datové služby se mohou připojovat při roamingu"</string>
@@ -219,20 +234,29 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Formát data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Řadit abecedně"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Řadit podle časového pásma"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"Zabezpečení a poloha"</string>
+    <string name="security_settings_title" msgid="5168491784222013179">"Poloha a zabezpečení"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"Nastavení polohy a zabezpečení"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Moje poloha, odemknutí obrazovky, zámek SIM, zámek úložiště pověření"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavení funkce Moje poloha, odemknutí obrazovky a zamknutí úložiště pověření"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Hesla"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Zapnout Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Nastavení Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Nastavení Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Umožňuje spravovat připojení, nastavit název zařízení a viditelnost"</string>
-    <string name="bluetooth_pin_entry" msgid="5627349871303455279">"Požadavek na párování zařízení Bluetooth"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Požadavek na párování zařízení Bluetooth"</string>
     <string name="bluetooth_device_info" msgid="6644515376523965073">"Info o zařízení Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="7551139612735632370">"<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_enter_pin_msg" msgid="856962526754150334">\n"Párování se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zahájíte zadáním kódu PIN (zkuste kód 0000 nebo 1234)."</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Zadejte přístupový klíč pro párování se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Chcete-li provést párování se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, zkontrolujte, zda je zobrazen přístupový klíč: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"žádá o párování."</string>
+    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Zadáním přístupového klíče <xliff:g id="PASSKEY">%2$s</xliff:g> do zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zahájíte párování."</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Párovat"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Nepárovat"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"zařízení Bluetooth"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Upozornění"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"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_pin_error_message" msgid="6938408362011024289">"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_pairing_pin_error_message" msgid="6065697229258906937">"Při párování se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g> došlo k potížím. Kód PIN nebo přístupový klíč je nesprávný."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"Nelze navázat komunikaci se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Párování odmítnuto zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Při připojování k zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> došlo k potížím."</string>
@@ -246,6 +270,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Připojit k síti…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Média"</string>
     <string name="bluetooth_profile_headset" msgid="1874975688666658946">"Telefon"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Přenos"</string>
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Připojeno ke zvukovému médiu"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Připojeno k náhlavní soupravě"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Připojeno k náhlavní soupravě a zvukovému médiu"</string>
@@ -255,8 +280,11 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profily"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Připojeno ke zvukovému médiu"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Připojeno k náhlavní soupravě"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Připojeno k serveru pro přenos dat"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nepřipojeno k serveru pro přenos souborů"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Umožňuje připojení zvukového média"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Umožňuje připojení náhlavní soupravy"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Použít pro přenos souborů"</string>
     <string name="wifi" msgid="1081550856200013637">"WiFi"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"WiFi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Zapnout WiFi"</string>
@@ -273,17 +301,13 @@
     <string name="security" msgid="1040691896987225267">"Zabezpečení"</string>
     <string name="wifi_security_open" msgid="3513305614048816607">"Nezabezpečená"</string>
     <string name="wifi_security_wep" msgid="7082604129842065776">"WEP"</string>
-    <string name="wifi_security_wpa" msgid="8980169410565477162">"WPA"</string>
-    <string name="wifi_security_wpa2" msgid="5780665935088930524">"WPA2"</string>
-    <string name="wifi_security_wpa_eap" msgid="7485687331651751101">"WPA-EAP"</string>
-    <string name="wifi_security_ieee8021x" msgid="8538687609878109005">"IEEE8021X"</string>
+    <string name="wifi_security_psk" msgid="3392399380570381452">"WPA/WPA2 PSK"</string>
+    <string name="wifi_security_eap" msgid="8309434150934969132">"Enterprise (802.1x)"</string>
     <string name="wifi_security_unknown" msgid="4564208312073060668">"Neznámé"</string>
     <string name="wifi_security_verbose_open" msgid="8117878112088901945">"nezabezpečená síť"</string>
     <string name="wifi_security_verbose_wep" msgid="9220757688700421508">"zabezpečení WEP"</string>
-    <string name="wifi_security_verbose_wpa" msgid="598697674252714455">"zabezpečení WPA"</string>
-    <string name="wifi_security_verbose_wpa2" msgid="4116236883347875722">"zabezpečení WPA2"</string>
-    <string name="wifi_security_verbose_wpa_eap" msgid="1984821646949066624">"zabezpečení WPA-EAP"</string>
-    <string name="wifi_security_verbose_ieee8021x" msgid="5552995793910186310">"zabezpečení IEEE 802.1x"</string>
+    <string name="wifi_security_verbose_psk" msgid="1110130025330416225">"zabezpečeno pomocí protokolu WPA/WPA2 PSK"</string>
+    <string name="wifi_security_verbose_eap" msgid="586632662086063">"zabezpečeno pomocí protokolu 802.1x EAP"</string>
     <string name="ip_address" msgid="850672263358989449">"Adresa IP"</string>
     <string name="signal" msgid="1947969631626413228">"Síla signálu"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"Zapínání WiFi..."</string>
@@ -302,14 +326,13 @@
     <string name="please_type_anonymous_identity" msgid="835061562079965048">"Anonymní identita"</string>
     <string name="please_select_client_certificate" msgid="2137906961594663234">"Certifikát klienta"</string>
     <string name="please_select_ca_certificate" msgid="5010815181914420677">"Certifikát CA"</string>
-    <string name="please_type_private_key_passwd" msgid="4077744679722504443">"Soukromý klíč"</string>
     <string name="please_type_passphrase" msgid="8256017704131522462">"Heslo bezdrátové sítě"</string>
     <string name="please_type_hex_key" msgid="8751224390407867551">"Hexadecimální klíč WEP (0-9, A-F)"</string>
     <string name="wifi_show_password" msgid="4235237470701732009">"Zobrazovat heslo."</string>
     <string name="scan_wifi" msgid="2459901725350542606">"Vyhledávání"</string>
     <string name="summary_not_in_range" msgid="3926674700733548684">"Mimo dosah"</string>
     <string name="summary_remembered" msgid="6079941090549401742">"uložené nastavení"</string>
-    <string name="summary_connection_failed" msgid="7610394657613410489">"Připojení se nezdařilo, zkuste to znovu."</string>
+    <string name="summary_connection_failed" msgid="2351885658101671413">"Připojení se nezdařilo, dotkněte se a zkuste to znovu."</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Sítě WiFi"</string>
     <string name="wifi_type_ssid" msgid="1326839657083292017">"Identifikátor SSID sítě"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Zabezpečení"</string>
@@ -360,6 +383,7 @@
     <string name="status_disconnected" msgid="7561688569905126046">"Odpojeno"</string>
     <string name="status_failed" msgid="610462050405904601">"Připojení se nezdařilo."</string>
     <string name="sound_and_display_settings" msgid="349770582993029003">"Obraz a zvuk"</string>
+    <string name="sound_and_display_settings_title" msgid="5036144539683697330">"Nastavení obrazu a zvuku"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Nastavení zvuku"</string>
     <string name="sound_and_display_settings_summary" msgid="1433943789593286064">"Umožňuje nastavit vyzváněcí tón, oznámení a jas obrazovky"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Tichý režim"</string>
@@ -385,11 +409,14 @@
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"Výběr se zvuky"</string>
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Výběr na obrazovce je provázen zvuky"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Výběr na obrazovce je provázen zvuky"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Hmatová odezva"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrovat při stisku softwarových kláves a při některých událostech uživatelského rozhraní"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrovat při stisku softwarových kláves a při některých událostech uživatelského rozhraní"</string>
     <string name="play_media_notification_sounds_enable_title" msgid="1008791464029179529">"Oznámení karty SD"</string>
     <string name="play_media_notification_sounds_enable_summary_on" msgid="7675466959375667370">"Přehrát zvuk při oznámení karty SD"</string>
     <string name="play_media_notification_sounds_enable_summary_off" msgid="8672617597028744693">"Přehrát zvuk při oznámení karty SD"</string>
-    <string name="sync_settings" msgid="2212736205476453234">"Synchronizace dat"</string>
-    <string name="sync_settings_summary" msgid="6480534906375217074">"Umožňuje vybrat aplikace pro synchronizaci"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Účty a synchronizace"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"Umožňuje přidat nebo odebrat účty a změnit jejich nastavení"</string>
     <string name="search_settings" msgid="1910951467596035063">"Vyhledávání"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Správa nastavení a historie vyhledávání"</string>
     <string name="display_settings" msgid="3912042046350078328">"Nastavení zobrazení"</string>
@@ -403,6 +430,7 @@
     <string name="brightness_summary" msgid="838917350127550703">"Nastavení jasu displeje"</string>
     <string name="screen_timeout" msgid="4882669461447531301">"Interval vypnutí obrazovky"</string>
     <string name="screen_timeout_summary" msgid="2905757633140605334">"Nastavení prodlevy, po které se obrazovka automaticky vypne"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavení zámku karty SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Nastavení zámku karty SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Zámek karty SIM"</string>
@@ -436,7 +464,8 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stav"</string>
     <string name="device_status" msgid="607405385799807324">"Stav"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Telefonní číslo, signál, atd."</string>
-    <string name="storage_settings_title" msgid="8461515684514801302">"Karta SD a paměť telefonu"</string>
+    <string name="storage_settings" msgid="6681164315506788024">"Karta SD a paměť telefonu"</string>
+    <string name="storage_settings_title" msgid="5379463509034022773">"Nastavení karty SD a paměti telefonu"</string>
     <string name="storage_settings_summary" msgid="9176693537325988610">"Umožňuje odpojit kartu SD a zobrazit dostupnou paměť"</string>
     <string name="status_number" msgid="5123197324870153205">"Moje telefonní číslo"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
@@ -480,6 +509,11 @@
     <string name="apn_mms_port" msgid="4074188088199243040">"Port systému MMS"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"Typ ověření"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Žádné"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP nebo CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"typ APN"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Smazat APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nový APN"</string>
@@ -518,12 +552,15 @@
     <string name="location_network_based" msgid="8815705866861993344">"Zaměření přes bezdrátové sítě"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Zobrazuje polohu v aplikacích (jako Mapy) pomocí bezdrátových sítí"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Poloha je zaměřena pomocí WiFi nebo mobilních sítí"</string>
-    <string name="location_gps" msgid="375912731641377120">"Zapnout GPS"</string>
-    <string name="location_street_level" msgid="5899941752252356344">"Zaměření je s přesností na úrovni ulic (zrušením této volby lze šetřit baterii)"</string>
+    <string name="location_gps" msgid="6296125378829097831">"Použít satelity GPS"</string>
+    <string name="location_street_level" msgid="6460740847018275745">"Zaměření je s přesností na úrovni ulic (zrušením této volby lze šetřit baterii)"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Umožňuje zaměřit na úrovni ulic (vetší spotřeba baterie a nutný výhled na oblohu)"</string>
-    <string name="use_location_title" msgid="7585990952633568732">"Sdílet se společností Google"</string>
-    <string name="use_location_summary" msgid="4411467143899877395">"Povolit Googlu používat polohu k zlepšení vyhledávání a dalších služeb"</string>
-    <string name="use_location_warning_message" msgid="5696732842038416151">"Povolit Googlu, aby informace o poloze používal k poskytování přesnějších výsledků vyhledávání a dalších služeb"</string>
+    <string name="assisted_gps" msgid="4649317129586736885">"Použít systém A-GPS"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Vylepšit funkčnost GPS pomocí serveru (deaktivací této funkce snížíte využití sítě)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Vylepšit funkčnost GPS pomocí serveru (zrušením této funkce zvýšíte výkon GPS)"</string>
+    <string name="use_location_title" msgid="5447030582538504247">"Používat funkci Moje poloha"</string>
+    <string name="use_location_summary" msgid="1816849484040070431">"Používat funkci Moje poloha pro výsledky vyhledávání a další služby Google"</string>
+    <string name="use_location_warning_message" msgid="1420184860518262439">"Chcete Googlu umožnit využívat informace o poloze k poskytování přesnějších výsledků vyhledávání a dalších služeb?"</string>
     <string name="agree" msgid="6288718671527758326">"Souhlasím"</string>
     <string name="disagree" msgid="6221069272309799230">"Nesouhlasím"</string>
     <string name="about_settings" msgid="1743378368185371685">"Info o telefonu"</string>
@@ -538,6 +575,10 @@
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licence open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Při načítání licencí došlo k chybě."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Načítání..."</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Bezpečnostní informace"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Bezpečnostní informace"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Telefon není připojen k datové službě. Chcete-li tyto informace zobrazit nyní, přejděte na stránku %s z libovolného počítače připojeného k internetu."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Načítání..."</string>
     <string name="lock_settings_title" msgid="5828348303971852121">"Gesto pro odemknutí obrazovky"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Změna bezpečnostního gesta"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potvrďte uložené gesto"</string>
@@ -566,9 +607,9 @@
     <string name="skip_button_label" msgid="8680422740354436943">"Zrušit"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Další"</string>
     <string name="lock_title" msgid="4059246467204273930">"Zabezpečení telefonu"</string>
-    <string name="lock_intro_message" msgid="5352897389718432077"><font size="17">"Chraňte svůj telefon před nepovoleným použitím vytvořením osobního bezpečnostního gesta. "\n<font height="17">\n</font><b>"1"</b>"  Příklad takového gesta uvidíte na dalším snímku. "\n<font height="17">\n</font><b>"2"</b>"  Až budete připraveni, nakreslete své osobní bezpečnostní gesto. Vyzkoušejte více gest, ale vždy spojte alespoň čtyři tečky. "\n<font height="17">\n</font><b>"3"</b>"  Chcete-li gesto potvrdit, zopakujte je. "\n<font height="17">\n</font><b>"Jste připraveni začít? Zvolte tlačítko Další "</b>". "\n<font height="3">\n</font>"Chcete-li ponechat telefon nezabezpečený, zvolte tlačítko Zrušit."</font></string>
+    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Vytvořte si osobní gesto odemknutí a chraňte tak svůj telefon před nepovoleným použitím. "\n<font height="17">\n</font><b>"1"</b>"  Na dalším snímku uvidíte příklad takového gesta. "\n<font height="17">\n</font><b>"2"</b>"  Až budete připraveni, proveďte své osobní gesto odemknutí. Vyzkoušejte více gest, ale vždy spojte alespoň čtyři tečky. "\n<font height="17">\n</font><b>"3"</b>"  Opakujte gesto a tím jej potvrďte. "\n<font height="17">\n</font><b>"Jste připraveni začít? Dotkněte se tlačítka Další "</b>". "\n<font height="3">\n</font>"Chcete-li ponechat telefon nezabezpečený, dotkněte se tlačítka Storno."</font></string>
     <string name="lock_example_title" msgid="8052305554017485410">"Příklad gesta"</string>
-    <string name="lock_example_message" msgid="7431982730914254881">"Spojte alespoň čtyři tečky."\n" "\n"Až budete připraveni nakreslit vlastní gesto, zvolte tlačítko Další."</string>
+    <string name="lock_example_message" msgid="1838650097090632706">"Spojte alespoň čtyři tečky."\n" "\n"Až budete připraveni provést vlastní gesto, dotkněte se tlačítka Další."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Správa aplikací"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Umožňuje spravovat a odebírat instalované aplikace"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Aplikace"</string>
@@ -602,12 +643,12 @@
     <string name="filter" msgid="2018011724373033887">"Filtrovat"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Vyberte možnosti filtru"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Všechny"</string>
-    <string name="filter_apps_third_party" msgid="1096017647285183437">"Aplikace třetích stran"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Stažené"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Spuštěné"</string>
     <string name="loading" msgid="3200408047793887917">"Načítání..."</string>
     <string name="recompute_size" msgid="7722567982831691718">"Přepočítávání velikosti..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Smazat"</string>
-    <string name="clear_data_dlg_text" msgid="8796694785488630642">"Všechny informace, které jste v této aplikaci uložili, budou trvale smazány."</string>
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"Veškerá data (všechny soubory, nastavení, účty, databáze apod.) této aplikace budou trvale vymazána."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Zrušit"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"Aplikace nebyla nalezena"</string>
@@ -620,9 +661,23 @@
     <string name="security_settings_desc" msgid="3116027624526915561">"Tato aplikace má přístup k následujícím funkcím telefonu:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Probíhá výpočet…"</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Nepodařilo se určit velikost balíčku"</string>
-    <string name="empty_list_msg" msgid="1883660401486953588">"Žádné aplikace třetích stran nejsou nainstalovány."</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"Žádné aplikace třetích stran nejsou nainstalovány."</string>
     <string name="version_text" msgid="9189073826278676425">"verze <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
-    <string name="language_settings" msgid="2939555761536357092">"Národní prostředí a text"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"Spuštěné služby"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Zobrazit a ovládat aktuálně spuštěné služby"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"Probíhá restartování"</string>
+    <string name="no_running_services" msgid="6981216347270280598">"Žádné spuštěné služby"</string>
+    <string name="confirm_stop_service" msgid="5700448757318301681">"Zastavit službu?"</string>
+    <string name="confirm_stop_service_msg" msgid="1202118456282395730">"Služba vypnuta, dokud nebude znovu spuštěna. To může mít nežádoucí vliv na chování aplikace <xliff:g id="APPLICATION">%1$s</xliff:g>."</string>
+    <string name="confirm_stop_stop" msgid="7382363913280993331">"Zastavit"</string>
+    <string name="confirm_stop_cancel" msgid="206495326622692381">"Zrušit"</string>
+    <string name="service_started_by_app" msgid="8432097226392386802">"Spuštěno aplikací, zastavte dotykem"</string>
+    <string name="service_client_name" msgid="2337664610975074717">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: spravovat dotykem"</string>
+    <string name="service_background_processes" msgid="5158600475629177758">"K dispozici: <xliff:g id="FREE">%2$s</xliff:g> + <xliff:g id="MEMORY">%3$s</xliff:g> v <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_foreground_processes" msgid="4013890350284680796">"Ostatní: <xliff:g id="MEMORY">%2$s</xliff:g> v <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_process_name" msgid="8630408984456958400">"Proces: <xliff:g id="PROCESS">%1$s</xliff:g>"</string>
+    <string name="language_settings" msgid="502219872342167227">"Jazyk a klávesnice"</string>
+    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Nastavení jazyka a klávesnice"</string>
     <string name="language_settings_summary" msgid="595647729475399987">"Nastavení jazyka a oblasti, způsobu zadávání textu a automatických oprav"</string>
     <string name="language_category" msgid="3391756582724541530">"Nastavení národního prostředí"</string>
     <string name="text_category" msgid="6342540511465136739">"Nastavení textu"</string>
@@ -637,7 +692,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Znak „.“ lze vložit dvojím stisknutím klávesy Mezerník."</string>
     <string name="show_password" msgid="2198798062604049206">"Zobrazování hesel"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Zadávané heslo je zobrazováno"</string>
-    <string name="ime_security_warning" msgid="3458652708716006477">"Prostřednictví této metody zadávání dat lze shromažďovat zadaný text včetně osobních údajů, jako jsou hesla a čísla kreditních karet. Metoda je součástí aplikace <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Chcete povolit tuto metodu zadávání dat?"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"Prostřednictvím této metody zadávání dat lze shromažďovat zadaný text včetně osobních údajů, jako jsou hesla a čísla kreditních karet. Metoda je součástí aplikace <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Chcete tuto metodu zadávání dat použít?"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Uživatelský slovník"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"Uživatelský slovník"</string>
     <string name="user_dict_settings_summary" msgid="2460427065601355471">"Přidat nebo odebrat slova z uživatelského slovníku"</string>
@@ -665,7 +720,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Zadávání textu"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Správa možností zadávání textu"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Nastavení metody <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="4919680715154885028">"Nastavení klávesnice na obrazovce"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Nastavení klávesnice na obrazovce"</string>
     <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Klávesnice zařízení"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Nastavení vestavěné klávesnice"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Vývoj"</string>
@@ -676,11 +731,11 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Obrazovka se při nabíjení nepřepne do režimu spánku"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Povolit simulované polohy"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Povolit simulované polohy"</string>
-    <string name="adb_warning_title" msgid="1756027479229533250">"Aktivovat ladění USB?"</string>
+    <string name="adb_warning_title" msgid="6234463310896563253">"Povolit ladění USB?"</string>
     <string name="adb_warning_message" msgid="5352555112049663033">"Ladění USB je určeno pouze pro účely vývoje. Lze pomocí něho kopírovat data mezi počítačem a zařízením, instalovat aplikace do zařízení bez upozornění a číst data protokolů."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Zvolte gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Zvolte widget"</string>
-    <string name="battery_history_details_for" msgid="5189636461798594740">"Podrobnosti pro UID %d"</string>
+    <string name="battery_history_details_for" msgid="5924639922153109669">"Podrobnosti pro UID <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="battery_history_uid" msgid="1016606150528436298">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage" msgid="8010852371665217020">"Podrobnosti o používání sítě aplikací <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
     <string name="battery_history_bytes_received" msgid="980307569180518302">"Přijato bytů: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
@@ -716,12 +771,13 @@
     <string name="app_name_label" msgid="2000949925256858308">"Aplikace"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"Počet"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Doba použití"</string>
-    <string name="accessibility_settings_title" msgid="4239640930601071058">"Usnadnění"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"Usnadnění"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Nastavení usnadnění"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Možnosti správy usnadnění"</string>
     <string name="toggle_accessibility_title" msgid="650839277066574497">"Usnadnění"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Služby usnadnění"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Žádné nainstalované služby usnadnění."</string>
-    <string name="accessibility_service_security_warning" msgid="8386156287296967181">"Tato služba usnadnění může shromažďovat veškerý text, který napíšete, včetně osobních údajů a čísel kreditních karet, ne však hesla. Může také ukládat do protokolů vaše interakce s uživatelským rozhraním. Služba pochází z aplikace <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Chcete tuto službu usnadnění aktivovat?"</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Tato služba usnadnění může shromažďovat veškerý text, který napíšete, včetně osobních údajů a čísel kreditních karet, nikoli však hesla. Může také protokolovat vaše interakce s uživatelským rozhraním. Služba pochází z aplikace <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Chcete tuto službu usnadnění použít?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Deaktivovat usnadnění?"</string>
     <string name="power_usage_summary_title" msgid="5180282911164282324">"Využití baterie"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Co využívá baterii"</string>
@@ -733,7 +789,7 @@
     <string name="awake" msgid="387122265874485088">"Doba provozu zařízení"</string>
     <string name="wifi_on_time" msgid="4630925382578609056">"Doba provozu sítě WiFi"</string>
     <string name="bluetooth_on_time" msgid="4478515071957280711">"Doba provozu sítě WiFi"</string>
-    <string name="usage_name_percent" msgid="1899151069711662289">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="PERCENT">%2$s</xliff:g> %%"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Podrobnosti využití baterie"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Podrobnosti používání"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Upravit spotřebu energie"</string>
@@ -769,7 +825,7 @@
     <string name="battery_desc_wifi" msgid="1702486494565080431">"Využití baterie sítí WiFi"</string>
     <string name="battery_sugg_wifi" msgid="7542345142282261691">"Pokud síť WiFi nepoužíváte nebo na daném místě není k dispozici, vypněte ji."</string>
     <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Využití baterie technologií Bluetooth"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="144393178427277439">"Vypněte technologii Bluetooth, když ji nepoužíváte"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Vypněte technologii Bluetooth, když ji nepoužíváte."</string>
     <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Zkuste se připojit k jinému zařízení bluetooth"</string>
     <string name="battery_desc_apps" msgid="8123202939321333639">"Využití baterie spuštěnými aplikacemi"</string>
     <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Ukončete aplikaci nebo ji odinstalujte"</string>
@@ -781,9 +837,9 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Obnovit"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"OS Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
-    <string name="tts_settings" msgid="6454363854545277027">"Syntéza řeči"</string>
+    <string name="tts_settings" msgid="3348626948015962987">"Převod textu na řeč"</string>
     <string name="tts_settings_summary" msgid="2627715231944602766">"Nastavit možnosti syntézy řeči"</string>
-    <string name="tts_settings_title" msgid="5064947197040356736">"Ovládací prvky syntezátoru řeči"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Nastavení převodu textu na řeč"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Vždy používat moje nastavení"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Výchozí nastavení níže přepíše nastavení jednotlivých aplikací"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Výchozí nastavení"</string>
@@ -801,8 +857,11 @@
     <string name="tts_demo" msgid="405357591189935876">"Toto je příklad syntézy řeči."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Nastavení se změnilo. Toto je příklad současného znění."</string>
     <string name="gadget_title" msgid="7455548605888590466">"Ovládací prvek napájení"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Probíhá aktualizace nastavení Wi-Fi"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Probíhá aktualizace nastavení Bluetooth"</string>
+    <string name="credential_installer_activity_title" msgid="7600661521831762521">"Program na instalaci pověření"</string>
     <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Nastavení sítě VPN"</string>
-    <string name="vpn_connect_to" msgid="9040615733700098831">"Připojit k %s"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"Připojit k síti <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="vpn_username_colon" msgid="7854930370861306247">"Uživatelské jméno:"</string>
     <string name="vpn_password_colon" msgid="5716278710848606626">"Heslo:"</string>
     <string name="vpn_a_username" msgid="6664733641993968692">"uživatelské jméno"</string>
@@ -820,9 +879,9 @@
     <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Odpojit od sítě"</string>
     <string name="vpn_menu_edit" msgid="4526245173583195618">"Upravit síť"</string>
     <string name="vpn_menu_delete" msgid="3326527392609513129">"Smazat síť"</string>
-    <string name="vpn_error_miss_entering" msgid="1467455143582547499">"Je nutné zadat %s."</string>
-    <string name="vpn_error_miss_selecting" msgid="953436717902387192">"Musíte vybrat %s."</string>
-    <string name="vpn_error_duplicate_name" msgid="2786397299628471911">"Název sítě VPN %s již existuje. Zvolte jiný název."</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Je nutné zadat <xliff:g id="CODE">%s</xliff:g>."</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Musíte vybrat možnost <xliff:g id="OPTION">%s</xliff:g>."</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Název sítě VPN „<xliff:g id="NAME">%s</xliff:g>“ již existuje. Zvolte jiný název."</string>
     <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Opravdu chcete smazat tuto síť VPN?"</string>
     <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Opravdu nechcete vytvořit tento profil?"</string>
     <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Opravdu chcete zrušit změny provedené v tomto profilu?"</string>
@@ -833,10 +892,12 @@
     <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"V konfiguraci této sítě VPN chybí několik tajných nastavení. Chcete své tajné nastavení zkontrolovat?"</string>
     <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Zadané uživatelské jméno nebo heslo je nesprávné. Chcete to zkusit znovu?"</string>
     <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Server zavěsil. Zadané uživatelské jméno nebo heslo je možná nesprávné. Chcete to zkusit znovu?"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Server zavěsil. Je možné, že máte spuštěný firewall, který brání připojení k serveru. Chcete to zkusit znovu?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Vyjednávání se serverem se nezdařilo. Server možná nedokáže pracovat s nastavenou možností šifrování. Chcete zkontrolovat nastavení šifrování?"</string>
     <string name="vpn_type_title" msgid="6392933604218676224">"Přidat síť VPN"</string>
     <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Přidat síť VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2550661826320709266">"Přidat síť VPN %s"</string>
-    <string name="vpn_edit_title_edit" msgid="1769999313158207723">"%s – podrobnosti"</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Přidat síť VPN <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"<xliff:g id="NAME">%s</xliff:g> – podrobnosti"</string>
     <string name="vpns" msgid="3148141862835492816">"Sítě VPN"</string>
     <string name="vpn_connecting" msgid="8039521381692090116">"Připojování..."</string>
     <string name="vpn_disconnecting" msgid="7748050200708257066">"Odpojování..."</string>
@@ -844,8 +905,8 @@
     <string name="vpn_connect_hint" msgid="7442898962925875181">"Připojit k síti"</string>
     <string name="vpn_name" msgid="1550918148476193076">"Název sítě VPN"</string>
     <string name="vpn_a_name" msgid="8445736942405283509">"název sítě VPN"</string>
-    <string name="vpn_profile_added" msgid="2157095890825215726">"Položka %s je přidána"</string>
-    <string name="vpn_profile_replaced" msgid="384234123486734768">"Změny probíhají v %"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"Položka „<xliff:g id="NAME">%s</xliff:g>“ je přidána"</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"V profilu <xliff:g id="NAME">%s</xliff:g> probíhají změny"</string>
     <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Nastavit certifikát uživatele"</string>
     <string name="vpn_user_certificate" msgid="949322691686938888">"Certifikát uživatele"</string>
     <string name="vpn_a_user_certificate" msgid="8943983437956898649">"certifikát uživatele"</string>
@@ -866,53 +927,53 @@
     <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Název serveru sítě VPN"</string>
     <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Domény vyhledávání DNS"</string>
     <string name="vpn_dns_search_list" msgid="4230034234026605360">"Domény vyhledávání DNS"</string>
-    <string name="vpn_field_is_set" msgid="1880980734721258127">"%s je nastaveno"</string>
-    <string name="vpn_field_not_set" msgid="6827205815004809490">"%s není nastaveno"</string>
-    <string name="vpn_field_not_set_optional" msgid="8665901697706781015">"%s není nastaveno (nepovinné)"</string>
-    <string name="vpn_enable_field" msgid="3348948489989523325">"Aktivovat %s"</string>
-    <string name="vpn_disable_field" msgid="2286966253789266389">"Deaktivovat %s"</string>
-    <string name="vpn_is_enabled" msgid="5128973727115662815">"%s je aktivováno"</string>
-    <string name="vpn_is_disabled" msgid="8028085699769751756">"%s je deaktivováno"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"Hodnota <xliff:g id="VALUE">%s</xliff:g> je nastavena"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"Hodnota <xliff:g id="VALUE">%s</xliff:g> není nastavena"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"Hodnota <xliff:g id="VALUE">%s</xliff:g> není nastavena (nepovinné)"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"Povolit možnost <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"Deaktivovat <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"Položka <xliff:g id="OPTION">%s</xliff:g> je aktivována"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"Možnost <xliff:g id="OPTION">%s</xliff:g> je deaktivována"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Nastavení sítě VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Nastavit a spravovat sítě VPN"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nezměněno)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(není nastaveno)"</string>
-    <string name="cstor_settings_category" msgid="2284299080682591107">"Úložiště pověření"</string>
-    <string name="cstor_access_title" msgid="1739505390736236717">"Použít zabezpečená pověření"</string>
-    <string name="cstor_access_summary" msgid="4512681868217546677">"Povolit aplikacím přístup k zabezpečeným certifikátům a pověřením"</string>
-    <string name="cstor_access_dialog_title" msgid="3024256293191879190">"Zadejte heslo"</string>
-    <string name="cstor_access_dialog_hint_from_action" msgid="679746865623760961">"Zadejte heslo úložiště pověření."</string>
-    <string name="cstor_set_passwd_title" msgid="6156763762703061470">"Nastavit heslo"</string>
-    <string name="cstor_set_passwd_summary" msgid="5248560429856597398">"Nastavení nebo změna hesla úložiště pověření"</string>
-    <string name="cstor_set_passwd_dialog_title" msgid="4071157542842979977">"Nastavit heslo"</string>
-    <string name="cstor_reset_title" msgid="6001600882136794382">"Vymazat úložiště"</string>
-    <string name="cstor_reset_summary" msgid="7509525030771504833">"Vymazat veškerý obsah úložiště pověření a resetovat heslo"</string>
-    <string name="cstor_reset_hint" msgid="5331632794451859788">"Opravdu chcete smazat veškerá pověření a resetovat heslo úložiště pověření?"</string>
-    <string name="cstor_name_credential_dialog_title" msgid="1723509156126180662">"Zadat název certifikátu"</string>
-    <string name="cstor_credential_name" msgid="2958936431813760259">"Název certifikátu:"</string>
-    <string name="cstor_credential_password" msgid="7187440553141199409">"Heslo pro extrakci certifikátu:"</string>
-    <string name="cstor_credential_info" msgid="6097346149400207440">"Podrobnosti certifikátu:"</string>
-    <string name="cstor_name_credential_hint" msgid="6889198058976515785">"Název může obsahovat pouze písmena a čísla."</string>
-    <string name="cstor_old_password" msgid="979282118063084561">"Aktuální heslo:"</string>
-    <string name="cstor_new_password" msgid="6218562692435670047">"Nové heslo:"</string>
-    <string name="cstor_confirm_password" msgid="8996028123356342466">"Potvrďte nové heslo:"</string>
-    <string name="cstor_first_time_hint" msgid="1831593416099224962">"Nastavte heslo pro úložiště pověření."</string>
-    <string name="cstor_first_time_hint_from_action" msgid="4690937025845780557">"Nastavte heslo pro úložiště pověření."</string>
-    <string name="cstor_password_error" msgid="2917326097260402464">"Zadejte správné heslo."</string>
-    <string name="cstor_password_error_reset_warning" msgid="3336370539045905953">"Zadejte prosím správné heslo. Máte ještě jeden pokus na zadání správného hesla, jinak bude úložiště pověření vymazáno."</string>
-    <string name="cstor_password_error_reset_warning_plural" msgid="6209069679269017200">"Zadejte prosím správné heslo. Počet zbývajících pokusů na zadání správného hesla: %d. Po vyčerpání všech pokusů bude úložiště pověření vymazáno."</string>
-    <string name="cstor_passwords_error" msgid="956773958408751155">"Hesla se neshodují."</string>
-    <string name="cstor_passwords_empty_error" msgid="6062539742626760734">"Musíte zadat a potvrdit heslo."</string>
-    <string name="cstor_password_empty_error" msgid="7249632576906961482">"Zadejte heslo."</string>
-    <string name="cstor_password_verification_error" msgid="8553930704493511389">"Zadejte heslo znovu. Heslo musí mít alespoň 8 znaků a nesmí obsahovat mezery."</string>
-    <string name="cstor_name_empty_error" msgid="7499971191993770322">"Zadejte prosím jméno."</string>
-    <string name="cstor_name_char_error" msgid="8048089317968192516">"Zadejte název obsahující pouze písmena a čísla."</string>
-    <string name="cstor_storage_error" msgid="7140697503172458161">"Nelze uložit certifikát. Kliknutím na tlačítko OK to zkuste znovu."</string>
-    <string name="cstor_unable_to_save_cert" msgid="1631402544447196406">"Certifikát nelze uložit. Úložiště pověření není aktivováno nebo není správně inicializováno."</string>
-    <string name="cstor_cert_not_saved" msgid="6318149789449538491">"Certifikát není uložen."</string>
-    <string name="cstor_is_reset" msgid="449870501126790589">"Úložiště pověření je vymazáno."</string>
-    <string name="cstor_is_enabled" msgid="4054049098081482785">"Úložiště pověření je aktivováno."</string>
-    <string name="cstor_is_added" msgid="794788474010251572">"Položka %s je přidána."</string>
+    <string name="credentials_category" msgid="8536992056377271234">"Úložiště pověření"</string>
+    <string name="credentials_access" msgid="4843187230913860492">"Použít zabezpečená pověření"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"Povolit aplikacím přístup k zabezpečeným certifikátům a dalším pověřením"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"Zadejte heslo"</string>
+    <string name="credentials_unlock_hint" msgid="594679530407918031">"Zadejte heslo úložiště pověření."</string>
+    <string name="credentials_install_certificates" msgid="177337517568022236">"Instalace z karty SD"</string>
+    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Nainstalovat šifrované certifikáty z karty SD"</string>
+    <string name="credentials_set_password" msgid="9104473585811899989">"Nastavit heslo"</string>
+    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Nastavení nebo změna hesla úložiště pověření"</string>
+    <string name="credentials_reset" msgid="9170150870552453457">"Vymazat úložiště"</string>
+    <string name="credentials_reset_summary" msgid="1530388094693731636">"Vymazat veškerý obsah úložiště pověření a resetovat heslo"</string>
+    <string name="credentials_reset_hint" msgid="819990295796804516">"Opravdu chcete smazat veškerá pověření a resetovat heslo úložiště pověření?"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"Aktuální heslo:"</string>
+    <string name="credentials_new_password" msgid="267487774686796938">"Nové heslo:"</string>
+    <string name="credentials_confirm_password" msgid="4732250000633424345">"Potvrďte nové heslo:"</string>
+    <string name="credentials_first_time_hint" msgid="1567821077545346039">"Nastavte heslo pro úložiště pověření (nejméně 8 znaků)."</string>
+    <string name="credentials_wrong_password" msgid="7525192410790152041">"Zadejte správné heslo."</string>
+    <string name="credentials_reset_warning" msgid="6392481296673345268">"Zadejte prosím správné heslo. Máte ještě jeden pokus na zadání správného hesla, poté bude úložiště pověření vymazáno."</string>
+    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Zadejte prosím správné heslo. Počet zbývajících pokusů o zadání správného hesla: <xliff:g id="NUMBER">%1$d</xliff:g>. Po vyčerpání všech pokusů bude úložiště pověření vymazáno."</string>
+    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Hesla se neshodují."</string>
+    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Musíte zadat a potvrdit heslo."</string>
+    <string name="credentials_password_empty" msgid="8292138152983330473">"Zadejte heslo."</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"Heslo musí mít alespoň 8 znaků."</string>
+    <string name="credentials_erased" msgid="7700309135582200849">"Úložiště pověření je vymazáno."</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"Úložiště pověření je aktivováno."</string>
+    <string name="credentials_disabled" msgid="7453188089059045380">"Úložiště pověření je deaktivováno."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tísňové vyzvánění"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nastavit chování při tísňovém volání"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Ochrana osobních údajů"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Nastavení ochrany osobních údajů"</string>
+    <string name="location_section_title" msgid="6072558684044939786">"Poloha"</string>
+    <string name="settings_section_title" msgid="7413252428447723032">"Nastavení"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Osobní údaje"</string>
+    <string name="backup_settings_title" msgid="2968262658155327829">"Zálohovat moje nastavení"</string>
+    <string name="backup_erase_dialog_title" msgid="6028429904055779443">"Zálohování nastavení"</string>
+    <string name="backup_erase_dialog_message" msgid="9096433810456900531">"Opravdu chcete zastavit zálohování svých nastavení a vymazat všechny kopie na serverech Google?"</string>
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
+    <skip />
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index d58b27eee39..7427f2b9ddf 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -24,38 +24,59 @@
     <item msgid="5345178126174698955">"Pacific"</item>
     <item msgid="8392017019801393511">"Alle"</item>
   </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"Ingen animationer"</item>
+    <item msgid="6291186755504776720">"Nogle animationer"</item>
+    <item msgid="3856065399819979491">"Alle animationer"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"Der vises ingen vinduesanimationer"</item>
+    <item msgid="4460915688877708508">"Der vises nogle vinduesanimationer"</item>
+    <item msgid="488968798204105119">"Alle vinduesanimationer vises"</item>
+  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 sekunder"</item>
     <item msgid="8881760709354815449">"30 sekunder"</item>
     <item msgid="7589406073232279088">"1 minut"</item>
     <item msgid="7001195990902244174">"2 minutter"</item>
     <item msgid="5721688686241190620">"10 minutter"</item>
-    <item msgid="1781492122915870416">"Lad der aldrig opstå timeout"</item>
+    <item msgid="7156442995039264948">"30 minutter"</item>
+  </string-array>
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Meget langsomt"</item>
+    <item msgid="2361722960903353554">"Langsom"</item>
+    <item msgid="1145554631248513562">"Normal"</item>
+    <item msgid="7553665153391107454">"Hurtig"</item>
+    <item msgid="2538100882620724753">"Meget hurtig"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item msgid="7526050907652687351">"Meget lav"</item>
+    <item msgid="2692137425242433765">"Lav"</item>
+    <item msgid="3332408460740717754">"Normal"</item>
+    <item msgid="4907380534957572531">"Høj"</item>
+    <item msgid="4699640516390840297">"Meget høj"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item msgid="478030717868306353">"Amerikansk engelsk"</item>
+    <item msgid="5192284521396794598">"Britisk engelsk"</item>
+    <item msgid="3000262452051711991">"Fransk"</item>
+    <item msgid="9214080387341763401">"Tysk"</item>
+    <item msgid="5972100016440094433">"Italiensk"</item>
+    <item msgid="5811378076054402537">"Spansk"</item>
+  </string-array>
+  <string-array name="wifi_security_entries">
+    <item msgid="2923732046112398627">"Automatisk"</item>
+    <item msgid="5434666299123318296">"Ingen"</item>
+    <item msgid="3159594845889645948">"WEP"</item>
+    <item msgid="1687348101566181433">"WPA/WPA2 PSK"</item>
+    <item msgid="329777238762866787">"802.1x Enterprise"</item>
+  </string-array>
+  <string-array name="wifi_security_without_auto_entries">
+    <item msgid="4402120432904877907">"Ingen"</item>
+    <item msgid="2329148995431627488">"WEP"</item>
+    <item msgid="6903317668294332381">"WPA/WPA2 PSK"</item>
+    <item msgid="7280821339307729710">"802.1x Enterprise"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
-    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
-    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
-    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
-    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
-    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
-    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
-    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
-    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
-    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
-    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
-    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
-    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
-    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
-    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
-    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
-    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
-    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
-    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
-    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
-    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
-    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
-    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
-    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
   <string-array name="wifi_wep_type">
     <item msgid="1497433962958697183">"Automatisk"</item>
     <item msgid="7182335713815377158">"WEP ASCII"</item>
@@ -84,15 +105,27 @@
     <item msgid="1908750532762193304">"Start optælling"</item>
     <item msgid="1213951670006606353">"Programnavn"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
-    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
-    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
-    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
-    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
-    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
-    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
-    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
-    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
-    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
-    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="1818786254010764570">"Ingen"</item>
+    <item msgid="6189918678874123056">"PAP"</item>
+    <item msgid="1524112260493662517">"MSCHAP"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
+    <item msgid="8651992560135239389">"GTC"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Fra"</item>
+    <item msgid="3165868966179561687">"Underretning"</item>
+    <item msgid="6038758039030476855">"Vibrer"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"Ingen"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP eller CHAP"</item>
+  </string-array>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index fef35f0d695..231884188b5 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -15,6 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"Ja"</string>
+    <string name="no" msgid="6731231425810196216">"Nej"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Ukendt"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Slå radio til"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Slå radio fra"</string>
@@ -56,6 +58,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
     <string name="sdcard_setting" msgid="5922637503871474866">"SD-kort"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Batteristatus:"</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"Strømstik:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Batteriskala:"</string>
     <string name="battery_info_level_label" msgid="8706526709307788737">"Batteriniveau:"</string>
     <string name="battery_info_health_label" msgid="6416051542741886958">"Batterihelbred:"</string>
@@ -75,6 +78,11 @@
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"Aflader"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Oplader ikke"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Fuld"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Ikke sluttet til"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"Ukendte"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Ukendt"</string>
     <string name="battery_info_health_good" msgid="8070356565806711806">"God"</string>
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"Overophed"</string>
@@ -104,14 +112,19 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Anmodning om Bluetooth-parring"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Parringsanmodning"</string>
     <string name="bluetooth_notif_message" msgid="5381418499788668724">"Vælg for at parre med "</string>
+    <string name="device_picker" msgid="8721012448931226323">"Bluetooth-enhedssamler"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Anmodning om Bluetooth-tilladelse"</string>
+    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Et program på din telefon kræver tilladelse til at aktivere Bluetooth. Ønsker du at gøre dette?"</string>
+    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Et program på din telefon kræver tilladelse til, at din telefon er synlig for andre Bluetooth-enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du at gøre dette?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Et program på din telefon anmoder om tilladelse til at aktivere Bluetooth, så din telefon er synlig for andre enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du at gøre dette?"</string>
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Aktiverer Bluetooth …"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Dato- og tidsindstillinger"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 pm"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
     <string name="date_time_changeTime_text" msgid="7037437020000867740">"Skift tid"</string>
     <string name="date_time_changeDate_text" msgid="5259762626498028057">"Dato"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Vælg tidszone"</string>
-    <!-- no translation found for normal_date_format (1982904221918374153) -->
-    <skip />
+    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Eksempelvisning:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Skrifttypestørrelse:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -192,33 +205,23 @@
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxyindstillinger"</string>
     <string name="cancel" msgid="6859253417269739139">"Annuller"</string>
     <string name="settings_label" msgid="1626402585530130914">"Indstillinger"</string>
-    <!-- no translation found for settings_shortcut (3672145147925639262) -->
-    <skip />
+    <string name="settings_shortcut" msgid="3672145147925639262">"Indstillinger"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Flytilstand"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Deaktiver alle trådløse forbindelser"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Deaktiverer trådløse forbindelser ..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Aktiverer trådløse forbindelser ..."</string>
-    <string name="radio_controls_title" msgid="8356991079873437337">"Trådl. kontrolelementer"</string>
-    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
-    <skip />
-    <!-- no translation found for roaming (3596055926335478572) -->
-    <skip />
-    <!-- no translation found for roaming_enable (3737380951525303961) -->
-    <skip />
-    <!-- no translation found for roaming_disable (1295279574370898378) -->
-    <skip />
-    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
-    <skip />
-    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
-    <skip />
-    <!-- no translation found for roaming_warning (1269870211689178511) -->
-    <skip />
-    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
-    <skip />
-    <!-- no translation found for networks (6333316876545927039) -->
-    <skip />
-    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
-    <skip />
+    <string name="radio_controls_title" msgid="5868688473587168882">"Trådløst og netværk"</string>
+    <string name="wireless_networks_settings_title" msgid="149274247949769551">"Indstillinger for trådløs og netværk"</string>
+    <string name="radio_controls_summary" msgid="2998818677094465517">"Administrer Wi-Fi, Bluetooth, flytilstand, mobile netværker og VPN\'er"</string>
+    <string name="roaming" msgid="3596055926335478572">"Dataroaming"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Opret forbindelse til datatjenester under roaming"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Opret forbindelse til datatjenester under roaming"</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"Du har mistet dataforbindelsen, fordi du har forladt dit hjemmenetværk med dataroaming slået fra."</string>
+    <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Slå det til"</string>
+    <string name="roaming_warning" msgid="1269870211689178511">"Tillad dataroaming? Du kan komme ud for væsentlige gebyrer for roaming."</string>
+    <string name="roaming_reenable_title" msgid="7626425894611573131">"Bemærk"</string>
+    <string name="networks" msgid="6333316876545927039">"Udbydervalg"</string>
+    <string name="sum_carrier_select" msgid="6648929373316748020">"Vælg en netværksudbyder"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Dato og tid"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Indstil dato, tid, tidszone og formater"</string>
     <string name="date_time_auto" msgid="3086083265745944725">"Automatisk"</string>
@@ -231,25 +234,31 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Vælg datoformat"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sorter alfabetisk"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sorter efter tidszone"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"Sikkerhed og placering"</string>
-    <!-- no translation found for security_settings_summary (967393342537986570) -->
-    <skip />
+    <string name="security_settings_title" msgid="5168491784222013179">"Placering og sikkerhed"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"Indstillinger for placering og sikkerhed"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"Indstil Min placering, oplåsning af skærmen, SIM-kortlås, oplysningslagringslås"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Indstil Min placering, oplåsning af skærmen, oplysningslagringslås"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Adgangskoder"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Slå Bluetooth til"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth-indstillinger"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth-indstillinger"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Administrer forbindelser, indstil enhedsnavn og søgbarhed"</string>
-    <string name="bluetooth_pin_entry" msgid="5627349871303455279">"Anmodning om Bluetooth-parring"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Anmodning om Bluetooth-parring"</string>
     <string name="bluetooth_device_info" msgid="6644515376523965073">"Oplysninger om Bluetooth-enhed"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="7551139612735632370">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Indtast PIN-kode for at parre."\n"(Prøv 0000 eller 1234)."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Indtast PIN-kode for at forbinde med \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Prøv 0000 eller 1234)."</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Indtast adgangsnøgle for at forbinde med \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"For at parre med \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" skal du bekræfte, at den viser adgangsnøglen: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"ønsker at forbinde."</string>
+    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Indtast <xliff:g id="PASSKEY">%2$s</xliff:g> på \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" for at forbinde."</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Par"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Undlad at parre"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"Bluetooth-enhed"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Bemærk"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Der var problemer med at parre med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="6938408362011024289">"Der var problemer med at parre med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, fordi den indtastede PIN-kode er forkert."</string>
-    <!-- no translation found for bluetooth_pairing_device_down_error_message (6688215193824686741) -->
-    <skip />
-    <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
-    <skip />
+    <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Der var problemer med at forbinde med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, fordi PIN-koden eller adgangsnøglen er forkert."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"Der kan ikke etableres kommunikation med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Parring afvist af <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Der var problemer med at oprette forbindelse til <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Scan efter enheder"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Forbind"</string>
@@ -261,6 +270,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Opret forbindelse til ..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Medier"</string>
     <string name="bluetooth_profile_headset" msgid="1874975688666658946">"Telefon"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Overfør"</string>
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Forbundet til medielyd"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Forbundet til telefonlyd"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Forbundet til telefon- og medielyd"</string>
@@ -270,8 +280,11 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profiler"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Forbundet til medielyd"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Forbundet til telefonlyd"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Forbundet til filoverførselsserver"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ikke forbundet til filoverførselsserver"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Brug medielyd"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Brug til telefonlyd"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Brug til filoverførsel"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Slå Wi-Fi til"</string>
@@ -288,25 +301,13 @@
     <string name="security" msgid="1040691896987225267">"Sikkerhed"</string>
     <string name="wifi_security_open" msgid="3513305614048816607">"Åbn"</string>
     <string name="wifi_security_wep" msgid="7082604129842065776">"WEP"</string>
-    <string name="wifi_security_wpa" msgid="8980169410565477162">"WPA"</string>
-    <string name="wifi_security_wpa2" msgid="5780665935088930524">"WPA2"</string>
-    <!-- no translation found for wifi_security_wpa_eap (7485687331651751101) -->
-    <skip />
-    <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
-    <skip />
+    <string name="wifi_security_psk" msgid="3392399380570381452">"WPA/WPA2 PSK"</string>
+    <string name="wifi_security_eap" msgid="8309434150934969132">"Enterprise(802.1x)"</string>
     <string name="wifi_security_unknown" msgid="4564208312073060668">"Ukendt"</string>
-    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
-    <skip />
+    <string name="wifi_security_verbose_open" msgid="8117878112088901945">"åbent netværk"</string>
+    <string name="wifi_security_verbose_wep" msgid="9220757688700421508">"sikret med WEP"</string>
+    <string name="wifi_security_verbose_psk" msgid="1110130025330416225">"sikret med WPA/WPA2 PSK"</string>
+    <string name="wifi_security_verbose_eap" msgid="586632662086063">"sikret med 802.1x EAP"</string>
     <string name="ip_address" msgid="850672263358989449">"IP-adresse"</string>
     <string name="signal" msgid="1947969631626413228">"Signalstyrke"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"Tænder ..."</string>
@@ -319,28 +320,19 @@
     <string name="error_saving" msgid="8294279443961615302">"Netværket kunne ikke gemmes"</string>
     <string name="connect" msgid="3079076576295839400">"Forbind"</string>
     <string name="connect_to_blank" msgid="6950910074058025378">"Opret forbindelse til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for please_select_eap (4488240331626456338) -->
-    <skip />
-    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
-    <skip />
-    <!-- no translation found for please_type_identity (7061261155499513089) -->
-    <skip />
-    <!-- no translation found for please_type_anonymous_identity (835061562079965048) -->
-    <skip />
-    <!-- no translation found for please_select_client_certificate (2137906961594663234) -->
-    <skip />
-    <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
-    <skip />
-    <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
-    <skip />
+    <string name="please_select_eap" msgid="4488240331626456338">"EAP-metode"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Fase 2-godkendelse"</string>
+    <string name="please_type_identity" msgid="7061261155499513089">"Identitet"</string>
+    <string name="please_type_anonymous_identity" msgid="835061562079965048">"Anonym identitet"</string>
+    <string name="please_select_client_certificate" msgid="2137906961594663234">"Klientcertifikat"</string>
+    <string name="please_select_ca_certificate" msgid="5010815181914420677">"CA-certifikat"</string>
     <string name="please_type_passphrase" msgid="8256017704131522462">"Adgangskode til trådløs"</string>
     <string name="please_type_hex_key" msgid="8751224390407867551">"tast til \"WEP-heksadecimal\" (0-9, A-F)"</string>
     <string name="wifi_show_password" msgid="4235237470701732009">"Vis adgangskode."</string>
     <string name="scan_wifi" msgid="2459901725350542606">"Scan"</string>
     <string name="summary_not_in_range" msgid="3926674700733548684">"Ikke inden for rækkevidde"</string>
-    <!-- no translation found for summary_remembered (6079941090549401742) -->
-    <skip />
-    <string name="summary_connection_failed" msgid="7610394657613410489">"Forbindelsen mislykkedes. Vælg for at prøve igen"</string>
+    <string name="summary_remembered" msgid="6079941090549401742">"husket"</string>
+    <string name="summary_connection_failed" msgid="2351885658101671413">"Forbindelsen mislykkedes. Tryk for at prøve igen"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-netværk"</string>
     <string name="wifi_type_ssid" msgid="1326839657083292017">"Netværk-SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sikkerhed"</string>
@@ -391,6 +383,7 @@
     <string name="status_disconnected" msgid="7561688569905126046">"Afbrudt"</string>
     <string name="status_failed" msgid="610462050405904601">"Mislykkedes"</string>
     <string name="sound_and_display_settings" msgid="349770582993029003">"Lyd og visning"</string>
+    <string name="sound_and_display_settings_title" msgid="5036144539683697330">"Indstillinger for lyd og visning"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Lydindstillinger"</string>
     <string name="sound_and_display_settings_summary" msgid="1433943789593286064">"Indstil ringetoner, meddelelser, skærmlysstyrke"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Lydløs"</string>
@@ -416,17 +409,16 @@
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"Lydudvalg"</string>
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Afspil lyd, når der foretages skærmvalg"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Afspil lyd, når der foretages skærmvalg"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Feedback ved berøring"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrerer, når der trykkes på funktionstaster og ved visse interaktioner med brugergrænsefladen"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrerer, når der trykkes på funktionstaster og ved visse interaktioner med brugergrænsefladen"</string>
     <string name="play_media_notification_sounds_enable_title" msgid="1008791464029179529">"SD-kortmeddelelser"</string>
-    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
-    <skip />
-    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
-    <skip />
-    <string name="sync_settings" msgid="2212736205476453234">"Datasynkronisering"</string>
-    <string name="sync_settings_summary" msgid="6480534906375217074">"Vælg, hvilke programmer der skal synkroniseres"</string>
-    <!-- no translation found for search_settings (1910951467596035063) -->
-    <skip />
-    <!-- no translation found for search_settings_summary (9205656546570654169) -->
-    <skip />
+    <string name="play_media_notification_sounds_enable_summary_on" msgid="7675466959375667370">"Afspil lyd for SD-kortmeddelelser"</string>
+    <string name="play_media_notification_sounds_enable_summary_off" msgid="8672617597028744693">"Afspil lyd for SD-kortmeddelelser"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Konti og synkronisering"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"Tilføj eller fjern konti, og skift kontoindstillinger"</string>
+    <string name="search_settings" msgid="1910951467596035063">"Søg"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Administrer søgeindstillinger og oversigt"</string>
     <string name="display_settings" msgid="3912042046350078328">"Visningsindstillinger"</string>
     <string name="animations_title" msgid="1062189037402346023">"Animation"</string>
     <string name="animations_summary_on" msgid="8843613112130484436">"Vis animationer, når der åbnes og lukkes for vinduer"</string>
@@ -438,6 +430,7 @@
     <string name="brightness_summary" msgid="838917350127550703">"Juster skærmens lysstyrke"</string>
     <string name="screen_timeout" msgid="4882669461447531301">"Timeout for skærmen"</string>
     <string name="screen_timeout_summary" msgid="2905757633140605334">"Juster forsinkelsen, inden skærmen slukkes automatisk"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Indstillinger for lås af SIM-kort"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Opsæt SIM-kortlås"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kortlås"</string>
@@ -470,18 +463,14 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Ikke tilgængelig"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
-    <!-- no translation found for device_status_summary (2599162787451519618) -->
-    <skip />
-    <string name="storage_settings_title" msgid="8461515684514801302">"SD-kort og tlf.lag.plads"</string>
+    <string name="device_status_summary" msgid="2599162787451519618">"Telefonnummer, signal osv."</string>
+    <string name="storage_settings" msgid="6681164315506788024">"SD-kort og tlf.lag.plads"</string>
+    <string name="storage_settings_title" msgid="5379463509034022773">"Indstillinger for lagerplads på SD-kort og telefon"</string>
     <string name="storage_settings_summary" msgid="9176693537325988610">"Demonter SD-kort, vis ledig lagerplads"</string>
-    <!-- no translation found for status_number (5123197324870153205) -->
-    <skip />
-    <!-- no translation found for status_min_number (3519504522179420597) -->
-    <skip />
-    <!-- no translation found for status_prl_version (8499039751817386529) -->
-    <skip />
-    <!-- no translation found for status_meid_number (1751442889111731088) -->
-    <skip />
+    <string name="status_number" msgid="5123197324870153205">"Mit telefonnummer"</string>
+    <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_prl_version" msgid="8499039751817386529">"PRL-version"</string>
+    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Mobil netværkstype"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Mobil netværkstilstand"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Servicetilstand"</string>
@@ -520,6 +509,11 @@
     <string name="apn_mms_port" msgid="4074188088199243040">"MMS-port"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"Godkendelsestype"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Ingen"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP eller CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN-type"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Slet APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Ny APN"</string>
@@ -535,11 +529,9 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Nulstilling af APN-standardindstillinger afsluttet"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Nulstilling af fabriksdata"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Sletter alle data på telefonen"</string>
-    <!-- no translation found for master_clear_desc (7823268823499739178) -->
-    <skip />
+    <string name="master_clear_desc" msgid="7823268823499739178">"Dette sletter alle data fra din telefon, inklusive :"\n<li>"Din Google-konto"</li>\n<li>"System- og programdata samt indstillinger"</li>\n<li>"Downloadede programmer"</li>\n"Det sletter ikke:"\n<li>"Nuværende systemsoftware og programbundter"</li>\n<li>"SD-kortfiler, som f.eks. musik og fotos"</li></string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Nulstil telefon"</string>
-    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
-    <skip />
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"Slet alle dine personlige oplysninger og downloadede programmer? Denne handling kan ikke omstødes?"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Slet alting"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Tegn dit mønster til at låse op"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Du skal tegne dit mønster til at låse op for at bekræfte nulstilling af telefonen."</string>
@@ -556,20 +548,19 @@
     <string name="call_settings_summary" msgid="7291195704801002886">"Opsæt voicemail, viderestilling af opkald, ventende opkald, opkalds-id"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilnetværk"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Indstil valgmuligheder for roaming, netværk, APN\'er"</string>
-    <!-- no translation found for location_title (1029961368397484576) -->
-    <skip />
+    <string name="location_title" msgid="1029961368397484576">"Min placering"</string>
     <string name="location_network_based" msgid="8815705866861993344">"Brug trådløse netværk"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Se placering i programmer (som f.eks. Maps) ved hjælp af trådløse netværk"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Placering er afgjort af Wi-Fi og/eller mobile netværk"</string>
-    <string name="location_gps" msgid="375912731641377120">"Aktiver GPS-satelliter"</string>
-    <string name="location_street_level" msgid="5899941752252356344">"Find præcise placeringer på gadeniveau (fravælg for at spare på batteriet)"</string>
+    <string name="location_gps" msgid="6296125378829097831">"Brug GPS-satellitter"</string>
+    <string name="location_street_level" msgid="6460740847018275745">"Find præcise placeringer på gadeniveau (fjern markering for at spare på batteriet)"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Gå til gadeniveau (kræver mere batteri plus visning af himmel)"</string>
-    <!-- no translation found for use_location_title (7585990952633568732) -->
-    <skip />
-    <!-- no translation found for use_location_summary (4411467143899877395) -->
-    <skip />
-    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
-    <skip />
+    <string name="assisted_gps" msgid="4649317129586736885">"Brug assisteret GPS"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Brug server til at assistere GPS (fjern markering for at mindske netværksforbrug)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Brug server til at assistere GPS (fjern markering for at forbedre GPS-ydelsen)"</string>
+    <string name="use_location_title" msgid="5447030582538504247">"Brug Min placering"</string>
+    <string name="use_location_summary" msgid="1816849484040070431">"Brug Min placering til Google-søgeresultater og andre Google-tjenester"</string>
+    <string name="use_location_warning_message" msgid="1420184860518262439">"Tillad Google at bruge placering til forbedrede søgeresultater og andre tjenester?"</string>
     <string name="agree" msgid="6288718671527758326">"Enig"</string>
     <string name="disagree" msgid="6221069272309799230">"Ikke enig"</string>
     <string name="about_settings" msgid="1743378368185371685">"Om telefon"</string>
@@ -579,12 +570,15 @@
     <string name="copyright_title" msgid="865906688917260647">"Ophavsret"</string>
     <string name="license_title" msgid="1990487604356037871">"Licens"</string>
     <string name="terms_title" msgid="7697580845616764642">"Vilkår og betingelser"</string>
-    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
-    <skip />
+    <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Systemselvstudie"</string>
     <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Lær, hvordan du bruger din telefon"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open source-licenser"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Der er problemer med at indlæse licenserne."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Indlæser ..."</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Sikkerhedsoplysninger"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Sikkerhedsoplysninger"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Din telefon er ikke tilsluttet en datatjeneste. For at se disse oplysninger nu skal du gå til  %s fra en hvilken som helst computer, der er forbundet til internettet."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Indlæser ..."</string>
     <string name="lock_settings_title" msgid="5828348303971852121">"Mønster til at låse skærmen op"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Skift oplåsningsmønster"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bekræft gemt mønster"</string>
@@ -613,9 +607,9 @@
     <string name="skip_button_label" msgid="8680422740354436943">"Annuller"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Næste"</string>
     <string name="lock_title" msgid="4059246467204273930">"Sikring af din telefon"</string>
-    <string name="lock_intro_message" msgid="5352897389718432077"><font size="17">"Beskyt din telefon mod uautoriseret brug ved at oprette et personligt mønster til at låse skærmen op. "\n<font height="17">\n</font><b>"1"</b>"  På den næste skærm kan du se et eksempel på, hvordan mønsteret tegnes. "\n<font height="17">\n</font><b>"2"</b>"  Når du er klar, kan du tegne dit eget personlige mønster til at låse op. Eksperimenter med forskellige mønstre, men forbind mindst fire punkter. "\n<font height="17">\n</font><b>"3"</b>"  Tegn dit mønster igen for at bekræfte. "\n<font height="17">\n</font><b>"Er du klar? Vælg \"Næste\""</b>". "\n<font height="3">\n</font>"Du kan efterlade din telefon ubeskyttet ved at vælge \"Annuller\"."</font></string>
+    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Beskyt din telefon mod uautoriseret brug ved at oprette et personligt mønster til at låse skærmen op. "\n<font height="17">\n</font><b>"1"</b>"  På næste skærm kan du se et eksempel på, hvordan mønsteret tegnes. "\n<font height="17">\n</font><b>"2"</b>"  Når du er klar, kan du tegne dit eget personlige mønster til at låse op. Eksperimenter med forskellige mønstre, men forbind mindst fire punkter. "\n<font height="17">\n</font><b>"3"</b>"  Tegn dit mønster igen for at bekræfte. "\n<font height="17">\n</font><b>"Er du klar? Tryk på \"Næste\""</b>". "\n<font height="3">\n</font>"Du kan lade din telefon være ubeskyttet ved at trykke på \"Annuller\"."</font></string>
     <string name="lock_example_title" msgid="8052305554017485410">"Eksempelmønster"</string>
-    <string name="lock_example_message" msgid="7431982730914254881">"Forbind mindst fire punkter."\n" "\n"Vælg \"Næste\", når du er klar til at tegne dit eget mønster."</string>
+    <string name="lock_example_message" msgid="1838650097090632706">"Forbind mindst fire punkter."\n" "\n"Tryk på \"Næste\", når du er klar til at tegne dit eget mønster."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Administ. programmer"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Administrer og fjern installerede programmer"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Programmer"</string>
@@ -638,8 +632,7 @@
     <string name="data_size_label" msgid="8679376373625710107">"Data"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Afinstaller"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Ryd data"</string>
-    <!-- no translation found for app_factory_reset (6635744722502563022) -->
-    <skip />
+    <string name="app_factory_reset" msgid="6635744722502563022">"Afinstaller opdateringer"</string>
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Du har valgt at starte dette program som standard for nogle handlinger."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Der er ikke indstillet nogen standarder."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Ryd standarder"</string>
@@ -650,32 +643,41 @@
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Vælg filtervalgmuligheder"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Alle"</string>
-    <string name="filter_apps_third_party" msgid="1096017647285183437">"Tredjeparts"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Overført"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Kørende"</string>
     <string name="loading" msgid="3200408047793887917">"Indlæser ..."</string>
     <string name="recompute_size" msgid="7722567982831691718">"Beregner størrelse igen ..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Slet"</string>
-    <string name="clear_data_dlg_text" msgid="8796694785488630642">"Alle de oplysninger, du har gemt i dette program, slettes permanent."</string>
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"Alle dette programs data slettes permanent. Det omfatter alle filer, indstillinger, konti, databaser osv."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Annuller"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"Programmet blev ikke fundet"</string>
     <string name="app_not_found_dlg_text" msgid="2980271680333341554">"Programmet blev ikke fundet på listen over installerede programmer."</string>
     <string name="clear_data_failed" msgid="581956197586913865">"Programdata kunne ikke ryddes."</string>
-    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
-    <skip />
-    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
-    <skip />
-    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
-    <skip />
-    <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
-    <skip />
+    <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Afinstaller opdateringer"</string>
+    <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Ønsker du at afinstallere alle opdateringer til dette Android-systemprogram?"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Ryd data"</string>
+    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Rydning af data til programmet mislykkedes"</string>
     <string name="security_settings_desc" msgid="3116027624526915561">"Dette program kan få adgang til følgende på din telefon:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Beregner ..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Pakkestørrelse kunne ikke beregnes"</string>
-    <string name="empty_list_msg" msgid="1883660401486953588">"Du har ikke installeret nogen tredjepartsprogrammer."</string>
-    <!-- no translation found for version_text (9189073826278676425) -->
-    <skip />
-    <string name="language_settings" msgid="2939555761536357092">"Landestandard og tekst"</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"Du har ikke installeret nogen tredjepartsprogrammer."</string>
+    <string name="version_text" msgid="9189073826278676425">"version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"Kørende tjenester"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Vis og kontroller igangværende tjenester"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"Genstarter"</string>
+    <string name="no_running_services" msgid="6981216347270280598">"Der er ingen kørende tjenester"</string>
+    <string name="confirm_stop_service" msgid="5700448757318301681">"Stop tjeneste?"</string>
+    <string name="confirm_stop_service_msg" msgid="1202118456282395730">"Denne tjeneste kører ikke, før den startes igen. Det kan have uønskede konsekvenser for programmet <xliff:g id="APPLICATION">%1$s</xliff:g>."</string>
+    <string name="confirm_stop_stop" msgid="7382363913280993331">"Stop"</string>
+    <string name="confirm_stop_cancel" msgid="206495326622692381">"Annuller"</string>
+    <string name="service_started_by_app" msgid="8432097226392386802">"Startet af program: tryk for at stoppe"</string>
+    <string name="service_client_name" msgid="2337664610975074717">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: tryk for at administrere"</string>
+    <string name="service_background_processes" msgid="5158600475629177758">"Ledig: <xliff:g id="FREE">%2$s</xliff:g>+<xliff:g id="MEMORY">%3$s</xliff:g> i <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_foreground_processes" msgid="4013890350284680796">"Andre: <xliff:g id="MEMORY">%2$s</xliff:g> i <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_process_name" msgid="8630408984456958400">"Proces: <xliff:g id="PROCESS">%1$s</xliff:g>"</string>
+    <string name="language_settings" msgid="502219872342167227">"Sprog og tastatur"</string>
+    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Sprog- og tastaturindstillinger"</string>
     <string name="language_settings_summary" msgid="595647729475399987">"Indstil landestandard (land og område), tekstinput…"</string>
     <string name="language_category" msgid="3391756582724541530">"Landestandardindstilling"</string>
     <string name="text_category" msgid="6342540511465136739">"Tekstindstillinger"</string>
@@ -690,7 +692,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Tryk på mellemrumstasten to gange for at indsætte \".\""</string>
     <string name="show_password" msgid="2198798062604049206">"Synlig adgangskode"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Vis adgangskode, mens du indtaster"</string>
-    <string name="ime_security_warning" msgid="3458652708716006477">"Inputmetoden vil muligvis være i stand til at indsamle al den tekst, du indtaster, inklusive personlige data som adgangskoder og kreditkortnumre. Den kommer fra programmet <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Aktiver denne inputmetode?"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"Denne indtastningsmetode vil muligvis være i stand til at indsamle al den tekst, du indtaster, herunder personlige data som adgangskoder og kreditkortnumre. Den kommer fra programmet <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Vil du bruge denne indtastningsmetode?"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Brugerordbog"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"Brugerordbog"</string>
     <string name="user_dict_settings_summary" msgid="2460427065601355471">"Tilføj og fjern ord fra brugerordbogen"</string>
@@ -718,7 +720,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Tekstinput"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Administrer valgmuligheder for tekstinput"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> indstillinger"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="4919680715154885028">"Indstillinger for skærmtastatur"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Indstillinger for skærmens tastatur"</string>
     <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Enhedstastatur"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Indstillinger for indbygget tastatur"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Udvikling"</string>
@@ -729,13 +731,11 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skærmen går aldrig i dvale, når der lades op"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Tillad imiterede placer."</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillad imiterede placer."</string>
-    <!-- no translation found for adb_warning_title (1756027479229533250) -->
-    <skip />
-    <!-- no translation found for adb_warning_message (5352555112049663033) -->
-    <skip />
+    <string name="adb_warning_title" msgid="6234463310896563253">"Vil du tillade USB-fejlretning?"</string>
+    <string name="adb_warning_message" msgid="5352555112049663033">"USB-fejlretning er kun beregnet til udviklingsformål. Det kan bruges til at kopiere data mellem din computer og din enhed, installere programmer på din enhed uden underretning og læse logdata."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Vælg gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Vælg widget"</string>
-    <string name="battery_history_details_for" msgid="5189636461798594740">"Detaljer for UID %d"</string>
+    <string name="battery_history_details_for" msgid="5924639922153109669">"Detaljer for UID <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="battery_history_uid" msgid="1016606150528436298">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage" msgid="8010852371665217020">"Netværksbrugsdetaljer for <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
     <string name="battery_history_bytes_received" msgid="980307569180518302">"Modtagne bytes: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
@@ -746,14 +746,10 @@
     <string name="battery_history_system_time" msgid="2015862072724507547">"Systemtid:"</string>
     <string name="battery_history_total_time" msgid="3618703970098556104">"Tid i alt:"</string>
     <string name="battery_history_starts" msgid="9137453931978571696">"Start: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
-    <!-- no translation found for battery_history_days (7110262897769622564) -->
-    <skip />
-    <!-- no translation found for battery_history_hours (7525170329826274999) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
-    <skip />
-    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
-    <skip />
+    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>t <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
+    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>t <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
+    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
+    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>S"</string>
     <string name="battery_history_packages_sharing_this_uid" msgid="4101596071379250050">"Pakker, der deler denne UID:"</string>
     <string name="battery_history_no_data" msgid="1177238743237067617">"Der er ingen tilgængelige batteribrugsdata"</string>
     <string name="battery_history_sensor" msgid="2333488996028993982">"Sensor:"</string>
@@ -775,400 +771,209 @@
     <string name="app_name_label" msgid="2000949925256858308">"Program"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"Optælling"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Brugstid"</string>
-    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
-    <skip />
-    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
-    <skip />
-    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
-    <skip />
-    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
-    <skip />
-    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
-    <skip />
-    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
-    <skip />
-    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
-    <skip />
-    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
-    <skip />
-    <!-- no translation found for power_usage_summary (7237084831082848168) -->
-    <skip />
-    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
-    <skip />
-    <!-- no translation found for battery_since_reset (7464546661121187045) -->
-    <skip />
-    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
-    <skip />
+    <string name="accessibility_settings" msgid="3975902491934816215">"Tilgængelighed"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Indstillinger for tilgængelighed"</string>
+    <string name="accessibility_settings_summary" msgid="8185181964847149507">"Administrer tilgængelighedsvalgmuligheder"</string>
+    <string name="toggle_accessibility_title" msgid="650839277066574497">"Tilgængelighed"</string>
+    <string name="accessibility_services_category" msgid="8127851026323672607">"Tilgængelighedstjenester"</string>
+    <string name="no_accessibility_services_summary" msgid="694578333333808159">"Der er ingen installerede tilgængelighedstjenester."</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Denne tilgængelighedstjeneste vil muligvis være i stand til at indsamle al den tekst, du indtaster, inklusive personlige data, kreditkortoplysninger undtagen adgangskoder. Den kan også registrere dine brugergrænsefladeinteraktioner. Den kommer fra programmet <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Vil du aktivere denne tilgængelighedstjeneste?"</string>
+    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Deaktiver tilgængelighed?"</string>
+    <string name="power_usage_summary_title" msgid="5180282911164282324">"Batteriforbrug"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"Hvad, der har brugt batteriet"</string>
+    <string name="battery_since_unplugged" msgid="338073389740738437">"Batteriforbrug siden afbrydelse"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"Batteriforbrug siden nulstilling"</string>
+    <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> siden afbrydelse"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <!-- no translation found for awake (387122265874485088) -->
-    <skip />
-    <!-- no translation found for wifi_on_time (4630925382578609056) -->
-    <skip />
-    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
-    <skip />
-    <!-- no translation found for usage_name_percent (1899151069711662289) -->
-    <skip />
-    <!-- no translation found for details_title (7564809986329021063) -->
-    <skip />
-    <!-- no translation found for details_subtitle (32593908269911734) -->
-    <skip />
-    <!-- no translation found for controls_subtitle (390468421138288702) -->
-    <skip />
-    <!-- no translation found for packages_subtitle (4736416171658062768) -->
-    <skip />
-    <!-- no translation found for power_screen (2353149143338929583) -->
-    <skip />
-    <!-- no translation found for power_wifi (2382791137776486974) -->
-    <skip />
-    <!-- no translation found for power_bluetooth (4373329044379008289) -->
-    <skip />
-    <!-- no translation found for power_cell (6596471490976003056) -->
-    <skip />
-    <!-- no translation found for power_phone (5392641106474567277) -->
-    <skip />
-    <!-- no translation found for power_idle (9055659695602194990) -->
-    <skip />
-    <!-- no translation found for usage_type_cpu (715162150698338714) -->
-    <skip />
-    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
-    <skip />
-    <!-- no translation found for usage_type_gps (7989688715128160790) -->
-    <skip />
-    <!-- no translation found for usage_type_phone (9108247984998041853) -->
-    <skip />
-    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
-    <skip />
-    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
-    <skip />
-    <!-- no translation found for usage_type_audio (6957269406840886290) -->
-    <skip />
-    <!-- no translation found for usage_type_video (4295357792078579944) -->
-    <skip />
-    <!-- no translation found for usage_type_on_time (3351200096173733159) -->
-    <skip />
-    <!-- no translation found for usage_type_no_coverage (3797004252954385053) -->
-    <skip />
-    <!-- no translation found for battery_action_stop (649958863744041872) -->
-    <skip />
-    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
-    <skip />
-    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
-    <skip />
-    <!-- no translation found for battery_action_display (5302763261448580102) -->
-    <skip />
-    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
-    <skip />
-    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
-    <skip />
-    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
-    <skip />
-    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
-    <skip />
-    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
-    <skip />
-    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
-    <skip />
-    <!-- no translation found for battery_desc_display (5432795282958076557) -->
-    <skip />
-    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
-    <skip />
-    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
-    <skip />
-    <!-- no translation found for battery_sugg_wifi (7542345142282261691) -->
-    <skip />
-    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
-    <skip />
-    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
-    <skip />
-    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
-    <skip />
-    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_gps (4145005297393800223) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
-    <skip />
-    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
-    <skip />
-    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
-    <skip />
-    <!-- no translation found for menu_stats_total (8973377864854807854) -->
-    <skip />
-    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
-    <skip />
-    <!-- no translation found for process_kernel_label (3916858646836739323) -->
-    <skip />
-    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
-    <skip />
-    <!-- no translation found for tts_settings (6454363854545277027) -->
-    <skip />
-    <!-- no translation found for tts_settings_summary (2627715231944602766) -->
-    <skip />
-    <!-- no translation found for tts_settings_title (5064947197040356736) -->
-    <skip />
-    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
-    <skip />
-    <!-- no translation found for use_default_tts_settings_summary (4253502106159206276) -->
-    <skip />
-    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
-    <skip />
-    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
-    <skip />
-    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
-    <skip />
-    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
-    <skip />
-    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
-    <skip />
-    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
-    <skip />
-    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
-    <skip />
-    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
-    <skip />
-    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
-    <skip />
-    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
-    <skip />
-    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
-    <skip />
-    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
-    <skip />
-    <!-- no translation found for tts_demo (405357591189935876) -->
-    <skip />
-    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
-    <skip />
-    <!-- no translation found for gadget_title (7455548605888590466) -->
-    <skip />
-    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
-    <skip />
-    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
-    <skip />
-    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
-    <skip />
-    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
-    <skip />
-    <!-- no translation found for vpn_a_username (6664733641993968692) -->
-    <skip />
-    <!-- no translation found for vpn_a_password (1537213632501483753) -->
-    <skip />
-    <!-- no translation found for vpn_save_username (1408415289165970790) -->
-    <skip />
-    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
-    <skip />
-    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
-    <skip />
-    <!-- no translation found for vpn_no_button (7620339571187119107) -->
-    <skip />
-    <!-- no translation found for vpn_back_button (192036339792734970) -->
-    <skip />
-    <!-- no translation found for vpn_mistake_button (1683383660912491270) -->
-    <skip />
-    <!-- no translation found for vpn_menu_done (93528279226907926) -->
-    <skip />
-    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
-    <skip />
-    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
-    <skip />
-    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
-    <skip />
-    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
-    <skip />
-    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
-    <skip />
-    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
-    <skip />
-    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
-    <skip />
-    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
-    <skip />
-    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
-    <skip />
-    <!-- no translation found for vpn_reconnect_from_lost (2442844155623372118) -->
-    <skip />
-    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
-    <skip />
-    <!-- no translation found for vpn_challenge_error_dialog_msg (6174901754230038601) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set_dialog_msg (8013052814131532765) -->
-    <skip />
-    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
-    <skip />
-    <!-- no translation found for vpn_remote_hung_up_error_dialog_msg (1566946015052633150) -->
-    <skip />
-    <!-- no translation found for vpn_type_title (6392933604218676224) -->
-    <skip />
-    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
-    <skip />
-    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
-    <skip />
-    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
-    <skip />
-    <!-- no translation found for vpns (3148141862835492816) -->
-    <skip />
-    <!-- no translation found for vpn_connecting (8039521381692090116) -->
-    <skip />
-    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
-    <skip />
-    <!-- no translation found for vpn_connected (7641723116362845781) -->
-    <skip />
-    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
-    <skip />
-    <!-- no translation found for vpn_name (1550918148476193076) -->
-    <skip />
-    <!-- no translation found for vpn_a_name (8445736942405283509) -->
-    <skip />
-    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
-    <skip />
-    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
-    <skip />
-    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
-    <skip />
-    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
-    <skip />
-    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
-    <skip />
-    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
-    <skip />
-    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
-    <skip />
-    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
-    <skip />
-    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
-    <skip />
-    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
-    <skip />
-    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
-    <skip />
-    <!-- no translation found for vpn_pptp_encryption_title (2236795167467896499) -->
-    <skip />
-    <!-- no translation found for vpn_pptp_encryption (2602329949737259686) -->
-    <skip />
-    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
-    <skip />
-    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
-    <skip />
-    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
-    <skip />
-    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
-    <skip />
-    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
-    <skip />
-    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
-    <skip />
-    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
-    <skip />
-    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
-    <skip />
-    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
-    <skip />
-    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
-    <skip />
-    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
-    <skip />
-    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
-    <skip />
-    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
-    <skip />
-    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
-    <skip />
-    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
-    <skip />
-    <!-- no translation found for vpn_secret_unchanged (8700613973594154529) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set (1037792636371641845) -->
-    <skip />
-    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
-    <skip />
-    <!-- no translation found for cstor_access_title (1739505390736236717) -->
-    <skip />
-    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
-    <skip />
-    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
-    <skip />
-    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
-    <skip />
-    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
-    <skip />
-    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
-    <skip />
-    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
-    <skip />
-    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
-    <skip />
-    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
-    <skip />
-    <!-- no translation found for cstor_credential_password (7187440553141199409) -->
-    <skip />
-    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
-    <skip />
-    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
-    <skip />
-    <!-- no translation found for cstor_old_password (979282118063084561) -->
-    <skip />
-    <!-- no translation found for cstor_new_password (6218562692435670047) -->
-    <skip />
-    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
-    <skip />
-    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
-    <skip />
-    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
-    <skip />
-    <!-- no translation found for cstor_password_error (2917326097260402464) -->
-    <skip />
-    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
-    <skip />
-    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
-    <skip />
-    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
-    <skip />
-    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
-    <skip />
-    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
-    <skip />
-    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
-    <skip />
-    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
-    <skip />
-    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
-    <skip />
-    <!-- no translation found for cstor_storage_error (7140697503172458161) -->
-    <skip />
-    <!-- no translation found for cstor_unable_to_save_cert (1631402544447196406) -->
-    <skip />
-    <!-- no translation found for cstor_cert_not_saved (6318149789449538491) -->
-    <skip />
-    <!-- no translation found for cstor_is_reset (449870501126790589) -->
-    <skip />
-    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
-    <skip />
-    <!-- no translation found for cstor_is_added (794788474010251572) -->
-    <skip />
-    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
-    <skip />
-    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <string name="awake" msgid="387122265874485088">"Enhedsopvågningstid"</string>
+    <string name="wifi_on_time" msgid="4630925382578609056">"Wi-Fi til tiden"</string>
+    <string name="bluetooth_on_time" msgid="4478515071957280711">"Wi-Fi til tiden"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
+    <string name="details_title" msgid="7564809986329021063">"Batteriforbrugsoplysninger"</string>
+    <string name="details_subtitle" msgid="32593908269911734">"Brugsdetaljer"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"Juster strømforbrug"</string>
+    <string name="packages_subtitle" msgid="4736416171658062768">"Inkluderede pakker"</string>
+    <string name="power_screen" msgid="2353149143338929583">"Visning"</string>
+    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
+    <string name="power_cell" msgid="6596471490976003056">"Cellestandby"</string>
+    <string name="power_phone" msgid="5392641106474567277">"Stemmeopkald"</string>
+    <string name="power_idle" msgid="9055659695602194990">"Telefon er ikke aktiv"</string>
+    <string name="usage_type_cpu" msgid="715162150698338714">"CPU i alt"</string>
+    <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU forgrund"</string>
+    <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
+    <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</string>
+    <string name="usage_type_data_send" msgid="2857401966985425427">"Data sendt"</string>
+    <string name="usage_type_data_recv" msgid="7251090882025234185">"Data modtaget"</string>
+    <string name="usage_type_audio" msgid="6957269406840886290">"Lyd"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"Tid til"</string>
+    <string name="usage_type_no_coverage" msgid="3797004252954385053">"Tid uden signal"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"Tving til at standse"</string>
+    <string name="battery_action_app_details" msgid="3275013531871113681">"Programoplysninger"</string>
+    <string name="battery_action_app_settings" msgid="350562653472577250">"Programindstillinger"</string>
+    <string name="battery_action_display" msgid="5302763261448580102">"Visningsindstillinger"</string>
+    <string name="battery_action_wifi" msgid="5452076674659927993">"Wi-Fi-indstillinger"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-indstillinger"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"Batteri brugt af stemmeopkald"</string>
+    <string name="battery_desc_standby" msgid="3009080001948091424">"Batteri brugt, når telefon ikke er aktiv"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"Batteri brugt af celleradio"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"Skift til flytilstand for at spare på strømmen i områder uden celledækning."</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"Batteri brugt af skærmen og baglyset."</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"Reducer skærmens lysstyrke og/eller skærmens timeout"</string>
+    <string name="battery_desc_wifi" msgid="1702486494565080431">"Batteri brugt af Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="7542345142282261691">"Slå Wi-Fi fra, når det ikke er i brug eller tilgængeligt"</string>
+    <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Batteri brugt af Bluetooth"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Slå Bluetooth fra, når du ikke bruger det"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Prøv at oprette forbindelse til en anden Bluetooth-enhed"</string>
+    <string name="battery_desc_apps" msgid="8123202939321333639">"Batteri brugt af programmer, når de kører"</string>
+    <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Stop eller afinstaller programmet"</string>
+    <string name="battery_sugg_apps_gps" msgid="4145005297393800223">"Slå GPS fra, når den ikke bruges"</string>
+    <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"Dette program kan muligvis tilbyde indstillinger, der mindsker batteriforbruget"</string>
+    <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> siden afbrydelse"</string>
+    <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Siden sidste afbrydelse for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_total" msgid="8973377864854807854">"Brugstotal"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"Opdater"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
+    <string name="process_mediaserver_label" msgid="6500382062945689285">"Medieserver"</string>
+    <string name="tts_settings" msgid="3348626948015962987">"Tekst-til-tale"</string>
+    <string name="tts_settings_summary" msgid="2627715231944602766">"Indstil valgmuligheder for tekst-til-tale"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Indstillinger for tekst-til-tale"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Brug altid mine indstil."</string>
+    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Nedenstående standardindstillinger tilsidesætter programindstillinger"</string>
+    <string name="tts_default_settings_section" msgid="5787915620218907443">"Standardindstillinger"</string>
+    <string name="tts_default_rate_title" msgid="6030550998379310088">"Talefrekvens"</string>
+    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Hastighed hvormed tekst udtales"</string>
+    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonehøjde"</string>
+    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Påvirker tonen af den talte tekst"</string>
+    <string name="tts_default_lang_title" msgid="8018087612299820556">"Sprog"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Indstiller den sprogspecifikke stemme til talt tekst"</string>
+    <string name="tts_play_example_title" msgid="7094780383253097230">"Lyt til et eksempel"</string>
+    <string name="tts_play_example_summary" msgid="8029071615047894486">"Afspil en kort demonstration af talesyntese"</string>
+    <string name="tts_install_data_title" msgid="4264378440508149986">"Installer stemmedata"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"Installer de påkrævede stemmedata for talesyntese"</string>
+    <string name="tts_data_installed_summary" msgid="9162111552859972809">"De påkrævede stemmer til talesyntese er allerede installeret korrekt"</string>
+    <string name="tts_demo" msgid="405357591189935876">"Dette er et eksempel på talesyntese."</string>
+    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Dine indstillinger er blevet ændret. Dette er et eksempel på, hvordan de lyder."</string>
+    <string name="gadget_title" msgid="7455548605888590466">"Strømkontrol"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Opdaterer Wi-Fi-indstilling"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Opdaterer Bluetooth-indstilling"</string>
+    <string name="credential_installer_activity_title" msgid="7600661521831762521">"Installationsprogram til oplysninger"</string>
+    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN-indstillinger"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"Opret forbindelse til <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpn_username_colon" msgid="7854930370861306247">"Brugernavn:"</string>
+    <string name="vpn_password_colon" msgid="5716278710848606626">"Adgangskode:"</string>
+    <string name="vpn_a_username" msgid="6664733641993968692">"et brugernavn"</string>
+    <string name="vpn_a_password" msgid="1537213632501483753">"en adgangskode"</string>
+    <string name="vpn_save_username" msgid="1408415289165970790">"Husk brugernavn"</string>
+    <string name="vpn_connect_button" msgid="1699007212602470655">"Forbind"</string>
+    <string name="vpn_yes_button" msgid="8034531001149843119">"Ja"</string>
+    <string name="vpn_no_button" msgid="7620339571187119107">"Nej"</string>
+    <string name="vpn_back_button" msgid="192036339792734970">"Tilbage"</string>
+    <string name="vpn_mistake_button" msgid="1683383660912491270">"Nej"</string>
+    <string name="vpn_menu_done" msgid="93528279226907926">"Gem"</string>
+    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Annuller"</string>
+    <string name="vpn_menu_revert" msgid="4407762442281467659">"Vend tilbage"</string>
+    <string name="vpn_menu_connect" msgid="1089399414463784218">"Opret forbindelse til netværk"</string>
+    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Afbryd forbindelsen til netværk"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Rediger netværk"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Slet netværk"</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Du skal indtaste <xliff:g id="CODE">%s</xliff:g>."</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Du skal vælge <xliff:g id="OPTION">%s</xliff:g>."</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"VPN-navnet \'<xliff:g id="NAME">%s</xliff:g>\' eksisterer allerede. Find et andet navn."</string>
+    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Er du sikker på, at du ønsker at slette dette VPN?"</string>
+    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Er du sikker på, du ikke ønsker at oprette denne profil?"</string>
+    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Er du sikker på, at du ønsker at kassere de ændringer, der er foretaget til denne profil?"</string>
+    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Der kunne ikke oprettes forbindelse til netværket. Ønsker du at prøve igen?"</string>
+    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Forbindelsen er mistet. Ønsker du at oprette forbindelse igen?"</string>
+    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Servernavnet kan ikke løses. Ønsker du at kontrollere dine servernavneindstillinger?"</string>
+    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Udfordringsfejl. Ønsker du at kontrollere din hemmelige indstilling?"</string>
+    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Der mangler en eller flere hemmeligheder i denne VPN-konfiguration. Ønsker du at kontrollere din hemmelige indstilling."</string>
+    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Det/den indtastede brugernavn eller adgangskode er forkert. Ønsker du at prøve igen?"</string>
+    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Serverophængning. Brugernavnet eller adgangskoden, du indtastede, kan være forkerte. Ønsker du at prøve igen?"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Serveren afbrød. Du er muligvis bag en firewall, der forhindrer dig i at oprette forbindelse til serveren. Vil du prøve igen?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Serverkommunikationen mislykkedes. Serveren er muligvis ikke enig i dine krypteringsindstillinger. Vil du kontrollere dine krypteringsindstillinger?"</string>
+    <string name="vpn_type_title" msgid="6392933604218676224">"Tilføj VPN"</string>
+    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Tilføj VPN"</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Tilføj <xliff:g id="NAME">%s</xliff:g> VPN"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"<xliff:g id="NAME">%s</xliff:g> detaljer"</string>
+    <string name="vpns" msgid="3148141862835492816">"VPN\'er"</string>
+    <string name="vpn_connecting" msgid="8039521381692090116">"Opretter forbindelse ..."</string>
+    <string name="vpn_disconnecting" msgid="7748050200708257066">"Afbryder ..."</string>
+    <string name="vpn_connected" msgid="7641723116362845781">"Forbundet"</string>
+    <string name="vpn_connect_hint" msgid="7442898962925875181">"Opret forbindelse til netværk"</string>
+    <string name="vpn_name" msgid="1550918148476193076">"VPN-navn"</string>
+    <string name="vpn_a_name" msgid="8445736942405283509">"et VPN-navn"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"\'<xliff:g id="NAME">%s</xliff:g>\' er tilføjet"</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"Der er foretaget ændringer af \'<xliff:g id="NAME">%s</xliff:g>\'"</string>
+    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Indstil brugercertifikat"</string>
+    <string name="vpn_user_certificate" msgid="949322691686938888">"Brugercertifikat"</string>
+    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"et brugercertifikat"</string>
+    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Indstil CA-certifikat"</string>
+    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certifikat fra certifikatleverandør (CA)"</string>
+    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"et CA-certifikat"</string>
+    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Indstil L2TP-hemmelighed"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP-hemmelighed"</string>
+    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"en L2TP-hemmelighed"</string>
+    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"kryptering"</string>
+    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"PPTP-kryptering"</string>
+    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Indstil IPsec-forhåndsdelt nøglekodning"</string>
+    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"IPsec-forhåndsdelt nøglekodning"</string>
+    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"en IPsec-forhåndsdelt nøglekodning"</string>
+    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Indstil VPN-server"</string>
+    <string name="vpn_vpn_server" msgid="1141754908824209260">"VPN-server"</string>
+    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"en VPN-server"</string>
+    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"VPN-servernavn"</string>
+    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS-søgedomæner"</string>
+    <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS-søgedomæner"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> er indstillet"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> ikke indstillet"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> ikke indstillet (valgfrit)"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"Aktiver<xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"Deaktiver<xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> er aktiveret"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> er deaktiveret"</string>
+    <string name="vpn_settings_title" msgid="7327468307909556719">"VPN-indstillinger"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"Indstil og administrer Virtuelle Private Netværk (VPN\'er)"</string>
+    <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(uændret)"</string>
+    <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ikke indstillet)"</string>
+    <string name="credentials_category" msgid="8536992056377271234">"Oplysningslagring"</string>
+    <string name="credentials_access" msgid="4843187230913860492">"Brug sikre oplysninger"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"Tillad programmer at få adgang til sikre certifikater og andre oplysninger"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"Indtast adgangskode"</string>
+    <string name="credentials_unlock_hint" msgid="594679530407918031">"Indtast adgangskoden til oplysningslagring."</string>
+    <string name="credentials_install_certificates" msgid="177337517568022236">"Installer fra SD-kort"</string>
+    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Installer krypterede certifikater fra SD-kortet"</string>
+    <string name="credentials_set_password" msgid="9104473585811899989">"Indstil adgangskode"</string>
+    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Indstil eller skift adgangskode til oplysningslagring"</string>
+    <string name="credentials_reset" msgid="9170150870552453457">"Ryd lager"</string>
+    <string name="credentials_reset_summary" msgid="1530388094693731636">"Ryd oplysningslagring af alt indhold, og nulstil dens adgangskode"</string>
+    <string name="credentials_reset_hint" msgid="819990295796804516">"Er du sikker på, at du ønsker at slette alle oplysninger og nulstille adgangskoden til oplysningslagringen?"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"Nuværende adgangskode:"</string>
+    <string name="credentials_new_password" msgid="267487774686796938">"Ny adgangskode:"</string>
+    <string name="credentials_confirm_password" msgid="4732250000633424345">"Bekræft ny adgangskode:"</string>
+    <string name="credentials_first_time_hint" msgid="1567821077545346039">"Indstil en adgangskode til oplysningslagring (mindst 8 tegn)."</string>
+    <string name="credentials_wrong_password" msgid="7525192410790152041">"Indtast den rigtige adgangskode."</string>
+    <string name="credentials_reset_warning" msgid="6392481296673345268">"Indtast den rigtige adgangskode. Du har et forsøg mere til at indtaste den rigtige adgangskode, inden oplysningslagringen slettes."</string>
+    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Indtast den rigtige adgangskode. Du har <xliff:g id="NUMBER">%1$d</xliff:g> forsøg mere til at indtaste den rigtige adgangskode, inden oplysningslagringen slettes."</string>
+    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Adgangskoder stemmer ikke overens."</string>
+    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Du skal indtaste og bekræfte en adgangskode."</string>
+    <string name="credentials_password_empty" msgid="8292138152983330473">"Indtast adgangskoden."</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"Adgangskoden skal indeholde mindst 8 tegn."</string>
+    <string name="credentials_erased" msgid="7700309135582200849">"Oplysningslagringen er slettet."</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"Oplysningslagring er aktiveret."</string>
+    <string name="credentials_disabled" msgid="7453188089059045380">"Oplysningslagring er deaktiveret."</string>
+    <string name="emergency_tone_title" msgid="1055954530111587114">"Nødtone"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"Indstil adfærd, når der foretages et nødopkald"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Fortrolighed"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Fortrolighedsindstillinger"</string>
+    <string name="location_section_title" msgid="6072558684044939786">"Placering"</string>
+    <string name="settings_section_title" msgid="7413252428447723032">"Indstillinger"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Personlige data"</string>
+    <string name="backup_settings_title" msgid="2968262658155327829">"Sikkerhedskopier mine indstillinger"</string>
+    <string name="backup_erase_dialog_title" msgid="6028429904055779443">"Sikkerhedskopi af indstillinger"</string>
+    <string name="backup_erase_dialog_message" msgid="9096433810456900531">"Er du sikker på, at du vil holde op med at sikkerhedskopiere dine indstillinger og slette alle kopier på Googles servere?"</string>
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
     <skip />
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 8fea7f0ae82..15e24d4afa6 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -24,13 +24,23 @@
     <item msgid="5345178126174698955">"Pacific"</item>
     <item msgid="8392017019801393511">"Alle"</item>
   </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"Keine Animationen"</item>
+    <item msgid="6291186755504776720">"Einige Animationen"</item>
+    <item msgid="3856065399819979491">"Alle Animationen"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"Es werden keine Fensteranimationen angezeigt."</item>
+    <item msgid="4460915688877708508">"Einige Fensteranimationen werden angezeigt."</item>
+    <item msgid="488968798204105119">"Alle Fensteranimationen werden angezeigt."</item>
+  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 Sekunden"</item>
     <item msgid="8881760709354815449">"30 Sekunden"</item>
     <item msgid="7589406073232279088">"1 Minute"</item>
     <item msgid="7001195990902244174">"2 Minuten"</item>
     <item msgid="5721688686241190620">"10 Minuten"</item>
-    <item msgid="1781492122915870416">"Kein Timeout"</item>
+    <item msgid="7156442995039264948">"30 Minuten"</item>
   </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Sehr langsam"</item>
@@ -58,18 +68,14 @@
     <item msgid="2923732046112398627">"Autom."</item>
     <item msgid="5434666299123318296">"Keine"</item>
     <item msgid="3159594845889645948">"WEP"</item>
-    <item msgid="6303607119537134095">"WPA Personal"</item>
-    <item msgid="1977424472734732392">"WPA2 Personal"</item>
-    <item msgid="5185669984217684689">"WPA-EAP"</item>
-    <item msgid="8643206823103498303">"IEEE 802.1x"</item>
+    <item msgid="1687348101566181433">"WPA/WPA2-PSK"</item>
+    <item msgid="329777238762866787">"802.1x Enterprise"</item>
   </string-array>
   <string-array name="wifi_security_without_auto_entries">
     <item msgid="4402120432904877907">"Keine"</item>
     <item msgid="2329148995431627488">"WEP"</item>
-    <item msgid="2296204649410509235">"WPA Personal"</item>
-    <item msgid="8928468573279595315">"WPA2 Personal"</item>
-    <item msgid="8319241197948974314">"WPA-EAP"</item>
-    <item msgid="2222409752754955757">"IEEE 802.1x"</item>
+    <item msgid="6903317668294332381">"WPA/WPA2-PSK"</item>
+    <item msgid="7280821339307729710">"802.1x Enterprise"</item>
   </string-array>
   <string-array name="wifi_wep_type">
     <item msgid="1497433962958697183">"Autom."</item>
@@ -108,7 +114,7 @@
     <item msgid="1818786254010764570">"Keine"</item>
     <item msgid="6189918678874123056">"PAP"</item>
     <item msgid="1524112260493662517">"MSCHAP"</item>
-    <item msgid="1586767102985419413">"MSCHAP2"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
@@ -116,4 +122,10 @@
     <item msgid="3165868966179561687">"Benachrichtigung"</item>
     <item msgid="6038758039030476855">"Vibration"</item>
   </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"Keine"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP oder CHAP"</item>
+  </string-array>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 64caf020932..ad02d08cd41 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -15,6 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"Ja"</string>
+    <string name="no" msgid="6731231425810196216">"Nein"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Unbekannt"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Mobilfunkverbindung aktivieren"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Mobilfunkverbindung deaktivieren"</string>
@@ -56,6 +58,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
     <string name="sdcard_setting" msgid="5922637503871474866">"SD-Karte"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Akkustatus:"</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"Stromanschluss:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Akkuanzeige:"</string>
     <string name="battery_info_level_label" msgid="8706526709307788737">"Akkuladung:"</string>
     <string name="battery_info_health_label" msgid="6416051542741886958">"Akkuzustand:"</string>
@@ -75,6 +78,11 @@
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"Entladung"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Wird nicht geladen"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Voll"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Nicht angeschlossen"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"Unbekannt"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Unbekannt"</string>
     <string name="battery_info_health_good" msgid="8070356565806711806">"OK"</string>
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"Überhitzung"</string>
@@ -104,6 +112,12 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth-Pairing-Anfrage"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Pairing-Anfrage"</string>
     <string name="bluetooth_notif_message" msgid="5381418499788668724">"Zum Pairing auswählen "</string>
+    <string name="device_picker" msgid="8721012448931226323">"Bluetooth-Geräteauswahl"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-Berechtigungsanfrage"</string>
+    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Eine Anwendung auf Ihrem Telefon beantragt eine Berechtigung zum Aktivieren von Bluetooth. Möchten Sie dies tun?"</string>
+    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Eine Anwendung auf Ihrem Telefon beantragt die Berechtigung, Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Bluethooth-Geräte sichtbar zu machen. Möchten Sie dies tun?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Eine Anwendung auf Ihrem Telefon beantragt die Berechtigung, Bluetooth zu aktivieren und Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Telefone sichtbar zu machen. Möchten Sie dies tun?"</string>
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Bluetooth wird aktiviert..."</string>
     <string name="date_and_time" msgid="4114084177056654663">"Einstellungen"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -196,7 +210,8 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Alle drahtlosen Verbindungen deaktivieren"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Wireless-Verbindungen werden deaktiviert..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Wireless-Verbindungen werden aktiviert..."</string>
-    <string name="radio_controls_title" msgid="8356991079873437337">"Wireless"</string>
+    <string name="radio_controls_title" msgid="5868688473587168882">"Drahtlos und Netzwerke"</string>
+    <string name="wireless_networks_settings_title" msgid="149274247949769551">"Einstellungen für Drahtlosnetzwerke"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Wi-Fi, Bluetooth, Flugmodus, mobile Netzwerke und VPNs verwalten"</string>
     <string name="roaming" msgid="3596055926335478572">"Daten-Roaming"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Bei Roaming mit Datendienst verbinden"</string>
@@ -219,20 +234,29 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Datumsformat auswählen"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Alphabetisch sortieren"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Nach Zeitzone sortieren"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"Sicherheit und Standort"</string>
+    <string name="security_settings_title" msgid="5168491784222013179">"Standort und Sicherheit"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"Einstellungen für Standort &amp; Sicherheit"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Meinen Standort, Display-Entsperrung, SIM-Kartensperrung und Sperrung des Anmeldeinformationsspeichers festlegen"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Meinen Standort festlegen, Bildschirm entsperren, Sperren des Speichers für Anmeldeinformationen"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passwörter"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth aktivieren"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth-Einstellungen"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth-Einstellungen"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Verbindungen, Gerätenamen und Erkennbarkeit verwalten"</string>
-    <string name="bluetooth_pin_entry" msgid="5627349871303455279">"Bluetooth-Pairing-Anfrage"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth-Pairing-Anfrage"</string>
     <string name="bluetooth_device_info" msgid="6644515376523965073">"Bluetooth-Geräteinfo"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="7551139612735632370">"<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_enter_pin_msg" msgid="856962526754150334">\n"PIN für Pairing mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" eingeben. Versuchen Sie 0000 oder 1234."</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Schlüssel zum Pairing mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" eingeben."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Bestätigen Sie zum Paaren mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", dass der folgende Schlüssel angezeigt wird: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"möchte sich paaren."</string>
+    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Geben Sie zum Pairing <xliff:g id="PASSKEY">%2$s</xliff:g> in \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ein."</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Paaren"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Nicht paaren"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"Bluetooth-Gerät"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Achtung"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Beim Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist ein Problem aufgetreten."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="6938408362011024289">"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_pairing_pin_error_message" msgid="6065697229258906937">"Beim Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist ein Problem aufgetreten, da die eingegebene PIN oder der Schlüssel falsch ist."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"Verbindung mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kann nicht hergestellt werden."</string>
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Verbindung wurde von <xliff:g id="DEVICE_NAME">%1$s</xliff:g> abgelehnt."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Beim Verbindungsaufbau mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist ein Problem aufgetreten."</string>
@@ -246,6 +270,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Verbinden mit..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Medien"</string>
     <string name="bluetooth_profile_headset" msgid="1874975688666658946">"Telefon"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Übertragung"</string>
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Verbunden mit  Audiosystem von Medien"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Verbunden mit Audiosystem des Telefons"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Verbunden mit Audiosystem von Telefon und Medien"</string>
@@ -255,8 +280,11 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profile"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Verbunden mit  Audiosystem von Medien"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Verbunden mit Audiosystem des Telefons"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Mit Dateiübertragungsserver verbunden"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nicht mit Dateiübertragungsserver verbunden"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Für Audiosystem von Medien verwenden"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Für Audiosystem des Telefons verwenden"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Für Dateiübertragung verwenden"</string>
     <string name="wifi" msgid="1081550856200013637">"WLAN"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"WLAN"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"WLAN aktivieren"</string>
@@ -273,17 +301,13 @@
     <string name="security" msgid="1040691896987225267">"Sicherheit"</string>
     <string name="wifi_security_open" msgid="3513305614048816607">"Öffnen"</string>
     <string name="wifi_security_wep" msgid="7082604129842065776">"WEP"</string>
-    <string name="wifi_security_wpa" msgid="8980169410565477162">"WPA"</string>
-    <string name="wifi_security_wpa2" msgid="5780665935088930524">"WPA2"</string>
-    <string name="wifi_security_wpa_eap" msgid="7485687331651751101">"WPA-EAP"</string>
-    <string name="wifi_security_ieee8021x" msgid="8538687609878109005">"IEEE8021X"</string>
+    <string name="wifi_security_psk" msgid="3392399380570381452">"WPA/WPA2-PSK"</string>
+    <string name="wifi_security_eap" msgid="8309434150934969132">"Enterprise(802.1x)"</string>
     <string name="wifi_security_unknown" msgid="4564208312073060668">"Unbekannt"</string>
     <string name="wifi_security_verbose_open" msgid="8117878112088901945">"offenes Netzwerk"</string>
     <string name="wifi_security_verbose_wep" msgid="9220757688700421508">"gesichert mit WEP"</string>
-    <string name="wifi_security_verbose_wpa" msgid="598697674252714455">"gesichert mit WPA"</string>
-    <string name="wifi_security_verbose_wpa2" msgid="4116236883347875722">"gesichert mit WPA2"</string>
-    <string name="wifi_security_verbose_wpa_eap" msgid="1984821646949066624">"gesichert mit WPA-EAP"</string>
-    <string name="wifi_security_verbose_ieee8021x" msgid="5552995793910186310">"gesichert mit IEEE 802.1x"</string>
+    <string name="wifi_security_verbose_psk" msgid="1110130025330416225">"gesichert mit WPA/WPA2-PSK"</string>
+    <string name="wifi_security_verbose_eap" msgid="586632662086063">"gesichert mit 802.1x EAP"</string>
     <string name="ip_address" msgid="850672263358989449">"IP-Adresse"</string>
     <string name="signal" msgid="1947969631626413228">"Signalstärke"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"Aktivierung..."</string>
@@ -302,14 +326,13 @@
     <string name="please_type_anonymous_identity" msgid="835061562079965048">"Anonyme Identität"</string>
     <string name="please_select_client_certificate" msgid="2137906961594663234">"Client-Zertifikat"</string>
     <string name="please_select_ca_certificate" msgid="5010815181914420677">"CA-Zertifikat"</string>
-    <string name="please_type_private_key_passwd" msgid="4077744679722504443">"Passwort für den privaten Schlüssel"</string>
     <string name="please_type_passphrase" msgid="8256017704131522462">"Passwort für Wireless-Zugang"</string>
     <string name="please_type_hex_key" msgid="8751224390407867551">"WEP Hexadezimalschlüssel (0-9, A-F)"</string>
     <string name="wifi_show_password" msgid="4235237470701732009">"Passwort anzeigen"</string>
     <string name="scan_wifi" msgid="2459901725350542606">"Scannen"</string>
     <string name="summary_not_in_range" msgid="3926674700733548684">"Nicht in Reichweite"</string>
     <string name="summary_remembered" msgid="6079941090549401742">"gespeichert"</string>
-    <string name="summary_connection_failed" msgid="7610394657613410489">"Verbindung fehlgeschlagen, versuchen Sie es erneut."</string>
+    <string name="summary_connection_failed" msgid="2351885658101671413">"Verbindung fehlgeschlagen, versuchen Sie es erneut."</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"WLAN-Netzwerke"</string>
     <string name="wifi_type_ssid" msgid="1326839657083292017">"Netzwerk-SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sicherheit"</string>
@@ -360,6 +383,7 @@
     <string name="status_disconnected" msgid="7561688569905126046">"Nicht verbunden"</string>
     <string name="status_failed" msgid="610462050405904601">"Fehlgeschlagen"</string>
     <string name="sound_and_display_settings" msgid="349770582993029003">"Sound und Display"</string>
+    <string name="sound_and_display_settings_title" msgid="5036144539683697330">"Einstellungen für Sound &amp; Display"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Toneinstellungen"</string>
     <string name="sound_and_display_settings_summary" msgid="1433943789593286064">"Klingeltöne, Benachrichtigungen und Helligkeit festlegen"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Lautlosmodus"</string>
@@ -385,11 +409,14 @@
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"Akustische Auswahl"</string>
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Ton bei Auswahl auf Display"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Ton bei Auswahl auf Display"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Haptisches Feedback"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibration beim Drücken von Softkeys und bei bestimmten UI-Interaktionen"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibration beim Drücken von Softkeys und bei bestimmten UI-Interaktionen"</string>
     <string name="play_media_notification_sounds_enable_title" msgid="1008791464029179529">"SD-Karten-Nachricht"</string>
     <string name="play_media_notification_sounds_enable_summary_on" msgid="7675466959375667370">"Ton bei SD-Karten-Benachrichtigungen"</string>
     <string name="play_media_notification_sounds_enable_summary_off" msgid="8672617597028744693">"Ton bei SD-Karten-Benachrichtigungen"</string>
-    <string name="sync_settings" msgid="2212736205476453234">"Datensynchronisierung"</string>
-    <string name="sync_settings_summary" msgid="6480534906375217074">"Auswählen, welche Anwendungen synchronisiert werden"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Konten und Synchronisierung"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"Konten hinzufügen und entfernen und Kontoeinstellungen ändern"</string>
     <string name="search_settings" msgid="1910951467596035063">"Suchen"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Sucheinstellungen und Suchverlauf verwalten"</string>
     <string name="display_settings" msgid="3912042046350078328">"Display-Einstellungen"</string>
@@ -403,6 +430,7 @@
     <string name="brightness_summary" msgid="838917350127550703">"Helligkeit des Bildschirms anpassen"</string>
     <string name="screen_timeout" msgid="4882669461447531301">"Display-Timeout"</string>
     <string name="screen_timeout_summary" msgid="2905757633140605334">"Verzögerung vor automatischer Bildschirmabschaltung anpassen"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"Automatische Helligkeit"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Einstellungen"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM-Sperrung einrichten"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-Kartensperrung"</string>
@@ -436,7 +464,8 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Telefonnummer, Signal usw."</string>
-    <string name="storage_settings_title" msgid="8461515684514801302">"SD-Karte und Speicher"</string>
+    <string name="storage_settings" msgid="6681164315506788024">"SD-Karte &amp; Telefonspeicher"</string>
+    <string name="storage_settings_title" msgid="5379463509034022773">"Einstellungen für SD-Karte &amp; Telefonspeicher"</string>
     <string name="storage_settings_summary" msgid="9176693537325988610">"SD-Karte entnehmen, verfügbaren Speicher anzeigen"</string>
     <string name="status_number" msgid="5123197324870153205">"Meine Telefonnummer"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
@@ -480,6 +509,11 @@
     <string name="apn_mms_port" msgid="4074188088199243040">"MMS-Port"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"Authentifizierungstyp"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Keine"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP oder CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN-Typ"</string>
     <string name="menu_delete" msgid="6981294422841124659">"APN löschen"</string>
     <string name="menu_new" msgid="3014205883303921729">"Neuer APN"</string>
@@ -518,12 +552,15 @@
     <string name="location_network_based" msgid="8815705866861993344">"Wireless nutzen"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Standort über Wireless-Netzwerke anzeigen (z.B. in Google Maps)"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Standort bestimmt von WLAN und/oder mobilen Netzwerken"</string>
-    <string name="location_gps" msgid="375912731641377120">"GPS-Satelliten aktivieren"</string>
-    <string name="location_street_level" msgid="5899941752252356344">"Auf Straßenebene lokalisieren (deaktivieren, um Akku zu sparen)"</string>
+    <string name="location_gps" msgid="6296125378829097831">"GPS-Satelliten verwenden"</string>
+    <string name="location_street_level" msgid="6460740847018275745">"Auf Straßenebene lokalisieren (deaktivieren, um Akku zu sparen)"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Auf Straßenebene lokalisieren (höherer Akkuverbrauch, im Freien)"</string>
-    <string name="use_location_title" msgid="7585990952633568732">"Für Google freigeben"</string>
-    <string name="use_location_summary" msgid="4411467143899877395">"Google erlauben, den Standort für verbesserte Suchergebnisse und andere Dienste zu verwenden"</string>
-    <string name="use_location_warning_message" msgid="5696732842038416151">"Google erlauben, den Standort für verbesserte Suchergebnisse und andere Dienste zu verwenden"</string>
+    <string name="assisted_gps" msgid="4649317129586736885">"Unterstütztes GPS verwenden"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Server zur Unterstützung von GPS verwenden (zur Verringerung der Netzwerkauslastung nicht auswählen)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Server zur Unterstützung von GPS verwenden (zur Verbesserung der GPS-Leistung deaktivieren)"</string>
+    <string name="use_location_title" msgid="5447030582538504247">"Mein Standort verwenden"</string>
+    <string name="use_location_summary" msgid="1816849484040070431">"Meinen Standort für Google-Suchergebnisse und andere Google-Services verwenden"</string>
+    <string name="use_location_warning_message" msgid="1420184860518262439">"Soll Google bessere Suchergebnisse und weitere Dienste anhand Ihres Standorts anbieten?"</string>
     <string name="agree" msgid="6288718671527758326">"Zustimmen"</string>
     <string name="disagree" msgid="6221069272309799230">"Ablehnen"</string>
     <string name="about_settings" msgid="1743378368185371685">"Telefoninfo"</string>
@@ -538,6 +575,10 @@
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open Source-Lizenzen"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Beim Laden der Lizenzen ist ein Problem aufgetreten."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Wird geladen..."</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Sicherheitsinformationen"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Sicherheitsinformationen"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Ihr Telefon ist mit keinem Datendienst verbunden. Um diese Informationen jetzt anzuzeigen, rufen Sie %s von einem beliebigen, mit dem Internet verbundenen Computer auf."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Ladevorgang läuft..."</string>
     <string name="lock_settings_title" msgid="5828348303971852121">"Display-Entsperrungsmuster"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Entsperrungsmuster ändern"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Gespeichertes Muster bestätigen"</string>
@@ -566,9 +607,9 @@
     <string name="skip_button_label" msgid="8680422740354436943">"Abbrechen"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Weiter"</string>
     <string name="lock_title" msgid="4059246467204273930">"Sichern Ihres Telefons"</string>
-    <string name="lock_intro_message" msgid="5352897389718432077"><font size="17">"Schützen Sie Ihr Telefon vor unerlaubter Verwendung, indem Sie ein persönliches Entsperrungsmuster erstellen. "\n<font height="17">\n</font><b>"1"</b>"  Auf dem nächsten Bildschirm sehen Sie, wie ein Beispielmuster gezeichnet wird. "\n<font height="17">\n</font><b>"2"</b>"  Anschließend können Sie Ihr eigenes Entsperrungsmuster aufzeichnen. Sie können verschiedene Muster ausprobieren, müssen jedoch immer mindestens vier Punkte miteinander verbinden. "\n<font height="17">\n</font><b>"3"</b>"  Zeichnen Sie Ihr Muster zur Bestätigung erneut. "\n<font height="17">\n</font><b>"Bereit? Wählen Sie “Weiter”"</b>". "\n<font height="3">\n</font>"Wählen Sie “Abbrechen”, wenn Sie Ihr Telefon nicht schützen möchten."</font></string>
+    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Schützen Sie Ihr Telefon vor unerlaubter Verwendung, indem Sie ein persönliches Entsperrungsmuster erstellen. "\n<font height="17">\n</font><b>"1"</b>"  Auf dem nächsten Bildschirm sehen Sie, wie ein Beispielmuster gezeichnet wird. "\n<font height="17">\n</font><b>"2"</b>"  Anschließend können Sie Ihr eigenes Entsperrungsmuster zeichnen. Sie können verschiedene Muster ausprobieren, müssen jedoch immer mindestens vier Punkte miteinander verbinden. "\n<font height="17">\n</font><b>"3"</b>"  Zeichnen Sie Ihr Muster zur Bestätigung erneut. "\n<font height="17">\n</font><b>"Bereit? Wählen Sie “Weiter”"</b>". "\n<font height="3">\n</font>"Wählen Sie “Abbrechen”, wenn Sie Ihr Telefon nicht schützen möchten."</font></string>
     <string name="lock_example_title" msgid="8052305554017485410">"Beispielmuster"</string>
-    <string name="lock_example_message" msgid="7431982730914254881">"Verbinden Sie mindestens vier Punkte."\n" "\n"Wählen Sie \"Weiter\", um ein eigenes Muster aufzuzeichnen."</string>
+    <string name="lock_example_message" msgid="1838650097090632706">"Verbinden Sie mindestens vier Punkte."\n" "\n"Wählen Sie “Weiter”, um ein eigenes Schema zu zeichnen."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Anwendungen verwalten"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Installierte Anwendungen verwalten und entfernen"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Anwendungen"</string>
@@ -602,12 +643,12 @@
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Filteroptionen auswählen"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Alle"</string>
-    <string name="filter_apps_third_party" msgid="1096017647285183437">"Drittanbieter"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Heruntergeladen"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Wird ausgeführt"</string>
     <string name="loading" msgid="3200408047793887917">"Wird geladen..."</string>
     <string name="recompute_size" msgid="7722567982831691718">"Größe wird neu berechnet..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Löschen"</string>
-    <string name="clear_data_dlg_text" msgid="8796694785488630642">"Alle in dieser Anwendung gespeicherten Informationen werden endgültig gelöscht."</string>
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"All diese Anwendungsdaten werden dauerhaft gelöscht. Dazu zählen alle Dateien, Einstellungen, Konten, Datenbanken und so weiter."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Abbrechen"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"Anwendung nicht gefunden"</string>
@@ -620,9 +661,23 @@
     <string name="security_settings_desc" msgid="3116027624526915561">"Diese Anwendung kann auf die folgenden Funktionen Ihres Telefons zugreifen:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Berechnung..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Paketgröße kann nicht berechnet werden"</string>
-    <string name="empty_list_msg" msgid="1883660401486953588">"Sie haben keine Anwendungen von Drittanbietern installiert."</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"Sie haben keine Anwendungen von Drittanbietern installiert."</string>
     <string name="version_text" msgid="9189073826278676425">"Version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
-    <string name="language_settings" msgid="2939555761536357092">"Gebietsschema und Text"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"Ausgeführte Dienste"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Derzeit ausgeführte Dienste anzeigen und steuern"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"Neustart wird durchgeführt."</string>
+    <string name="no_running_services" msgid="6981216347270280598">"Es werden keine Dienste ausgeführt."</string>
+    <string name="confirm_stop_service" msgid="5700448757318301681">"Dienst anhalten?"</string>
+    <string name="confirm_stop_service_msg" msgid="1202118456282395730">"Der Service wird erst wieder bei einem Neustart ausgeführt. Dies kann unerwünschte Auswirkungen auf die Anwendung <xliff:g id="APPLICATION">%1$s</xliff:g> haben."</string>
+    <string name="confirm_stop_stop" msgid="7382363913280993331">"Anhalten"</string>
+    <string name="confirm_stop_cancel" msgid="206495326622692381">"Abbrechen"</string>
+    <string name="service_started_by_app" msgid="8432097226392386802">"Von der Anwendung gestartet: Zum Beenden berühren"</string>
+    <string name="service_client_name" msgid="2337664610975074717">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: Zum Verwalten berühren"</string>
+    <string name="service_background_processes" msgid="5158600475629177758">"Verfügbar: <xliff:g id="FREE">%2$s</xliff:g>+<xliff:g id="MEMORY">%3$s</xliff:g> in <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_foreground_processes" msgid="4013890350284680796">"Sonstige: <xliff:g id="MEMORY">%2$s</xliff:g> in <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_process_name" msgid="8630408984456958400">"Prozess: <xliff:g id="PROCESS">%1$s</xliff:g>"</string>
+    <string name="language_settings" msgid="502219872342167227">"Sprache und Tastatur"</string>
+    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Einstellungen für Sprache &amp; Tastatur"</string>
     <string name="language_settings_summary" msgid="595647729475399987">"Optionen für Sprache und Region, Texteingabe und Autokorrektur festlegen"</string>
     <string name="language_category" msgid="3391756582724541530">"Ländereinstellung"</string>
     <string name="text_category" msgid="6342540511465136739">"Texteinstellungen"</string>
@@ -637,7 +692,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Leertaste zweimal drücken, um \".\" hinzuzufügen"</string>
     <string name="show_password" msgid="2198798062604049206">"Sichtbare Passwörter"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Passwort bei der Eingabe anzeigen"</string>
-    <string name="ime_security_warning" msgid="3458652708716006477">"Diese Eingabemethode kann den gesamten von Ihnen eingegebenen Text erfassen, einschließlich persönlicher Daten wie Passwörter und Kreditkartennummern. Sie ist Teil der Anwendung <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Soll diese Eingabemethode aktiviert werden?"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"Diese Eingabemethode kann den gesamten von Ihnen eingegebenen Text erfassen, einschließlich persönlicher Daten wie Passwörter und Kreditkartennummern. Sie ist Teil der Anwendung <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Möchten diese Eingabemethode verwenden?"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Wörterbuch des Nutzers"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"Wörterbuch des Nutzers"</string>
     <string name="user_dict_settings_summary" msgid="2460427065601355471">"Hinzufügen &amp; Entfernen von Wörtern im Wörterbuch des Nutzers"</string>
@@ -665,7 +720,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Texteingabe"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Optionen für Texteingabe verwalten"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>-Einstellungen"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="4919680715154885028">"Einstellungen für Bildschirmtastatur"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Einstellungen der Bildschirmtastatur"</string>
     <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Tastatur des Geräts"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Einstellungen für eingebaute Tastatur"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Entwicklung"</string>
@@ -676,11 +731,11 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Display wird beim Laden nie in den Ruhezustand versetzt"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Falsche Standorte"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Falsche Standorte zulassen"</string>
-    <string name="adb_warning_title" msgid="1756027479229533250">"USB-Debugging aktivieren?"</string>
+    <string name="adb_warning_title" msgid="6234463310896563253">"USB-Debugging zulassen?"</string>
     <string name="adb_warning_message" msgid="5352555112049663033">"USB-Debugging ist nur für Entwicklungszwecke vorgesehen. Damit können Sie Daten zwischen Ihrem Computer und Ihrem Gerät kopieren, Anwendungen auf Ihrem Gerät ohne Benachrichtigung installieren und Protokolldaten lesen."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Gadget auswählen"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Widget auswählen"</string>
-    <string name="battery_history_details_for" msgid="5189636461798594740">"Details für UID %d"</string>
+    <string name="battery_history_details_for" msgid="5924639922153109669">"Details für UID <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="battery_history_uid" msgid="1016606150528436298">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage" msgid="8010852371665217020">"Netzwerk-Nutzungsdetails für <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
     <string name="battery_history_bytes_received" msgid="980307569180518302">"Empfangene Bytes: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
@@ -716,12 +771,13 @@
     <string name="app_name_label" msgid="2000949925256858308">"Anwendung"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"Anzahl"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Nutzungszeit"</string>
-    <string name="accessibility_settings_title" msgid="4239640930601071058">"Eingabehilfe"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"Eingabehilfen"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Einstellungen für Eingabehilfe"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Optionen für Eingabehilfe verwalten"</string>
     <string name="toggle_accessibility_title" msgid="650839277066574497">"Eingabehilfen"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Eingabehilfendienste"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Keine Eingabehilfen installiert"</string>
-    <string name="accessibility_service_security_warning" msgid="8386156287296967181">"Diese Eingabehilfe kann den gesamten von Ihnen eingegebenen Text erfassen, einschließlich persönlicher Daten wie Kreditkartennummern, jedoch keine Passwörter. Sie kann auch Ihre Interaktionen auf der Benutzeroberfläche protokollieren. Sie ist Teil der Anwendung <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Soll diese Eingabehilfe aktiviert werden?"</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Diese Eingabehilfe kann den gesamten von Ihnen eingegebenen Text erfassen, einschließlich persönlicher Daten wie Kreditkartennummern, jedoch keine Passwörter. Sie kann auch Ihre Interaktionen auf der Benutzeroberfläche protokollieren. Sie ist Teil der Anwendung <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Soll diese Eingabehilfe aktiviert werden?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Eingabehilfe deaktivieren?"</string>
     <string name="power_usage_summary_title" msgid="5180282911164282324">"Akkuverbrauch"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Akkuverbraucher"</string>
@@ -733,7 +789,7 @@
     <string name="awake" msgid="387122265874485088">"Aktivzeit des Geräts"</string>
     <string name="wifi_on_time" msgid="4630925382578609056">"WLAN-Aktivzeit"</string>
     <string name="bluetooth_on_time" msgid="4478515071957280711">"WLAN-Aktivzeit"</string>
-    <string name="usage_name_percent" msgid="1899151069711662289">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="PERCENT">%2$s</xliff:g> %%"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Akkuverbrauch - Details"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Details verwenden"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Energieverbrauch anpassen"</string>
@@ -769,7 +825,7 @@
     <string name="battery_desc_wifi" msgid="1702486494565080431">"Akkuverbrauch durch WLAN"</string>
     <string name="battery_sugg_wifi" msgid="7542345142282261691">"WLAN bei Nichtverwendung oder Nichtverfügbarkeit deaktivieren"</string>
     <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Akkuverbrauch durch Bluetooth"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="144393178427277439">"Bluetooth bei Nichtverwendung deaktivieren"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Bluetooth bei Nichtverwendung deaktivieren"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Mit einem anderen Bluetooth-Gerät verbinden"</string>
     <string name="battery_desc_apps" msgid="8123202939321333639">"Akkuverbrauch bei ausgeführten Anwendungen"</string>
     <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Anwendung beenden oder deinstallieren"</string>
@@ -781,9 +837,9 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Aktualisieren"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
-    <string name="tts_settings" msgid="6454363854545277027">"Sprachsynthese"</string>
+    <string name="tts_settings" msgid="3348626948015962987">"Text-in-Sprache"</string>
     <string name="tts_settings_summary" msgid="2627715231944602766">"Text-in-Sprache einrichten"</string>
-    <string name="tts_settings_title" msgid="5064947197040356736">"Sprachsynthese-Steuerung"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Text-in-Sprache-Einstellungen"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Immer meine Einst. verwenden"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Standardeinstellungen überschreiben Anwendungseinstellungen"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Standardeinstellungen"</string>
@@ -801,8 +857,11 @@
     <string name="tts_demo" msgid="405357591189935876">"Dies ist ein Beispiel für Sprachsynthese."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Ihre Einstellungen wurden geändert. Dies ist ein Klangbeispiel."</string>
     <string name="gadget_title" msgid="7455548605888590466">"Energiesteuerung"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Aktualisieren der WLAN-Einstellung"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Aktualisieren der Bluetooth-Einstellung"</string>
+    <string name="credential_installer_activity_title" msgid="7600661521831762521">"Installation der Zugangsdaten"</string>
     <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN-Einstellungen"</string>
-    <string name="vpn_connect_to" msgid="9040615733700098831">"Mit %s verbinden"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"Mit <xliff:g id="NAME">%s</xliff:g> verbinden"</string>
     <string name="vpn_username_colon" msgid="7854930370861306247">"Nutzername:"</string>
     <string name="vpn_password_colon" msgid="5716278710848606626">"Passwort:"</string>
     <string name="vpn_a_username" msgid="6664733641993968692">"ein Nutzername"</string>
@@ -820,9 +879,9 @@
     <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Netzwerkverbindung trennen"</string>
     <string name="vpn_menu_edit" msgid="4526245173583195618">"Netzwerk bearbeiten"</string>
     <string name="vpn_menu_delete" msgid="3326527392609513129">"Netzwerk löschen"</string>
-    <string name="vpn_error_miss_entering" msgid="1467455143582547499">"Geben Sie %s ein."</string>
-    <string name="vpn_error_miss_selecting" msgid="953436717902387192">"Wählen Sie %s aus."</string>
-    <string name="vpn_error_duplicate_name" msgid="2786397299628471911">"Der VPN-Name \"%s\" ist bereits vorhanden. Wählen Sie einen anderen Namen."</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Geben Sie <xliff:g id="CODE">%s</xliff:g> ein."</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Wählen Sie <xliff:g id="OPTION">%s</xliff:g> aus."</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Der VPN-Name \"<xliff:g id="NAME">%s</xliff:g>\" ist bereits vorhanden. Wählen Sie einen anderen Namen."</string>
     <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Möchten Sie dieses VPN wirklich nicht löschen?"</string>
     <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Möchten Sie dieses Profil wirklich nicht erstellen?"</string>
     <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Möchten Sie die Änderungen an diesem Profil wirklich verwerfen?"</string>
@@ -833,10 +892,12 @@
     <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Eine oder mehrere geheime Informationen scheinen in dieser VPN-Konfiguration zu fehlen. Möchten Sie Ihre geheimen Einstellungen prüfen?"</string>
     <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Der eingegebene Nutzername oder das Passwort ist falsch. Möchten Sie es erneut versuchen?"</string>
     <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Der Server hat ein Problem. Möglicherweise sind der von Ihnen eingegebene Nutzername und das Passwort falsch. Möchten Sie es erneut versuchen?"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Der Server reagiert nicht. Möglicherweise befinden Sie sich hinter einer Firewall, die eine Verbindung mit dem Server verhindert. Möchten Sie es erneut versuchen?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Bei der Serververhandlung ist ein Fehler aufgetreten. Der Server stimmt möglicherweise nicht mit Ihrer Verschlüsselungsoption überein. Möchten Sie die Einstellungen Ihrer Verschlüsselung überprüfen?"</string>
     <string name="vpn_type_title" msgid="6392933604218676224">"VPN hinzufügen"</string>
     <string name="vpn_add_new_vpn" msgid="5438260689052714550">"VPN hinzufügen"</string>
-    <string name="vpn_edit_title_add" msgid="2550661826320709266">"VPN \"%s\" hinzufügen"</string>
-    <string name="vpn_edit_title_edit" msgid="1769999313158207723">"Details zu %s"</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"<xliff:g id="NAME">%s</xliff:g>-VPN hinzufügen"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Details zu <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="vpns" msgid="3148141862835492816">"VPNs"</string>
     <string name="vpn_connecting" msgid="8039521381692090116">"Verbindung wird hergestellt..."</string>
     <string name="vpn_disconnecting" msgid="7748050200708257066">"Verbindung wird getrennt..."</string>
@@ -844,8 +905,8 @@
     <string name="vpn_connect_hint" msgid="7442898962925875181">"Mit Netzwerk verbinden"</string>
     <string name="vpn_name" msgid="1550918148476193076">"VPN-Name"</string>
     <string name="vpn_a_name" msgid="8445736942405283509">"ein VPN-Name"</string>
-    <string name="vpn_profile_added" msgid="2157095890825215726">"%s wurde hinzugefügt."</string>
-    <string name="vpn_profile_replaced" msgid="384234123486734768">"Änderungen werden an %s vorgenommen."</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"\"<xliff:g id="NAME">%s</xliff:g>\" wurde hinzugefügt."</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"Änderungen wurden an \"<xliff:g id="NAME">%s</xliff:g>\" vorgenommen."</string>
     <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Nutzerzertifikat festlegen"</string>
     <string name="vpn_user_certificate" msgid="949322691686938888">"Nutzerzertifikat"</string>
     <string name="vpn_a_user_certificate" msgid="8943983437956898649">"ein Nutzerzertifikat"</string>
@@ -866,53 +927,53 @@
     <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"VPN-Servername"</string>
     <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS-Suchdomains"</string>
     <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS-Suchdomains"</string>
-    <string name="vpn_field_is_set" msgid="1880980734721258127">"%s ist festgelegt"</string>
-    <string name="vpn_field_not_set" msgid="6827205815004809490">"%s nicht festgelegt"</string>
-    <string name="vpn_field_not_set_optional" msgid="8665901697706781015">"%s nicht festgelegt (optional)"</string>
-    <string name="vpn_enable_field" msgid="3348948489989523325">"%s aktivieren"</string>
-    <string name="vpn_disable_field" msgid="2286966253789266389">"%s deaktivieren"</string>
-    <string name="vpn_is_enabled" msgid="5128973727115662815">"%s ist aktiviert."</string>
-    <string name="vpn_is_disabled" msgid="8028085699769751756">"%s ist deaktiviert."</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> ist festgelegt."</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> nicht festgelegt"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> nicht festgelegt (optional)"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"<xliff:g id="OPTION">%s</xliff:g> aktivieren"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"<xliff:g id="OPTION">%s</xliff:g> deaktivieren"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> ist aktiviert."</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> ist deaktiviert."</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"VPN-Einstellungen"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Virtual Private Networks (VPNs) einrichten und verwalten"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nicht geändert)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nicht festgelegt)"</string>
-    <string name="cstor_settings_category" msgid="2284299080682591107">"Anmeldeinformationsspeicher"</string>
-    <string name="cstor_access_title" msgid="1739505390736236717">"Sichere Anmeldeinf. verwenden"</string>
-    <string name="cstor_access_summary" msgid="4512681868217546677">"Anwendungen den Zugriff auf sichere Zertifikate und andere Anmeldeinformationen ermöglichen"</string>
-    <string name="cstor_access_dialog_title" msgid="3024256293191879190">"Passwort eingeben"</string>
-    <string name="cstor_access_dialog_hint_from_action" msgid="679746865623760961">"Geben Sie das Passwort für den Anmeldeinformationsspeicher ein."</string>
-    <string name="cstor_set_passwd_title" msgid="6156763762703061470">"Passwort festlegen"</string>
-    <string name="cstor_set_passwd_summary" msgid="5248560429856597398">"Passwort für Anmeldeinformationsspeicher festlegen oder ändern"</string>
-    <string name="cstor_set_passwd_dialog_title" msgid="4071157542842979977">"Passwort festlegen"</string>
-    <string name="cstor_reset_title" msgid="6001600882136794382">"Speicherinhalt löschen"</string>
-    <string name="cstor_reset_summary" msgid="7509525030771504833">"Inhalt des Anmeldeinformationsspeichers löschen und Passwort zurücksetzen"</string>
-    <string name="cstor_reset_hint" msgid="5331632794451859788">"Möchten Sie wirklich alle Anmeldeinformationen löschen und das Passwort für den Anmeldeinformationsspeicher zurücksetzen?"</string>
-    <string name="cstor_name_credential_dialog_title" msgid="1723509156126180662">"Zertifikat benennen"</string>
-    <string name="cstor_credential_name" msgid="2958936431813760259">"Zertifikatname:"</string>
-    <string name="cstor_credential_password" msgid="7187440553141199409">"Passwort zum Extrahieren des Zertifikats:"</string>
-    <string name="cstor_credential_info" msgid="6097346149400207440">"Zertifikatdetails:"</string>
-    <string name="cstor_name_credential_hint" msgid="6889198058976515785">"Der Name darf nur Buchstaben und Zahlen enthalten."</string>
-    <string name="cstor_old_password" msgid="979282118063084561">"Aktuelles Passwort:"</string>
-    <string name="cstor_new_password" msgid="6218562692435670047">"Neues Passwort:"</string>
-    <string name="cstor_confirm_password" msgid="8996028123356342466">"Neues Passwort bestätigen:"</string>
-    <string name="cstor_first_time_hint" msgid="1831593416099224962">"Legen Sie ein Passwort für den Anmeldeinformationsspeicher fest."</string>
-    <string name="cstor_first_time_hint_from_action" msgid="4690937025845780557">"Legen Sie ein Passwort für den Anmeldeinformationsspeicher fest."</string>
-    <string name="cstor_password_error" msgid="2917326097260402464">"Geben Sie das richtige Passwort ein."</string>
-    <string name="cstor_password_error_reset_warning" msgid="3336370539045905953">"Geben Sie das richtige Passwort ein. Sie haben noch einen Versuch, das richtige Passwort einzugeben. Anschließend wird der Anmeldeinformationsspeicher gelöscht."</string>
-    <string name="cstor_password_error_reset_warning_plural" msgid="6209069679269017200">"Geben Sie das richtige Passwort ein. Sie haben noch %d weitere Versuche, das richtige Passwort einzugeben. Anschließend wird der Anmeldeinformationsspeicher gelöscht."</string>
-    <string name="cstor_passwords_error" msgid="956773958408751155">"Die Passwörter stimmen nicht überein."</string>
-    <string name="cstor_passwords_empty_error" msgid="6062539742626760734">"Sie müssen ein Passwort eingeben und bestätigen."</string>
-    <string name="cstor_password_empty_error" msgid="7249632576906961482">"Geben Sie das Passwort ein."</string>
-    <string name="cstor_password_verification_error" msgid="8553930704493511389">"Geben Sie das Passwort erneut ein. Das Passwort muss mindestens acht Zeichen lang sein und darf keine Leerzeichen enthalten."</string>
-    <string name="cstor_name_empty_error" msgid="7499971191993770322">"Geben Sie einen Namen ein."</string>
-    <string name="cstor_name_char_error" msgid="8048089317968192516">"Geben Sie einen Namen ein, der ausschließlich aus Buchstaben und Zahlen besteht."</string>
-    <string name="cstor_storage_error" msgid="7140697503172458161">"Das Zertifikat kann nicht gespeichert werden. Klicken Sie auf \"OK\", um es erneut zu versuchen."</string>
-    <string name="cstor_unable_to_save_cert" msgid="1631402544447196406">"Das Zertifikat kann nicht gespeichert werden. Der Speicher für die Anmeldeinformationen ist nicht aktiviert oder falsch initialisiert."</string>
-    <string name="cstor_cert_not_saved" msgid="6318149789449538491">"Das Zertifikat wurde nicht gespeichert."</string>
-    <string name="cstor_is_reset" msgid="449870501126790589">"Der Speicher für die Anmeldeinformationen wurde gelöscht."</string>
-    <string name="cstor_is_enabled" msgid="4054049098081482785">"Der Anmeldeinformationsspeicher ist aktiviert."</string>
-    <string name="cstor_is_added" msgid="794788474010251572">"%s wurde hinzugefügt."</string>
+    <string name="credentials_category" msgid="8536992056377271234">"Anmeldeinformationsspeicher"</string>
+    <string name="credentials_access" msgid="4843187230913860492">"Sichere Anmeldeinformationen verwenden"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"Anwendungen den Zugriff auf sichere Zertifikate und andere Anmeldeinformationen ermöglichen"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"Passwort eingeben"</string>
+    <string name="credentials_unlock_hint" msgid="594679530407918031">"Geben Sie das Passwort für den Anmeldeinformationsspeicher ein."</string>
+    <string name="credentials_install_certificates" msgid="177337517568022236">"Von SD-Karte installieren"</string>
+    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Verschlüsselte Zertifikate von SD-Karte installieren"</string>
+    <string name="credentials_set_password" msgid="9104473585811899989">"Passwort festlegen"</string>
+    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Passwort für Anmeldeinformationsspeicher festlegen oder ändern"</string>
+    <string name="credentials_reset" msgid="9170150870552453457">"Speicherinhalt löschen"</string>
+    <string name="credentials_reset_summary" msgid="1530388094693731636">"Inhalt des Anmeldeinformationsspeichers löschen und Passwort zurücksetzen"</string>
+    <string name="credentials_reset_hint" msgid="819990295796804516">"Möchten Sie wirklich alle Anmeldeinformationen löschen und das Passwort für den Anmeldeinformationsspeicher zurücksetzen?"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"Aktuelles Passwort:"</string>
+    <string name="credentials_new_password" msgid="267487774686796938">"Neues Passwort:"</string>
+    <string name="credentials_confirm_password" msgid="4732250000633424345">"Neues Passwort bestätigen:"</string>
+    <string name="credentials_first_time_hint" msgid="1567821077545346039">"Legen Sie ein mindestens acht Zeichen langes Passwort für den Anmeldeinformationsspeicher fest."</string>
+    <string name="credentials_wrong_password" msgid="7525192410790152041">"Geben Sie das richtige Passwort ein."</string>
+    <string name="credentials_reset_warning" msgid="6392481296673345268">"Geben Sie das richtige Passwort ein. Sie haben noch einen Versuch, das richtige Passwort einzugeben. Anschließend wird der Anmeldeinformationsspeicher gelöscht."</string>
+    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Geben Sie das richtige Passwort ein. Sie haben noch <xliff:g id="NUMBER">%1$d</xliff:g> Versuche, das richtige Passwort einzugeben. Anschließend wird der Anmeldeinformationsspeicher gelöscht."</string>
+    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Die Passwörter stimmen nicht überein."</string>
+    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Sie müssen ein Passwort eingeben und bestätigen."</string>
+    <string name="credentials_password_empty" msgid="8292138152983330473">"Geben Sie das Passwort ein."</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"Das Passwort muss mindestens acht Zeichen lang sein."</string>
+    <string name="credentials_erased" msgid="7700309135582200849">"Der Speicher für die Anmeldeinformationen wurde gelöscht."</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"Der Anmeldeinformationsspeicher ist aktiviert."</string>
+    <string name="credentials_disabled" msgid="7453188089059045380">"Der Anmeldeinformationsspeicher ist deaktiviert."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Notfallsignal"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Verhalten bei einem Notruf festlegen"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Datenschutz"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Datenschutzeinstellungen"</string>
+    <string name="location_section_title" msgid="6072558684044939786">"Standort"</string>
+    <string name="settings_section_title" msgid="7413252428447723032">"Einstellungen"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Persönliche Daten"</string>
+    <string name="backup_settings_title" msgid="2968262658155327829">"Meine Einstellungen sichern"</string>
+    <string name="backup_erase_dialog_title" msgid="6028429904055779443">"Sicherung der Einstellungen"</string>
+    <string name="backup_erase_dialog_message" msgid="9096433810456900531">"Möchten Sie wirklich die Sicherung Ihrer Einstellungen beenden und alle Kopien auf den Google-Servern löschen?"</string>
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
+    <skip />
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 911386f4f37..6ae357bd0c6 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -24,38 +24,52 @@
     <item msgid="5345178126174698955">"Ειρηνικός"</item>
     <item msgid="8392017019801393511">"Όλα"</item>
   </string-array>
-  <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"15 δευτερόλεπτα"</item>
-    <item msgid="8881760709354815449">"30 δευτερόλεπτα"</item>
-    <item msgid="7589406073232279088">"1 λεπτό"</item>
-    <item msgid="7001195990902244174">"2 λεπτά"</item>
-    <item msgid="5721688686241190620">"10 λεπτά"</item>
-    <item msgid="1781492122915870416">"Να μην λήγει ποτέ ο χρόνος σύνδεσης"</item>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"Χωρίς κινούμενες εικόνες"</item>
+    <item msgid="6291186755504776720">"Ορισμένες κινούμενες εικόνες"</item>
+    <item msgid="3856065399819979491">"Όλες οι κινούμενες εικόνες"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"Δεν εμφανίζονται εφέ κίνησης παραθύρων"</item>
+    <item msgid="4460915688877708508">"Εμφάνιση ορισμένων εφέ κίνησης παραθύρων"</item>
+    <item msgid="488968798204105119">"Εμφανίζονται όλα τα εφέ κίνησης παραθύρων"</item>
+  </string-array>
+    <!-- no translation found for screen_timeout_entries:5 (7156442995039264948) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Πολύ αργός"</item>
+    <item msgid="2361722960903353554">"Αργός"</item>
+    <item msgid="1145554631248513562">"Κανονική"</item>
+    <item msgid="7553665153391107454">"Γρήγορη"</item>
+    <item msgid="2538100882620724753">"Πολύ γρήγορος"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item msgid="7526050907652687351">"Πολύ χαμηλός"</item>
+    <item msgid="2692137425242433765">"Χαμηλή"</item>
+    <item msgid="3332408460740717754">"Κανονική"</item>
+    <item msgid="4907380534957572531">"Υψηλή"</item>
+    <item msgid="4699640516390840297">"Πολύ υψηλός"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item msgid="478030717868306353">"Αγγλικά Αμερικής"</item>
+    <item msgid="5192284521396794598">"Αγγλικά Βρετανίας"</item>
+    <item msgid="3000262452051711991">"Γαλλικά"</item>
+    <item msgid="9214080387341763401">"Γερμανικά"</item>
+    <item msgid="5972100016440094433">"Ιταλικά"</item>
+    <item msgid="5811378076054402537">"Ισπανικά"</item>
+  </string-array>
+  <string-array name="wifi_security_entries">
+    <item msgid="2923732046112398627">"Αυτόματο"</item>
+    <item msgid="5434666299123318296">"Κανένα"</item>
+    <item msgid="3159594845889645948">"WEP"</item>
+    <item msgid="1687348101566181433">"WPA/WPA2 PSK"</item>
+    <item msgid="329777238762866787">"802.1x Εταιρικό"</item>
+  </string-array>
+  <string-array name="wifi_security_without_auto_entries">
+    <item msgid="4402120432904877907">"Κανένα"</item>
+    <item msgid="2329148995431627488">"WEP"</item>
+    <item msgid="6903317668294332381">"WPA/WPA2 PSK"</item>
+    <item msgid="7280821339307729710">"802.1x Εταιρικό"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
-    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
-    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
-    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
-    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
-    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
-    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
-    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
-    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
-    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
-    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
-    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
-    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
-    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
-    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
-    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
-    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
-    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
-    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
-    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
-    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
-    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
-    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
-    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
   <string-array name="wifi_wep_type">
     <item msgid="1497433962958697183">"Αυτόματο"</item>
     <item msgid="7182335713815377158">"WEP ASCII"</item>
@@ -84,15 +98,25 @@
     <item msgid="1908750532762193304">"Εκκίνηση καταμέτρησης"</item>
     <item msgid="1213951670006606353">"Όνομα εφαρμογής"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
-    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
-    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
-    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
-    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
-    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
-    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
-    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
-    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
-    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
-    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="1818786254010764570">"Κανένα"</item>
+    <item msgid="6189918678874123056">"PAP"</item>
+    <item msgid="1524112260493662517">"MSCHAP"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
+    <item msgid="8651992560135239389">"GTC"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Απενεργοποιημένο"</item>
+    <item msgid="3165868966179561687">"Προειδοποίηση"</item>
+    <item msgid="6038758039030476855">"Δόνηση"</item>
+  </string-array>
+    <!-- no translation found for apn_auth_entries:0 (3856896061242872146) -->
+    <!-- no translation found for apn_auth_entries:1 (5756844015743664882) -->
+    <!-- no translation found for apn_auth_entries:2 (535934025797984365) -->
+    <!-- no translation found for apn_auth_entries:3 (8383098660619805783) -->
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 2326c5450bf..e95d7b6d9c4 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -15,6 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"Ναι"</string>
+    <string name="no" msgid="6731231425810196216">"Όχι"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Άγνωστο"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Ενεργοποίηση πομπού"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Απενεργοποίηση πομπού"</string>
@@ -45,7 +47,7 @@
     <string name="radioInfo_display_packets" msgid="8654359809877290639">"pkts"</string>
     <string name="radioInfo_display_bytes" msgid="4018206969492931883">"bytes"</string>
     <string name="radioInfo_display_dbm" msgid="3621221793699882781">"dBm"</string>
-    <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
+    <string name="radioInfo_display_asu" msgid="1422248392727818082">"αρχ."</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
     <string name="sdcard_unmount" msgid="3364184561355611897">"Αφαίρεση κάρτας SD"</string>
@@ -56,6 +58,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
     <string name="sdcard_setting" msgid="5922637503871474866">"Κάρτα SD"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Κατάσταση μπαταρίας:"</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"Τροφοδοσία ρεύματος:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Κλίμακα μπαταρίας:"</string>
     <string name="battery_info_level_label" msgid="8706526709307788737">"Επίπεδο μπαταρίας:"</string>
     <string name="battery_info_health_label" msgid="6416051542741886958">"Κατάσταση μπαταρίας:"</string>
@@ -75,6 +78,11 @@
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"Αποφόρτιση"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Δεν φορτίζει"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Πλήρης"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Αποσυνδέθηκε"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"Άγνωστος"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Άγνωστο"</string>
     <string name="battery_info_health_good" msgid="8070356565806711806">"Καλό"</string>
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"Υπερθέρμανση"</string>
@@ -104,14 +112,19 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Αίτημα σύζευξης Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Αίτημα σύζευξης"</string>
     <string name="bluetooth_notif_message" msgid="5381418499788668724">"Επιλογή για σύζευξη με "</string>
+    <string name="device_picker" msgid="8721012448931226323">"Επιλογή συσκευής Bluetooth"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Αίτημα άδειας Bluetooth"</string>
+    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Μια εφαρμογή στο τηλέφωνό σας ζητά δικαίωμα ενεργοποίησης του Bluetooth. Θέλετε να το επιτρέψετε;"</string>
+    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Μια εφαρμογή στο τηλέφωνό σας ζητά άδεια για καταστήσει τη συσκευή σας ορατή από άλλες συσκευές Bluetooth για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα. Θέλετε να τη χορηγήσετε;"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Μια εφαρμογή στο τηλέφωνό σας ζητά άδεια να ενεργοποιήσει το Bluetooth και να καταστήσει τη συσκευή σας ορατή από άλλες συσκευές για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα. Θέλετε να τη χορηγήσετε;"</string>
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Ενεργοποίηση Bluetooth…"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Ρυθμίσεις ημερομηνίας &amp; ώρας"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 μμ"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
     <string name="date_time_changeTime_text" msgid="7037437020000867740">"Αλλαγή ώρας"</string>
     <string name="date_time_changeDate_text" msgid="5259762626498028057">"Ημερομηνία"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Επιλογή ζώνης ώρας"</string>
-    <!-- no translation found for normal_date_format (1982904221918374153) -->
-    <skip />
+    <string name="normal_date_format" msgid="1982904221918374153">"Κανονική (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Προεπισκόπηση:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Μέγεθος γραμματοσειράς:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -192,33 +205,23 @@
     <string name="proxy_settings_label" msgid="3271174136184391743">"Ρυθμίσεις διακομιστή μεσολάβησης"</string>
     <string name="cancel" msgid="6859253417269739139">"Ακύρωση"</string>
     <string name="settings_label" msgid="1626402585530130914">"Ρυθμίσεις"</string>
-    <!-- no translation found for settings_shortcut (3672145147925639262) -->
-    <skip />
+    <string name="settings_shortcut" msgid="3672145147925639262">"Ρυθμίσεις"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Λειτουργία πτήσης"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Απενεργοποίηση όλων των ασύρματων συνδέσεων"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Απενεργοποίηση ασύρματων συνδέσεων..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Ενεργοποίηση ασύρματων συνδέσεων..."</string>
-    <string name="radio_controls_title" msgid="8356991079873437337">"Στοιχεία ελέγχου ασύρματου"</string>
-    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
-    <skip />
-    <!-- no translation found for roaming (3596055926335478572) -->
-    <skip />
-    <!-- no translation found for roaming_enable (3737380951525303961) -->
-    <skip />
-    <!-- no translation found for roaming_disable (1295279574370898378) -->
-    <skip />
-    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
-    <skip />
-    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
-    <skip />
-    <!-- no translation found for roaming_warning (1269870211689178511) -->
-    <skip />
-    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
-    <skip />
-    <!-- no translation found for networks (6333316876545927039) -->
-    <skip />
-    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
-    <skip />
+    <string name="radio_controls_title" msgid="5868688473587168882">"Ασύρματο και δίκτυα"</string>
+    <string name="wireless_networks_settings_title" msgid="149274247949769551">"Ρυθμίσεις ασύρματου &amp; δικτύου"</string>
+    <string name="radio_controls_summary" msgid="2998818677094465517">"Διαχείριση Wi-Fi, Bluetooth, λειτουργίας πτήσης, δικτύων κινητής τηλεφωνίας και VPN"</string>
+    <string name="roaming" msgid="3596055926335478572">"Περιαγωγή δεδομένων"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Σύνδεση στις υπηρεσίες δεδομένων κατά την περιαγωγή"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Σύνδεση στις υπηρεσίες δεδομένων κατά την περιαγωγή"</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"Χάσατε τη σύνδεση δεδομένων επειδή φύγατε από το οικείο δίκτυο έχοντας την περιαγωγή δεδομένων απενεργοποιημένη."</string>
+    <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Ενεργοποίηση"</string>
+    <string name="roaming_warning" msgid="1269870211689178511">"Να επιτρέπεται η περιαγωγή δεδομένων; Ενδέχεται να επιβαρυνθείτε με σημαντικά έξοδα περιαγωγής!"</string>
+    <string name="roaming_reenable_title" msgid="7626425894611573131">"Προσοχή"</string>
+    <string name="networks" msgid="6333316876545927039">"Επιλογή παρόχου"</string>
+    <string name="sum_carrier_select" msgid="6648929373316748020">"Επιλέξτε εταιρεία δικτύου"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Ημερομηνία &amp; ώρα"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Ορισμός ημερομηνίας, ώρας, ζώνης ώρας &amp; μορφές"</string>
     <string name="date_time_auto" msgid="3086083265745944725">"Αυτόματο"</string>
@@ -231,25 +234,31 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Επιλογή μορφής ημερομηνίας"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ταξινόμηση με βάση αλφαβητική σειρά"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ταξινόμηση με βάση ζώνη ώρας"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"Ασφάλεια &amp; τοποθεσία"</string>
-    <!-- no translation found for security_settings_summary (967393342537986570) -->
-    <skip />
+    <string name="security_settings_title" msgid="5168491784222013179">"Τοποθεσία και ασφάλεια"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"Ρυθμίσεις τοποθεσίας και ασφάλειας"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"Ορισμός του \"Η τοποθεσία μου\", ξεκλειδώματος οθόνης, κλειδώματος κάρτας SIM, κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ορισμός του \"Η τοποθεσία μου\", του ξεκλειδώματος οθόνης και του κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Κωδικοί πρόσβασης"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Ενεργοποίηση Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Ρυθμίσεις Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Ρυθμίσεις Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Διαχείριση συνδέσεων, ορισμός ονόματος συσκευής &amp; ανιχνευσιμότητα"</string>
-    <string name="bluetooth_pin_entry" msgid="5627349871303455279">"Αίτημα σύζευξης Bluetooth"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Αίτημα σύζευξης Bluetooth"</string>
     <string name="bluetooth_device_info" msgid="6644515376523965073">"Πληροφορίες συσκευής Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="7551139612735632370">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Πληκτρολογήστε τον αριθμό PIN για σύζευξη."\n"(Δοκιμάστε 0000 ή 1234)."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Πληκτρολογήστε τον αριθμό PIN για σύζευξη με \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Δοκιμάστε 0000 ή 1234.)"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Πληκτρολογήστε κλειδί πρόσβασης για ζεύξη με \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Για ζεύξη με τη συσκευή \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", βεβαιωθείτε ότι προβάλλεται το κλειδί πρόσβασης: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"επιθυμεί σύζευξη."</string>
+    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Εισαγάγετε <xliff:g id="PASSKEY">%2$s</xliff:g> στο \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" για ζεύξη."</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Ζεύγος"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Χωρίς ζεύξη"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"συσκευή bluetooth"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Προσοχή"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Παρουσιάστηκε ένα πρόβλημα κατά τη σύζευξη με <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="6938408362011024289">"Παρουσιάστηκε ένα πρόβλημα κατά τη σύζευξη με το <xliff:g id="DEVICE_NAME">%1$s</xliff:g> επειδή ο αριθμός PIN που πληκτρολογήσατε είναι εσφαλμένος."</string>
-    <!-- no translation found for bluetooth_pairing_device_down_error_message (6688215193824686741) -->
-    <skip />
-    <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
-    <skip />
+    <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Παρουσιάστηκε ένα πρόβλημα κατά τη ζεύξη με το <xliff:g id="DEVICE_NAME">%1$s</xliff:g> επειδή ο αριθμός PIN ή το κλειδί πρόσβασης είναι εσφαλμένο."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"Δεν είναι δυνατή η δημιουργία σύνδεσης με τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Η ζεύξη απορρίφθηκε από τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Παρουσιάστηκε ένα πρόβλημα κατά τη σύνδεση σε <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Ανίχνευση για συσκευές"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Σύνδεση"</string>
@@ -261,6 +270,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Σύνδεση σε..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Πολυμέσα"</string>
     <string name="bluetooth_profile_headset" msgid="1874975688666658946">"Τηλέφωνο"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Μεταφορά"</string>
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Συνδέθηκε σε ήχο πολυμέσων"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Συνδεδεμένο στον ήχο τηλεφώνου"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Σύνδεση στο τηλέφωνο και στον ήχο πολυμέσων"</string>
@@ -270,8 +280,11 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Προφίλ"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Συνδέθηκε σε ήχο πολυμέσων"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Συνδεδεμένο στον ήχο τηλεφώνου"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Συνδεδεμένο σε διακομιστή μεταφοράς αρχείων"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Δεν έχει συνδεθεί σε διακομιστή μεταφοράς αρχείων"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Χρήση για ήχο πολυμέσων"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Χρήση για ήχο τηλεφώνου"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Χρήση για τη μεταφορά αρχείων"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Ενεργοποίηση Wi-Fi"</string>
@@ -288,25 +301,13 @@
     <string name="security" msgid="1040691896987225267">"Ασφάλεια"</string>
     <string name="wifi_security_open" msgid="3513305614048816607">"Άνοιγμα"</string>
     <string name="wifi_security_wep" msgid="7082604129842065776">"WEP"</string>
-    <string name="wifi_security_wpa" msgid="8980169410565477162">"WPA"</string>
-    <string name="wifi_security_wpa2" msgid="5780665935088930524">"WPA2"</string>
-    <!-- no translation found for wifi_security_wpa_eap (7485687331651751101) -->
-    <skip />
-    <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
-    <skip />
+    <string name="wifi_security_psk" msgid="3392399380570381452">"WPA/WPA2 PSK"</string>
+    <string name="wifi_security_eap" msgid="8309434150934969132">"Εταιρία(802.1x)"</string>
     <string name="wifi_security_unknown" msgid="4564208312073060668">"Άγνωστο"</string>
-    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
-    <skip />
+    <string name="wifi_security_verbose_open" msgid="8117878112088901945">"ανοικτό δίκτυο"</string>
+    <string name="wifi_security_verbose_wep" msgid="9220757688700421508">"ασφαλισμένο με WEP"</string>
+    <string name="wifi_security_verbose_psk" msgid="1110130025330416225">"ασφαλισμένο με WPA/WPA2 PSK"</string>
+    <string name="wifi_security_verbose_eap" msgid="586632662086063">"ασφαλισμένο με 802.1x EAP"</string>
     <string name="ip_address" msgid="850672263358989449">"Διεύθυνση IP"</string>
     <string name="signal" msgid="1947969631626413228">"Ισχύς σήματος"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"Ενεργοποίηση..."</string>
@@ -319,28 +320,19 @@
     <string name="error_saving" msgid="8294279443961615302">"Δεν είναι δυνατή η αποθήκευση του δικτύου"</string>
     <string name="connect" msgid="3079076576295839400">"Σύνδεση"</string>
     <string name="connect_to_blank" msgid="6950910074058025378">"Σύνδεση σε <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for please_select_eap (4488240331626456338) -->
-    <skip />
-    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
-    <skip />
-    <!-- no translation found for please_type_identity (7061261155499513089) -->
-    <skip />
-    <!-- no translation found for please_type_anonymous_identity (835061562079965048) -->
-    <skip />
-    <!-- no translation found for please_select_client_certificate (2137906961594663234) -->
-    <skip />
-    <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
-    <skip />
-    <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
-    <skip />
+    <string name="please_select_eap" msgid="4488240331626456338">"Μέθοδος EAP"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"2η φάση ελέγχου ταυτότητας"</string>
+    <string name="please_type_identity" msgid="7061261155499513089">"Ταυτότητα"</string>
+    <string name="please_type_anonymous_identity" msgid="835061562079965048">"Ανώνυμη ταυτότητα"</string>
+    <string name="please_select_client_certificate" msgid="2137906961594663234">"Πιστοποιητικό πελάτη"</string>
+    <string name="please_select_ca_certificate" msgid="5010815181914420677">"Πιστοποιητικό CA"</string>
     <string name="please_type_passphrase" msgid="8256017704131522462">"Κωδικός πρόσβασης ασύρματου"</string>
     <string name="please_type_hex_key" msgid="8751224390407867551">"Δεκαεξαδικό κλειδί WEP (0-9, A-F)"</string>
     <string name="wifi_show_password" msgid="4235237470701732009">"Εμφάνιση κωδικού πρόσβασης."</string>
     <string name="scan_wifi" msgid="2459901725350542606">"Σάρωση"</string>
     <string name="summary_not_in_range" msgid="3926674700733548684">"Εκτός εμβέλειας"</string>
-    <!-- no translation found for summary_remembered (6079941090549401742) -->
-    <skip />
-    <string name="summary_connection_failed" msgid="7610394657613410489">"Η σύνδεση δεν ήταν επιτυχής, επιλέξτε για να προσπαθήσετε ξανά"</string>
+    <string name="summary_remembered" msgid="6079941090549401742">"διατηρήθηκε"</string>
+    <string name="summary_connection_failed" msgid="2351885658101671413">"Η σύνδεση δεν ήταν επιτυχής, αγγίξτε για να προσπαθήσετε ξανά"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Δίκτυα Wi-Fi"</string>
     <string name="wifi_type_ssid" msgid="1326839657083292017">"Δίκτυο SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Ασφάλεια"</string>
@@ -391,6 +383,7 @@
     <string name="status_disconnected" msgid="7561688569905126046">"Αποσυνδέθηκε"</string>
     <string name="status_failed" msgid="610462050405904601">"Ανεπιτυχής"</string>
     <string name="sound_and_display_settings" msgid="349770582993029003">"Ήχος και εικόνα"</string>
+    <string name="sound_and_display_settings_title" msgid="5036144539683697330">"Ρυθμίσεις ήχου &amp; προβολής"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Ρυθμίσεις ήχου"</string>
     <string name="sound_and_display_settings_summary" msgid="1433943789593286064">"Ρύθμιση ήχων κλήσης, ειδοποιήσεων, φωτεινότητας οθόνης"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Λειτουργία σίγασης"</string>
@@ -410,23 +403,22 @@
     <string name="notification_sound_dialog_title" msgid="7057274209079144726">"Επιλογή ήχου κλήσης ειδοποίησης"</string>
     <string name="media_volume_title" msgid="7844516127427195383">"Ένταση ήχου πολυμέσων"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Ορισμός έντασης ήχου για μουσική και βίντεο"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Ήχοι ηχητικής αφής"</string>
+    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Ήχοι αγγίγματος οθόνης"</string>
     <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Αναπαραγωγή ήχων κατά τη χρήση του πληκτρολογίου κλήσης"</string>
     <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Αναπαραγωγή ήχων κατά τη χρήση του πληκτρολογίου κλήσης"</string>
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"Ηχητική επιλογή"</string>
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Αναπαραγωγή ήχου κατά την πραγματοποίηση επιλογής στην οθόνη"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Αναπαραγωγή ήχου κατά την πραγματοποίηση επιλογής στην οθόνη"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Απτικά σχόλια"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Δόνηση κατά το πάτημα μαλακών πλήκτρων και σε συγκεκριμένες αλληλεπιδράσεις της επιφάνειας UI"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Δόνηση κατά το πάτημα μαλακών πλήκτρων και σε συγκεκριμένες αλληλεπιδράσεις της επιφάνειας UI"</string>
     <string name="play_media_notification_sounds_enable_title" msgid="1008791464029179529">"Ειδοποιήσεις κάρτας SD"</string>
-    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
-    <skip />
-    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
-    <skip />
-    <string name="sync_settings" msgid="2212736205476453234">"Συγχρονισμός δεδομένων"</string>
-    <string name="sync_settings_summary" msgid="6480534906375217074">"Επιλογή εφαρμογών που θέλετε να συγχρονιστούν"</string>
-    <!-- no translation found for search_settings (1910951467596035063) -->
-    <skip />
-    <!-- no translation found for search_settings_summary (9205656546570654169) -->
-    <skip />
+    <string name="play_media_notification_sounds_enable_summary_on" msgid="7675466959375667370">"Αναπαραγωγή ήχου για τις προειδοποιήσεις κάρτας SD"</string>
+    <string name="play_media_notification_sounds_enable_summary_off" msgid="8672617597028744693">"Αναπαραγωγή ήχου για τις προειδοποιήσεις κάρτας SD"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Λογαριασμοί &amp; συγχρονισμός"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"Προσθήκη ή κατάργηση λογαριασμών και αλλαγή ρυθμίσεων λογαριασμού"</string>
+    <string name="search_settings" msgid="1910951467596035063">"Αναζήτηση"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Διαχείριση ρυθμίσεων αναζήτησης και ιστορικού"</string>
     <string name="display_settings" msgid="3912042046350078328">"Ρυθμίσεις προβολής"</string>
     <string name="animations_title" msgid="1062189037402346023">"Κίνηση"</string>
     <string name="animations_summary_on" msgid="8843613112130484436">"Προβολή κινούμενης εικόνας κατά το άνοιγμα &amp; κλείσιμο παραθύρων"</string>
@@ -438,6 +430,7 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ρύθμιση της φωτεινότητας της οθόνης"</string>
     <string name="screen_timeout" msgid="4882669461447531301">"Λήξη ορίου χρόνου οθόνης"</string>
     <string name="screen_timeout_summary" msgid="2905757633140605334">"Προσαρμόστε το χρόνο που πρέπει να παρέλθει πριν από την αυτόματη απενεργοποίηση της οθόνης."</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"Αυτόματη φωτεινότητα"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ρυθμίσεις κλειδώματος κάρτας SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Ορισμός κλειδώματος κάρτας SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Κλείδωμα κάρτας SIM"</string>
@@ -470,18 +463,14 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Δεν είναι διαθέσιμο"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Κατάσταση"</string>
     <string name="device_status" msgid="607405385799807324">"Κατάσταση"</string>
-    <!-- no translation found for device_status_summary (2599162787451519618) -->
-    <skip />
-    <string name="storage_settings_title" msgid="8461515684514801302">"Κάρτα SD &amp; αποθηκευτικός χώρος τηλεφώνου"</string>
+    <string name="device_status_summary" msgid="2599162787451519618">"Τηλεφωνικός αριθμός, σήμα κ.λπ."</string>
+    <string name="storage_settings" msgid="6681164315506788024">"Κάρτα SD &amp; αποθηκευτικός χώρος τηλεφώνου"</string>
+    <string name="storage_settings_title" msgid="5379463509034022773">"Ρυθμίσεις κάρτας SD &amp; αποθηκευτικού χώρου τηλεφώνου"</string>
     <string name="storage_settings_summary" msgid="9176693537325988610">"Αφαίρεση κάρτας SD, προβολή διαθέσιμου αποθηκευτικού χώρου"</string>
-    <!-- no translation found for status_number (5123197324870153205) -->
-    <skip />
-    <!-- no translation found for status_min_number (3519504522179420597) -->
-    <skip />
-    <!-- no translation found for status_prl_version (8499039751817386529) -->
-    <skip />
-    <!-- no translation found for status_meid_number (1751442889111731088) -->
-    <skip />
+    <string name="status_number" msgid="5123197324870153205">"Ο τηλεφωνικός αριθμός μου"</string>
+    <string name="status_min_number" msgid="3519504522179420597">"ΛΕΠΤΟ"</string>
+    <string name="status_prl_version" msgid="8499039751817386529">"Έκδοση PRL"</string>
+    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Τύπος δικτύου κινητής τηλεφωνίας"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Κατάστ.δικτ.κιν.τηλ."</string>
     <string name="status_service_state" msgid="2323931627519429503">"Κατάσταση υπηρεσίας"</string>
@@ -520,6 +509,11 @@
     <string name="apn_mms_port" msgid="4074188088199243040">"Θύρα MMS"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"Τύπος ελέγχου ταυτότητας"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Κανένας"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP ή CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Τύπος APN"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Διαγραφή APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Νέο APN"</string>
@@ -535,11 +529,9 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Η επαναφορά των εργοστασιακών ρυθμίσεων APN ολοκληρώθηκε"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Επαναφορά εργοστασιακών δεδομένων"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Διαγραφή όλων των δεδομένων στο τηλέφωνο"</string>
-    <!-- no translation found for master_clear_desc (7823268823499739178) -->
-    <skip />
+    <string name="master_clear_desc" msgid="7823268823499739178">"Αυτή η ενέργεια θα διαγράψει όλα τα δεδομένα από το τηλέφωνό σας, συμπεριλαμβανομένων:"\n<li>"του Λογαριασμού Google"</li>\n<li>"των δεδομένων και εφαρμογών συστήματος και εφαρμογών"</li>\n<li>"των εφαρμογών από λήψη"</li>\n"Δεν θα διαγράψει:"\n<li>"το τρέχον λογισμικό και τις ομαδοποιημένες εφαρμογές συστήματος"</li>\n<li>"τα αρχεία κάρτας SD, όπως μουσική ή φωτογραφίες"</li></string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Επαναφορά τηλεφώνου"</string>
-    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
-    <skip />
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"Να πραγματοποιηθεί διαγραφή όλων των προσωπικών στοιχείων και τυχόν εφαρμογών από λήψη; Αυτή η ενέργεια δεν είναι αναστρέψιμη!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Διαγραφή όλων"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Σχεδιάστε το μοτίβο ξεκλειδώματος"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για επιβεβαίωση επαναφοράς τηλεφώνου."</string>
@@ -556,20 +548,19 @@
     <string name="call_settings_summary" msgid="7291195704801002886">"Ορισμ.αυτόμ.τηλεφ., προώθ.κλήσης, αναμ.κλήσης, αναγν.κλήσ."</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Δίκτυα κινητής τηλεφωνίας"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Ορισμός επιλογών για περιαγωγή, δίκτυα, APN"</string>
-    <!-- no translation found for location_title (1029961368397484576) -->
-    <skip />
+    <string name="location_title" msgid="1029961368397484576">"Η τοποθεσία μου"</string>
     <string name="location_network_based" msgid="8815705866861993344">"Χρήση ασύρματων δικτύων"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Προβ.τοποθ.σε εφαρμ.(όπως π.χ. στους Χάρτες) με χρήση ασύρ.δικτ."</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Η τοποθ.προσδ.από δίκτ.Wi-Fi και/ή δίκτ.κινητ.τηλεφ."</string>
-    <string name="location_gps" msgid="375912731641377120">"Ενεργοποίηση δορυφόρων GPS"</string>
-    <string name="location_street_level" msgid="5899941752252356344">"Κατά την εύρ.τοποθ., η ακρίβ.είναι σε επίπ.δρόμ.(αποεπιλ.το για εξοικ.μπατ.)"</string>
+    <string name="location_gps" msgid="6296125378829097831">"Χρήση δορυφόρων GPS"</string>
+    <string name="location_street_level" msgid="6460740847018275745">"Κατά την εύρεση τοποθεσίας, η ακρίβεια είναι σε επίπεδο δρόμου (αποεπιλογή για εξοικονόμηση μπαταρίας)"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Εντοπ.σε επίπ.δρόμου (απαιτ.μεγ.καταν.μπαταρ.και μετάβ.σε ανοικτό χώρο)"</string>
-    <!-- no translation found for use_location_title (7585990952633568732) -->
-    <skip />
-    <!-- no translation found for use_location_summary (4411467143899877395) -->
-    <skip />
-    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
-    <skip />
+    <string name="assisted_gps" msgid="4649317129586736885">"Χρήση υποβοηθούμενου GPS"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Χρήση διακομιστή για βοήθεια GPS (αποεπιλογή για να μειώσετε τη χρήση του δικτύου)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Χρήση διακομιστή για βοήθεια του GPS (αποεπιλογή για βελτίωση της απόδοσης του GPS)"</string>
+    <string name="use_location_title" msgid="5447030582538504247">"Χρήση της τοποθεσίας μου"</string>
+    <string name="use_location_summary" msgid="1816849484040070431">"Χρήση της Τοποθεσίας μου για τα αποτελέσματα αναζήτησης Google και τις υπόλοιπες υπηρεσίες Google"</string>
+    <string name="use_location_warning_message" msgid="1420184860518262439">"Θέλετε να επιτρέψετε στο Google να χρησιμοποιήσει πληροφορίες τοποθεσίας για καλύτερα αποτελέσματα αναζήτησης και άλλες υπηρεσίες;"</string>
     <string name="agree" msgid="6288718671527758326">"Συμφωνώ"</string>
     <string name="disagree" msgid="6221069272309799230">"Διαφωνώ"</string>
     <string name="about_settings" msgid="1743378368185371685">"Σχετικά με το τηλέφωνο"</string>
@@ -579,12 +570,15 @@
     <string name="copyright_title" msgid="865906688917260647">"Πνευματικά δικαιώματα"</string>
     <string name="license_title" msgid="1990487604356037871">"Άδεια"</string>
     <string name="terms_title" msgid="7697580845616764642">"Όροι και προϋποθέσεις"</string>
-    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
-    <skip />
+    <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Εκπαιδευτικό κείμενο συστήματος"</string>
     <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Μάθετε πώς να χρησιμοποιείτε το τηλέφωνό σας"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Άδειες λογισμ.ανοικτ.κώδ."</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Παρουσιάστηκε ένα πρόβλημα κατά τη φόρτωση των αδειών."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Φόρτωση..."</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Πληροφορίες ασφάλειας"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Πληροφορίες ασφάλειας"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Το τηλέφωνό σας δεν είναι συνδεδεμένο σε υπηρεσία δεδομένων. Για να προβάλετε αυτές τις πληροφορίες τώρα, μεταβείτε στο %s από οποιονδήποτε υπολογιστή με σύνδεση στο Διαδίκτυο."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Φόρτωση..."</string>
     <string name="lock_settings_title" msgid="5828348303971852121">"Μοτίβο ξεκλειδώματος οθόνης"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Αλλαγή μοτίβου ξεκλειδώματος"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Επιβεβαίωση αποθηκευμένου μοτίβου"</string>
@@ -613,9 +607,9 @@
     <string name="skip_button_label" msgid="8680422740354436943">"Ακύρωση"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Επόμενο"</string>
     <string name="lock_title" msgid="4059246467204273930">"Ασφάλιση του τηλεφώνου σας"</string>
-    <string name="lock_intro_message" msgid="5352897389718432077"><font size="17">"Προστατέψτε το τηλέφωνό σας από μη εξουσιοδοτημένη χρήση δημιουργώντας ένα προσωπικό μοτίβο ξεκλειδώματος οθόνης. "\n<font height="17">\n</font><b>"1"</b>"  Στην επόμενη οθόνη παρακολουθήστε ένα παράδειγμα σχεδίασης μοτίβου. "\n<font height="17">\n</font><b>"2"</b>"  Όταν είστε έτοιμοι, σχεδιάστε το προσωπικό σας μοτίβο ξεκλειδώματος. Πειραματιστείτε με διάφορα μοτίβα, αλλά συνδέστε τουλάχιστον τέσσερα σημεία. "\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_intro_message" msgid="9100785646737118042"><font size="17">"Προστατέψτε το τηλέφωνό σας από μη εξουσιοδοτημένη χρήση δημιουργώντας ένα προσωπικό μοτίβο ξεκλειδώματος οθόνης. "\n<font height="17">\n</font><b>"1"</b>"  Στην επόμενη οθόνη παρακολουθήστε ένα παράδειγμα σχεδίασης μοτίβου. "\n<font height="17">\n</font><b>"2"</b>"  Όταν είστε έτοιμοι, σχεδιάστε το προσωπικό σας μοτίβο ξεκλειδώματος. Πειραματιστείτε με διάφορα μοτίβα αλλά συνδέστε τουλάχιστον τέσσερα σημεία. "\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" msgid="8052305554017485410">"Παράδειγμα μοτίβου"</string>
-    <string name="lock_example_message" msgid="7431982730914254881">"Συνδέστε τουλάχιστον τέσσερις τελείες."\n" "\n"Επιλέξτε \"Επόμενο\" όταν είστε έτοιμοι να σχεδιάσετε το δικό σας μοτίβο."</string>
+    <string name="lock_example_message" msgid="1838650097090632706">"Συνδέστε τουλάχιστον τέσσερις τελείες."\n" "\n"Αγγίξτε την επιλογή “Επόμενο” όταν είστε έτοιμοι να σχεδιάσετε το δικό σας μοτίβο."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Διαχείριση εφαρμογών"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Διαχείριση και κατάργηση εγκατεστημένων εφαρμογών"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Εφαρμογές"</string>
@@ -638,8 +632,7 @@
     <string name="data_size_label" msgid="8679376373625710107">"Δεδομένα"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Κατάργηση εγκατάστασης"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Εκκαθάριση δεδομένων"</string>
-    <!-- no translation found for app_factory_reset (6635744722502563022) -->
-    <skip />
+    <string name="app_factory_reset" msgid="6635744722502563022">"Κατάργηση εγκατάστασης ενημερώσεων"</string>
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Επιλέξατε την εκτέλεση αυτής της εφαρμογής από προεπιλογή για ορισμένες ενέργειες."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Δεν έχουν οριστεί προεπιλογές."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Εκκαθάριση προεπιλογών"</string>
@@ -650,32 +643,41 @@
     <string name="filter" msgid="2018011724373033887">"Φίλτρο"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Επιλογές φίλτρου"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Όλα"</string>
-    <string name="filter_apps_third_party" msgid="1096017647285183437">"Τρίτο μέρος"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Η λήψη ολοκληρώθηκε"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Εκτελείται"</string>
     <string name="loading" msgid="3200408047793887917">"Φόρτωση..."</string>
     <string name="recompute_size" msgid="7722567982831691718">"Εκ νέου υπολογισμός μεγέθους..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Διαγραφή"</string>
-    <string name="clear_data_dlg_text" msgid="8796694785488630642">"Όλες οι πληροφορίες που αποθηκεύσατε σε αυτήν την εφαρμογή θα διαγραφούν οριστικά."</string>
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"Όλα τα δεδομένα της εφαρμογής θα διαγραφούν μόνιμα. Αυτό περιλαμβάνει όλα τα αρχεία, τις ρυθμίσεις, τους λογαριασμούς, τις βάσεις δεδομένων και τα λοιπά."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Ακύρωση"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"Η εφαρμογή δεν βρέθηκε"</string>
     <string name="app_not_found_dlg_text" msgid="2980271680333341554">"Η εφαρμογή δεν βρέθηκε στη λίστα των εγκατεστημένων εφαρμογών."</string>
     <string name="clear_data_failed" msgid="581956197586913865">"Δεν είναι δυνατή η εκκαθάριση δεδομένων εφαρμογής."</string>
-    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
-    <skip />
-    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
-    <skip />
-    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
-    <skip />
-    <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
-    <skip />
+    <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Κατάργηση εγκατάστασης ενημερώσεων"</string>
+    <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Θέλετε να απεγκαταστήσετε όλες τις ενημερώσεις σε αυτήν την εφαρμογή συστήματος Android;"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Εκκαθάριση δεδομένων"</string>
+    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Απέτυχε η εκκαθάριση δεδομένων για την εφαρμογή"</string>
     <string name="security_settings_desc" msgid="3116027624526915561">"Αυτή η εφαρμογή μπορεί να αποκτήσει πρόσβαση στα ακόλουθα στο τηλέφωνό σας:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Υπολογισμός..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Δεν είναι δυνατός ο υπολογισμός του μεγέθους του πακέτου"</string>
-    <string name="empty_list_msg" msgid="1883660401486953588">"Δεν έχετε εγκαταστήσει εφαρμογές τρίτων μερών."</string>
-    <!-- no translation found for version_text (9189073826278676425) -->
-    <skip />
-    <string name="language_settings" msgid="2939555761536357092">"Τοπικές ρυθμίσεις &amp; κείμενο"</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"Δεν έχετε εγκαταστήσει εφαρμογές τρίτων μερών."</string>
+    <string name="version_text" msgid="9189073826278676425">"έκδοση <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"Υπηρεσίες που εκτελούνται"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Προβολή και έλεγχος των εφαρμογών που εκτελούνται αυτή τη στιγμή"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"Γίνεται επανεκκίνηση"</string>
+    <string name="no_running_services" msgid="6981216347270280598">"Δεν εκτελούνται υπηρεσίες"</string>
+    <string name="confirm_stop_service" msgid="5700448757318301681">"Διακοπή υπηρεσίας;"</string>
+    <string name="confirm_stop_service_msg" msgid="1202118456282395730">"Η υπηρεσία δεν θα εκτελείται έως ότου επανεκκινηθεί. Αυτό ενδέχεται να έχει μη επιθυμητά αποτελέσματα στην εφαρμογή <xliff:g id="APPLICATION">%1$s</xliff:g>."</string>
+    <string name="confirm_stop_stop" msgid="7382363913280993331">"Διακοπή"</string>
+    <string name="confirm_stop_cancel" msgid="206495326622692381">"Άκυρο"</string>
+    <string name="service_started_by_app" msgid="8432097226392386802">"Έγινε εκκίνηση από εφαρμογή: άγγιγμα για παύση"</string>
+    <string name="service_client_name" msgid="2337664610975074717">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: αγγίξτε για διαχείριση"</string>
+    <string name="service_background_processes" msgid="5158600475629177758">"Διαθ.: <xliff:g id="FREE">%2$s</xliff:g>+<xliff:g id="MEMORY">%3$s</xliff:g> στα <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_foreground_processes" msgid="4013890350284680796">"Άλλο: <xliff:g id="MEMORY">%2$s</xliff:g> στα <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_process_name" msgid="8630408984456958400">"Διεργασία: <xliff:g id="PROCESS">%1$s</xliff:g>"</string>
+    <string name="language_settings" msgid="502219872342167227">"Γλώσσα και πληκτρολόγιο"</string>
+    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Ρυθμίσεις γλώσσας και πληκτρολογίου"</string>
     <string name="language_settings_summary" msgid="595647729475399987">"Ορισμ.τοπ.ρυθμ.(γλώσσα και περιοχή), είσ.κειμ.και επιλ.αυτόμ.διόρθ."</string>
     <string name="language_category" msgid="3391756582724541530">"Τοπικές ρυθμίσεις"</string>
     <string name="text_category" msgid="6342540511465136739">"Ρυθμίσεις κειμένου"</string>
@@ -690,7 +692,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Πατήστε το πλήκτρο Space δύο φορές για να εισαγάγετε \".\""</string>
     <string name="show_password" msgid="2198798062604049206">"Εμφανιζόμενοι κωδικοί πρόσβασης"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Εμφάνιση κωδικού πρόσβασης κατά την πληκτρολόγηση"</string>
-    <string name="ime_security_warning" msgid="3458652708716006477">"Η μέθοδος εισόδου ενδέχεται να έχει τη δυνατότητα συλλογής όλων των κειμένων που πληκτρολογείτε, συμπεριλαμβανομένων προσωπικών δεδομένων όπως κωδικοί πρόσβασης και αριθμοί πιστωτικής κάρτας. Προέρχεται από την εφαρμογή <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Ενεργοποίηση αυτής της μεθόδου εισόδου;"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"Η μέθοδος εισόδου ενδέχεται να έχει τη δυνατότητα συλλογής όλων των κειμένων που πληκτρολογείτε, συμπεριλαμβανομένων προσωπικών δεδομένων όπως κωδικοί πρόσβασης και αριθμοί πιστωτικής κάρτας. Προέρχεται από την εφαρμογή <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Να γίνει χρήση αυτής της μεθόδου εισόδου;"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Λεξικό χρήστη"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"Λεξικό χρήστη"</string>
     <string name="user_dict_settings_summary" msgid="2460427065601355471">"Προσθήκη &amp; κατάργηση λέξεων από το λεξικό χρήστη"</string>
@@ -718,7 +720,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Είσοδος κειμένου"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Διαχείριση επιλογών εισόδου κειμένου"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> ρυθμίσεις"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="4919680715154885028">"Ρυθμίσεις πληκτρολογίου οθόνης"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ρυθμίσεις πληκτρολογίου οθόνης"</string>
     <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Πληκτρολόγιο συσκευής"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Ενσωματωμένες ρυθμίσεις πληκτρολογίου"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Ανάπτυξη"</string>
@@ -729,13 +731,11 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Η οθόνη δεν θα μεταβαίνει ποτέ σε κατάσταση αδράνειας κατά τη φόρτιση"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Να επιτρέπονται ψευδείς τοποθεσίες"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Να επιτρέπονται ψευδείς τοποθεσίες"</string>
-    <!-- no translation found for adb_warning_title (1756027479229533250) -->
-    <skip />
-    <!-- no translation found for adb_warning_message (5352555112049663033) -->
-    <skip />
+    <string name="adb_warning_title" msgid="6234463310896563253">"Να επιτρέπεται ο εντοπισμός σφαλμάτων USB;"</string>
+    <string name="adb_warning_message" msgid="5352555112049663033">"Ο εντοπισμός σφαλμάτων USB προορίζεται μόνο για σκοπούς προγραμματισμού. Μπορεί να χρησιμοποιηθεί για αντιγραφή δεδομένων μεταξύ του υπολογιστή και της συσκευής σας, για την εγκατάσταση εφαρμογών στη συσκευή σας χωρίς προειδοποίηση και για την ανάγνωση δεδομένων καταγραφής."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Επιλογή gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Επιλογή γραφικού στοιχείου"</string>
-    <string name="battery_history_details_for" msgid="5189636461798594740">"Λεπτομέρειες για UID %d"</string>
+    <string name="battery_history_details_for" msgid="5924639922153109669">"Λεπτομέρειες για UID <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="battery_history_uid" msgid="1016606150528436298">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage" msgid="8010852371665217020">"Λεπτομέρειες χρήσης δικτύου για <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
     <string name="battery_history_bytes_received" msgid="980307569180518302">"Αριθμός byte που ελήφθησαν: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
@@ -746,14 +746,10 @@
     <string name="battery_history_system_time" msgid="2015862072724507547">"Ώρα συστήματος:"</string>
     <string name="battery_history_total_time" msgid="3618703970098556104">"Συνολικός χρόνος:"</string>
     <string name="battery_history_starts" msgid="9137453931978571696">"Ξεκινά: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
-    <!-- no translation found for battery_history_days (7110262897769622564) -->
-    <skip />
-    <!-- no translation found for battery_history_hours (7525170329826274999) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
-    <skip />
-    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
-    <skip />
+    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>η <xliff:g id="HOURS">%2$d</xliff:g>ω <xliff:g id="MINUTES">%3$d</xliff:g>λ <xliff:g id="SECONDS">%4$d</xliff:g>δ"</string>
+    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ω <xliff:g id="MINUTES">%2$d</xliff:g>λ <xliff:g id="SECONDS">%3$d</xliff:g>δ"</string>
+    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>λ <xliff:g id="SECONDS">%2$d</xliff:g>δ"</string>
+    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>δ"</string>
     <string name="battery_history_packages_sharing_this_uid" msgid="4101596071379250050">"Πακέτα που μοιράζονται αυτό το UID:"</string>
     <string name="battery_history_no_data" msgid="1177238743237067617">"Δεν υπάρχουν διαθέσιμα δεδομένα χρήσης μπαταρίας"</string>
     <string name="battery_history_sensor" msgid="2333488996028993982">"Αισθητήρας:"</string>
@@ -775,400 +771,209 @@
     <string name="app_name_label" msgid="2000949925256858308">"Εφαρμογή"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"Μέτρηση"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Χρόνος χρήσης"</string>
-    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
-    <skip />
-    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
-    <skip />
-    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
-    <skip />
-    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
-    <skip />
-    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
-    <skip />
-    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
-    <skip />
-    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
-    <skip />
-    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
-    <skip />
-    <!-- no translation found for power_usage_summary (7237084831082848168) -->
-    <skip />
-    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
-    <skip />
-    <!-- no translation found for battery_since_reset (7464546661121187045) -->
-    <skip />
-    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
-    <skip />
+    <string name="accessibility_settings" msgid="3975902491934816215">"Προσβασιμότητα"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Ρυθμίσεις προσβασιμότητας"</string>
+    <string name="accessibility_settings_summary" msgid="8185181964847149507">"Διαχείριση επιλογών προσβασιμότητας"</string>
+    <string name="toggle_accessibility_title" msgid="650839277066574497">"Προσβασιμότητα"</string>
+    <string name="accessibility_services_category" msgid="8127851026323672607">"Υπηρεσίες προσβασιμότητας"</string>
+    <string name="no_accessibility_services_summary" msgid="694578333333808159">"Καμία εγκατεστημένη υπηρεσία προσβασιμότητας."</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Αυτή η υπηρεσία προσβασιμότητας ενδέχεται να έχει τη δυνατότητα συλλογής όλων των κειμένων που πληκτρολογείτε, συμπεριλαμβανομένων των προσωπικών δεδομένων και των αριθμών πιστωτικών καρτών εκτός των κωδικών πρόσβασης. Ενδέχεται επίσης να καταγράφει τις δραστηριότητες της επιφάνειας χρήστη. Αυτή η λειτουργία προέρχεται από την εφαρμογή <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Να χρησιμοποιηθεί αυτή η υπηρεσία προσβασιμότητας;"</string>
+    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Να απενεργοποιηθεί η προσβασιμότητα;"</string>
+    <string name="power_usage_summary_title" msgid="5180282911164282324">"Χρήση μπαταρίας"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"Τι χρησιμοποιούσε την μπαταρία"</string>
+    <string name="battery_since_unplugged" msgid="338073389740738437">"Χρήση μπαταρίας από τη στιγμή της αποσύνδεσης από την τροφοδοσία"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"Χρήση μπαταρίας από τη στιγμή της επαναφοράς"</string>
+    <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> από την αποσύνδεση"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <!-- no translation found for awake (387122265874485088) -->
-    <skip />
-    <!-- no translation found for wifi_on_time (4630925382578609056) -->
-    <skip />
-    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
-    <skip />
-    <!-- no translation found for usage_name_percent (1899151069711662289) -->
-    <skip />
-    <!-- no translation found for details_title (7564809986329021063) -->
-    <skip />
-    <!-- no translation found for details_subtitle (32593908269911734) -->
-    <skip />
-    <!-- no translation found for controls_subtitle (390468421138288702) -->
-    <skip />
-    <!-- no translation found for packages_subtitle (4736416171658062768) -->
-    <skip />
-    <!-- no translation found for power_screen (2353149143338929583) -->
-    <skip />
-    <!-- no translation found for power_wifi (2382791137776486974) -->
-    <skip />
-    <!-- no translation found for power_bluetooth (4373329044379008289) -->
-    <skip />
-    <!-- no translation found for power_cell (6596471490976003056) -->
-    <skip />
-    <!-- no translation found for power_phone (5392641106474567277) -->
-    <skip />
-    <!-- no translation found for power_idle (9055659695602194990) -->
-    <skip />
-    <!-- no translation found for usage_type_cpu (715162150698338714) -->
-    <skip />
-    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
-    <skip />
-    <!-- no translation found for usage_type_gps (7989688715128160790) -->
-    <skip />
-    <!-- no translation found for usage_type_phone (9108247984998041853) -->
-    <skip />
-    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
-    <skip />
-    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
-    <skip />
-    <!-- no translation found for usage_type_audio (6957269406840886290) -->
-    <skip />
-    <!-- no translation found for usage_type_video (4295357792078579944) -->
-    <skip />
-    <!-- no translation found for usage_type_on_time (3351200096173733159) -->
-    <skip />
-    <!-- no translation found for usage_type_no_coverage (3797004252954385053) -->
-    <skip />
-    <!-- no translation found for battery_action_stop (649958863744041872) -->
-    <skip />
-    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
-    <skip />
-    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
-    <skip />
-    <!-- no translation found for battery_action_display (5302763261448580102) -->
-    <skip />
-    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
-    <skip />
-    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
-    <skip />
-    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
-    <skip />
-    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
-    <skip />
-    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
-    <skip />
-    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
-    <skip />
-    <!-- no translation found for battery_desc_display (5432795282958076557) -->
-    <skip />
-    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
-    <skip />
-    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
-    <skip />
-    <!-- no translation found for battery_sugg_wifi (7542345142282261691) -->
-    <skip />
-    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
-    <skip />
-    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
-    <skip />
-    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
-    <skip />
-    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_gps (4145005297393800223) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
-    <skip />
-    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
-    <skip />
-    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
-    <skip />
-    <!-- no translation found for menu_stats_total (8973377864854807854) -->
-    <skip />
-    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
-    <skip />
-    <!-- no translation found for process_kernel_label (3916858646836739323) -->
-    <skip />
-    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
-    <skip />
-    <!-- no translation found for tts_settings (6454363854545277027) -->
-    <skip />
-    <!-- no translation found for tts_settings_summary (2627715231944602766) -->
-    <skip />
-    <!-- no translation found for tts_settings_title (5064947197040356736) -->
-    <skip />
-    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
-    <skip />
-    <!-- no translation found for use_default_tts_settings_summary (4253502106159206276) -->
-    <skip />
-    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
-    <skip />
-    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
-    <skip />
-    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
-    <skip />
-    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
-    <skip />
-    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
-    <skip />
-    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
-    <skip />
-    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
-    <skip />
-    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
-    <skip />
-    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
-    <skip />
-    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
-    <skip />
-    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
-    <skip />
-    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
-    <skip />
-    <!-- no translation found for tts_demo (405357591189935876) -->
-    <skip />
-    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
-    <skip />
-    <!-- no translation found for gadget_title (7455548605888590466) -->
-    <skip />
-    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
-    <skip />
-    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
-    <skip />
-    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
-    <skip />
-    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
-    <skip />
-    <!-- no translation found for vpn_a_username (6664733641993968692) -->
-    <skip />
-    <!-- no translation found for vpn_a_password (1537213632501483753) -->
-    <skip />
-    <!-- no translation found for vpn_save_username (1408415289165970790) -->
-    <skip />
-    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
-    <skip />
-    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
-    <skip />
-    <!-- no translation found for vpn_no_button (7620339571187119107) -->
-    <skip />
-    <!-- no translation found for vpn_back_button (192036339792734970) -->
-    <skip />
-    <!-- no translation found for vpn_mistake_button (1683383660912491270) -->
-    <skip />
-    <!-- no translation found for vpn_menu_done (93528279226907926) -->
-    <skip />
-    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
-    <skip />
-    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
-    <skip />
-    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
-    <skip />
-    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
-    <skip />
-    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
-    <skip />
-    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
-    <skip />
-    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
-    <skip />
-    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
-    <skip />
-    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
-    <skip />
-    <!-- no translation found for vpn_reconnect_from_lost (2442844155623372118) -->
-    <skip />
-    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
-    <skip />
-    <!-- no translation found for vpn_challenge_error_dialog_msg (6174901754230038601) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set_dialog_msg (8013052814131532765) -->
-    <skip />
-    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
-    <skip />
-    <!-- no translation found for vpn_remote_hung_up_error_dialog_msg (1566946015052633150) -->
-    <skip />
-    <!-- no translation found for vpn_type_title (6392933604218676224) -->
-    <skip />
-    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
-    <skip />
-    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
-    <skip />
-    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
-    <skip />
-    <!-- no translation found for vpns (3148141862835492816) -->
-    <skip />
-    <!-- no translation found for vpn_connecting (8039521381692090116) -->
-    <skip />
-    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
-    <skip />
-    <!-- no translation found for vpn_connected (7641723116362845781) -->
-    <skip />
-    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
-    <skip />
-    <!-- no translation found for vpn_name (1550918148476193076) -->
-    <skip />
-    <!-- no translation found for vpn_a_name (8445736942405283509) -->
-    <skip />
-    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
-    <skip />
-    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
-    <skip />
-    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
-    <skip />
-    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
-    <skip />
-    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
-    <skip />
-    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
-    <skip />
-    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
-    <skip />
-    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
-    <skip />
-    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
-    <skip />
-    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
-    <skip />
-    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
-    <skip />
-    <!-- no translation found for vpn_pptp_encryption_title (2236795167467896499) -->
-    <skip />
-    <!-- no translation found for vpn_pptp_encryption (2602329949737259686) -->
-    <skip />
-    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
-    <skip />
-    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
-    <skip />
-    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
-    <skip />
-    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
-    <skip />
-    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
-    <skip />
-    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
-    <skip />
-    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
-    <skip />
-    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
-    <skip />
-    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
-    <skip />
-    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
-    <skip />
-    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
-    <skip />
-    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
-    <skip />
-    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
-    <skip />
-    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
-    <skip />
-    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
-    <skip />
-    <!-- no translation found for vpn_secret_unchanged (8700613973594154529) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set (1037792636371641845) -->
-    <skip />
-    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
-    <skip />
-    <!-- no translation found for cstor_access_title (1739505390736236717) -->
-    <skip />
-    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
-    <skip />
-    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
-    <skip />
-    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
-    <skip />
-    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
-    <skip />
-    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
-    <skip />
-    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
-    <skip />
-    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
-    <skip />
-    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
-    <skip />
-    <!-- no translation found for cstor_credential_password (7187440553141199409) -->
-    <skip />
-    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
-    <skip />
-    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
-    <skip />
-    <!-- no translation found for cstor_old_password (979282118063084561) -->
-    <skip />
-    <!-- no translation found for cstor_new_password (6218562692435670047) -->
-    <skip />
-    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
-    <skip />
-    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
-    <skip />
-    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
-    <skip />
-    <!-- no translation found for cstor_password_error (2917326097260402464) -->
-    <skip />
-    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
-    <skip />
-    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
-    <skip />
-    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
-    <skip />
-    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
-    <skip />
-    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
-    <skip />
-    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
-    <skip />
-    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
-    <skip />
-    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
-    <skip />
-    <!-- no translation found for cstor_storage_error (7140697503172458161) -->
-    <skip />
-    <!-- no translation found for cstor_unable_to_save_cert (1631402544447196406) -->
-    <skip />
-    <!-- no translation found for cstor_cert_not_saved (6318149789449538491) -->
-    <skip />
-    <!-- no translation found for cstor_is_reset (449870501126790589) -->
-    <skip />
-    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
-    <skip />
-    <!-- no translation found for cstor_is_added (794788474010251572) -->
-    <skip />
-    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
-    <skip />
-    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <string name="awake" msgid="387122265874485088">"Χρόνος ενεργοποίησης της συσκευής"</string>
+    <string name="wifi_on_time" msgid="4630925382578609056">"Ώρα ενεργοποίησης WiFi"</string>
+    <string name="bluetooth_on_time" msgid="4478515071957280711">"Ώρα ενεργοποίησης WiFi"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
+    <string name="details_title" msgid="7564809986329021063">"Λεπτομέρειες από τη χρήση της μπαταρίας"</string>
+    <string name="details_subtitle" msgid="32593908269911734">"Λεπτομέρειες χρήσης"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"Προσαρμογή χρήσης ισχύος"</string>
+    <string name="packages_subtitle" msgid="4736416171658062768">"Συμπεριλαμβανόμενα πακέτα"</string>
+    <string name="power_screen" msgid="2353149143338929583">"Προβολή"</string>
+    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
+    <string name="power_cell" msgid="6596471490976003056">"Ετοιμότητα κυψέλης"</string>
+    <string name="power_phone" msgid="5392641106474567277">"Φωνητικές κλήσεις"</string>
+    <string name="power_idle" msgid="9055659695602194990">"Το τηλέφωνο είναι αδρανές"</string>
+    <string name="usage_type_cpu" msgid="715162150698338714">"Συνολικός χρόνος CPU"</string>
+    <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Προσκήνιο CPU"</string>
+    <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
+    <string name="usage_type_phone" msgid="9108247984998041853">"Τηλέφωνο"</string>
+    <string name="usage_type_data_send" msgid="2857401966985425427">"Τα δεδομένα εστάλησαν"</string>
+    <string name="usage_type_data_recv" msgid="7251090882025234185">"Τα δεδομένα ελήφθησαν"</string>
+    <string name="usage_type_audio" msgid="6957269406840886290">"Ήχος"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"Βίντεο"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"Η ώρα είναι ενεργοποιημένη"</string>
+    <string name="usage_type_no_coverage" msgid="3797004252954385053">"Ώρα κατά τη μη κάλυψη σήματος"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"Αναγκαστική διακοπή"</string>
+    <string name="battery_action_app_details" msgid="3275013531871113681">"Πληροφορίες εφαρμογής"</string>
+    <string name="battery_action_app_settings" msgid="350562653472577250">"Ρυθμίσεις εφαρμογών"</string>
+    <string name="battery_action_display" msgid="5302763261448580102">"Ρυθμίσεις προβολής"</string>
+    <string name="battery_action_wifi" msgid="5452076674659927993">"Ρυθμίσεις WiFi"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Ρυθμίσεις Bluetooth"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"Μπαταρία που χρησιμοποιείται από φωνητικές κλήσεις"</string>
+    <string name="battery_desc_standby" msgid="3009080001948091424">"Χρήση μπαταρίας όταν το τηλέφωνο είναι αδρανές"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"Μπαταρία που χρησιμοποιείται από πομπό κυψέλης"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"Μετάβαση στη λειτουργία πτήσης για εξοικονόμηση ενέργειας σε περιοχές που προσφέρουν κάλυψη κυψέλης"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"Μπαταρία που χρησιμοποιείται από την προβολή και το φωτισμό φόντου"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"Μείωση φωτεινότητας οθόνης και/ή χρονικού ορίου οθόνης"</string>
+    <string name="battery_desc_wifi" msgid="1702486494565080431">"Μπαταρία που χρησιμοποιείται από το Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="7542345142282261691">"Απενεργοποίηση του Wi-Fi όταν δεν χρησιμοποιείται ή όταν δεν είναι διαθέσιμο"</string>
+    <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Μπαταρία που χρησιμοποιείται από το Bluetooth"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Απενεργοποίηση του Bluetooth όταν δεν το χρησιμοποιείτε"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Δοκιμή σύνδεσης σε διαφορετική συσκευή bluetooth"</string>
+    <string name="battery_desc_apps" msgid="8123202939321333639">"Χρήση μπαταρίας κατά την εκτέλεση των εφαρμογών"</string>
+    <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Τερματισμός ή κατάργηση εγκατάστασης της εφαρμογής"</string>
+    <string name="battery_sugg_apps_gps" msgid="4145005297393800223">"Απενεργοποίηση του GPS όταν δεν χρησιμοποιείται"</string>
+    <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"Η εφαρμογή ενδέχεται να προσφέρει ρυθμίσεις που θα μειώσουν τη χρήση της μπαταρίας"</string>
+    <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> από την αποσύνδεση"</string>
+    <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Από την τελευταία αποσύνδεση για <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_total" msgid="8973377864854807854">"Συνολικές τιμές χρήσης"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"Ανανέωση"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"Λειτουργικό σύστημα Android"</string>
+    <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
+    <string name="tts_settings" msgid="3348626948015962987">"Κείμενο σε λόγο"</string>
+    <string name="tts_settings_summary" msgid="2627715231944602766">"Ορισμός επιλογών κειμένου σε λόγο"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Ρυθμίσεις κειμένου σε λόγο"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Χρήση των ρυθμίσεών μου πάντα"</string>
+    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Οι παρακάτω προεπιλεγμένες ρυθμίσεις αντιγράφουν τις ρυθμίσεις της εφαρμογής"</string>
+    <string name="tts_default_settings_section" msgid="5787915620218907443">"Προεπιλεγμένες ρυθμίσεις"</string>
+    <string name="tts_default_rate_title" msgid="6030550998379310088">"Ταχύτητα λόγου"</string>
+    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Ταχύτητα με την οποία εκφωνείται το κείμενο"</string>
+    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Τόνος"</string>
+    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Επηρεάζει τον τόνο του προφορικού κειμένου"</string>
+    <string name="tts_default_lang_title" msgid="8018087612299820556">"Γλώσσα"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Ορίζει τη φωνή που σχετίζεται με τη γλώσσα για το κείμενο ομιλίας"</string>
+    <string name="tts_play_example_title" msgid="7094780383253097230">"Ακούστε ένα παράδειγμα"</string>
+    <string name="tts_play_example_summary" msgid="8029071615047894486">"Αναπαραγωγή μιας σύντομης αναπαράστασης σύνθεσης λόγου"</string>
+    <string name="tts_install_data_title" msgid="4264378440508149986">"Εγκατάσταση δεδομένων φωνής"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"Εγκατάσταση δεδομένων ήχου που απαιτούνται για τη σύνθεση ήχου"</string>
+    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Οι φωνές που απαιτούνται για τη σύνθεση λόγου έχουν ήδη εγκατασταθεί σωστά"</string>
+    <string name="tts_demo" msgid="405357591189935876">"Αυτό είναι ένα παράδειγμα σύνθεσης λόγου."</string>
+    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Οι ρυθμίσεις σας άλλαξαν. Το παρόν είναι ένα παράδειγμα του ήχου τους."</string>
+    <string name="gadget_title" msgid="7455548605888590466">"Έλεγχος ισχύος"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Ενημέρωση ρύθμισης Wi-Fi"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ενημέρωση ρύθμισης Bluetooth"</string>
+    <string name="credential_installer_activity_title" msgid="7600661521831762521">"Πρόγραμμα εγκατάστασης διαπιστευτηρίων"</string>
+    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Ρυθμίσεις VPN"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"Σύνδεση στο <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpn_username_colon" msgid="7854930370861306247">"Όνομα χρήστη:"</string>
+    <string name="vpn_password_colon" msgid="5716278710848606626">"Κωδικός πρόσβασης:"</string>
+    <string name="vpn_a_username" msgid="6664733641993968692">"ένα όνομα χρήστη"</string>
+    <string name="vpn_a_password" msgid="1537213632501483753">"ένας κωδικός πρόσβασης"</string>
+    <string name="vpn_save_username" msgid="1408415289165970790">"Διατήρηση ονόματος χρήστη"</string>
+    <string name="vpn_connect_button" msgid="1699007212602470655">"Σύνδεση"</string>
+    <string name="vpn_yes_button" msgid="8034531001149843119">"Ναι"</string>
+    <string name="vpn_no_button" msgid="7620339571187119107">"Όχι"</string>
+    <string name="vpn_back_button" msgid="192036339792734970">"Πίσω"</string>
+    <string name="vpn_mistake_button" msgid="1683383660912491270">"Όχι"</string>
+    <string name="vpn_menu_done" msgid="93528279226907926">"Αποθήκευση"</string>
+    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Ακύρωση"</string>
+    <string name="vpn_menu_revert" msgid="4407762442281467659">"Επαναφορά"</string>
+    <string name="vpn_menu_connect" msgid="1089399414463784218">"Σύνδεση στο δίκτυο"</string>
+    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Αποσύνδεση από το δίκτυο"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Επεξεργασία δικτύου"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Διαγραφή δικτύου"</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Πρέπει να καταχωρίσετε <xliff:g id="CODE">%s</xliff:g>."</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Πρέπει να επιλέξετε <xliff:g id="OPTION">%s</xliff:g>."</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Το όνομα VPN \"<xliff:g id="NAME">%s</xliff:g>\" υπάρχει ήδη. Βρείτε άλλο όνομα."</string>
+    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το VPN;"</string>
+    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Είστε βέβαιοι ότι δεν θέλετε να δημιουργήσετε αυτό το προφίλ;"</string>
+    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Είστε βέβαιοι ότι θέλετε να απορρίψετε τις αλλαγές που πραγματοποιήθηκαν σε αυτό το προφίλ;"</string>
+    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Δεν είναι δυνατή η σύνδεση στο δίκτυο. Θέλετε να δοκιμάσετε ξανά;"</string>
+    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Η σύνδεση διακόπηκε. Θέλετε να συνδεθείτε ξανά;"</string>
+    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Δεν είναι δυνατή η επίλυση του ονόματος διακομιστή. Θέλετε να ελέγξετε τη ρύθμιση του ονόματος του διακομιστή σας;"</string>
+    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Σφάλμα πρόκλησης. Θέλετε να ελέγξετε τη μυστική ρυθμισή σας;"</string>
+    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Από αυτήν τη διαμόρφωση VPN απουσιάζει ένα ή περισσότερα μυστικά. Θέλετε να ελέγξετε τις μυστικές ρυθμίσεις σας;"</string>
+    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Το όνομα χρήστη ή ο κωδικός πρόσβασης που καταχωρίστηκε δεν είναι σωστός. Θέλετε να δοκιμάσετε ξανά;"</string>
+    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Αποκλεισμός από το διακομιστή. Το όνομα χρήστη ή ο κωδικός πρόσβασης που καταχωρίσατε ενδέχεται να είναι εσφαλμένα. Θέλετε να δοκιμάσετε ξανά;"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Διακόπηκε η σύνδεση με τον διακομιστή. Είναι πιθανό να βρίσκεστε πίσω από τείχος προστασίας που εμποδίζει τη σύνδεσή σας με τον διακομιστή. Θέλετε να δοκιμάσετε ξανά;"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Η διαπραγμάτευση διακομιστή απέτυχε. Ο διακομιστής μπορεί να μη δέχεται την επιλογή κρυπτογράφησής που έχετε κάνει. Θέλετε να ελέγξετε τη ρύθμιση κρυπτογράφησης;"</string>
+    <string name="vpn_type_title" msgid="6392933604218676224">"Προσθήκη VPN"</string>
+    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Προσθήκη VPN"</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Προσθήκη VPN <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Λεπτομέρειες <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpns" msgid="3148141862835492816">"VPN"</string>
+    <string name="vpn_connecting" msgid="8039521381692090116">"Σύνδεση..."</string>
+    <string name="vpn_disconnecting" msgid="7748050200708257066">"Αποσύνδεση..."</string>
+    <string name="vpn_connected" msgid="7641723116362845781">"Συνδεδεμένο"</string>
+    <string name="vpn_connect_hint" msgid="7442898962925875181">"Σύνδεση στο δίκτυο"</string>
+    <string name="vpn_name" msgid="1550918148476193076">"Όνομα VPN"</string>
+    <string name="vpn_a_name" msgid="8445736942405283509">"ένα όνομα VPN"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"Προστέθηκε το προφίλ \"<xliff:g id="NAME">%s</xliff:g>\""</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"Έγιναν οι αλλαγές στο προφίλ \"<xliff:g id="NAME">%s</xliff:g>\""</string>
+    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Ορισμός πιστοποιητικού χρήστη"</string>
+    <string name="vpn_user_certificate" msgid="949322691686938888">"Πιστοποιητικό χρήστη"</string>
+    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"ένα πιστοποιητικό χρήστη"</string>
+    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Ορισμός πιστοποιητικού CA"</string>
+    <string name="vpn_ca_certificate" msgid="465085144064264742">"Πιστοποιητικό αρχής έκδοσης πιστοποιητικών (CA)"</string>
+    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"Πιστοποιητικό CA"</string>
+    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Ορισμός μυστικού L2TP"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Μυστικό L2TP"</string>
+    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"ένα μυστικό L2TP"</string>
+    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"κρυπτογράφηση"</string>
+    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Κρυπτογράφηση PPTP"</string>
+    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Ορισμός ήδη κοινόχρηστου κλειδιού IPSec"</string>
+    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Ήδη κοινόχρηστο κλειδί IPSec"</string>
+    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"ένα ήδη κοινόχρηστο κλειδί IPSec"</string>
+    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Ορισμός διακομιστή VPN"</string>
+    <string name="vpn_vpn_server" msgid="1141754908824209260">"Διακομιστής VPN"</string>
+    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"ένας διακομιστής VPN"</string>
+    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Όνομα διακομιστή VPN"</string>
+    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Τομείς αναζήτησης DNS"</string>
+    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Τομείς αναζήτησης DNS"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"Ορίστηκε η τιμή <xliff:g id="VALUE">%s</xliff:g>"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"Η τιμή <xliff:g id="VALUE">%s</xliff:g> δεν ορίστηκε"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"Η τιμή <xliff:g id="VALUE">%s</xliff:g> δεν ορίστηκε (προαιρετικό)"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"Ενεργοποίηση <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"Απενεργοποίηση επιλογής <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"Η επιλογή <xliff:g id="OPTION">%s</xliff:g> είναι ενεργοποιημένη"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"Η επιλογή <xliff:g id="OPTION">%s</xliff:g> είναι απενεργοποιημένη"</string>
+    <string name="vpn_settings_title" msgid="7327468307909556719">"Ρυθμίσεις VPN"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"Εγκατάσταση και διαχείριση Εικονικών Ιδιωτικών Δικτύων (VPN)"</string>
+    <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(δεν έγινε αλλαγή)"</string>
+    <string name="vpn_secret_not_set" msgid="1037792636371641845">"(δεν ορίστηκε)"</string>
+    <string name="credentials_category" msgid="8536992056377271234">"Χώρος αποθήκευσης διαπιστευτηρίων"</string>
+    <string name="credentials_access" msgid="4843187230913860492">"Χρήση ασφαλών διαπιστευτηρίων"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"Να επιτρέπεται στις εφαρμογές η πρόσβαση σε ασφαλή πιστοποιητικά και άλλα διαπιστευτήρια"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"Εισαγωγή κωδικού πρόσβασης"</string>
+    <string name="credentials_unlock_hint" msgid="594679530407918031">"Εισαγάγετε τον κωδικό πρόσβασης του χώρου αποθήκευσης διαπιστευτηρίων."</string>
+    <string name="credentials_install_certificates" msgid="177337517568022236">"Εγκατάσταση από κάρτα SD"</string>
+    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Εγκατάσταση κρυπτογραφημένων πιστοποιητικών από την κάρτα SD"</string>
+    <string name="credentials_set_password" msgid="9104473585811899989">"Ορισμός κωδικού πρόσβασης"</string>
+    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Ορισμός ή αλλαγή κωδικού πρόσβασης χώρου αποθήκευσης διαπιστευτηρίων"</string>
+    <string name="credentials_reset" msgid="9170150870552453457">"Εκκαθάριση χώρου αποθήκευσης"</string>
+    <string name="credentials_reset_summary" msgid="1530388094693731636">"Εκκαθάριση χώρου αποθήκευσης διαπιστευτηρίων όλων των περιεχομένων και επαναφορά του κωδικού πρόσβασής του"</string>
+    <string name="credentials_reset_hint" msgid="819990295796804516">"Είστε βέβαιοι ότι θέλετε να διαγράψετε όλα τα διαπιστευτήρια και να επαναφέρετε τον κωδικό πρόσβασης του χώρου αποθήκευσης διαπιστευτηρίων;"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"Τρέχον κωδικός πρόσβασης:"</string>
+    <string name="credentials_new_password" msgid="267487774686796938">"Νέος κωδικός πρόσβασης:"</string>
+    <string name="credentials_confirm_password" msgid="4732250000633424345">"Επιβεβαίωση νέου κωδικού πρόσβασης:"</string>
+    <string name="credentials_first_time_hint" msgid="1567821077545346039">"Ορίστε έναν κωδικό πρόσβασης για την αποθήκευση των διαπιστευτηρίων (τουλάχιστον 8 χαρακτήρες)."</string>
+    <string name="credentials_wrong_password" msgid="7525192410790152041">"Εισαγάγετε το σωστό κωδικό πρόσβασης."</string>
+    <string name="credentials_reset_warning" msgid="6392481296673345268">"Εισαγάγετε το σωστό κωδικό πρόσβασης. Σας απομένει άλλη μία προσπάθεια για τη σωστή καταχώριση του κωδικού πρόσβασης πριν τη διαγραφή του χώρου αποθήκευσης διαπιστευτηρίων."</string>
+    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Εισαγάγετε το σωστό κωδικό πρόσβασης. Σας απομένουν ακόμη <xliff:g id="NUMBER">%1$d</xliff:g> προσπάθειες για τη σωστή καταχώριση του κωδικού πρόσβασης πριν τη διαγραφή του χώρου αποθήκευσης διαπιστευτηρίων."</string>
+    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Οι κωδικοί πρόσβασης δεν συμφωνούν."</string>
+    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Πρέπει να καταχωρίσετε και να επιβεβαιώσετε έναν κωδικό πρόσβασης."</string>
+    <string name="credentials_password_empty" msgid="8292138152983330473">"Εισαγάγετε τον κωδικό πρόσβασης."</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"Ο κωδικός πρόσβασης θα πρέπει να αποτελείται από τουλάχιστον 8 χαρακτήρες."</string>
+    <string name="credentials_erased" msgid="7700309135582200849">"Αυτός ο χώρος αποθήκευσης διαπιστευτηρίων διαγράφτηκε."</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"Ο χώρος αποθήκευσης διαπιστευτηρίων ενεργοποιήθηκε."</string>
+    <string name="credentials_disabled" msgid="7453188089059045380">"Ο χώρος αποθήκευσης διαπιστευτηρίων απενεργοποιήθηκε."</string>
+    <string name="emergency_tone_title" msgid="1055954530111587114">"Τόνος επείγουσας ανάγκης"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"Ορισμός συμπεριφοράς κατά την πραγματοποίηση κλήσης επείγουσας ανάγκης"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Απόρρητο"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Ρυθμίσεις απορρήτου"</string>
+    <string name="location_section_title" msgid="6072558684044939786">"Τοποθεσία"</string>
+    <string name="settings_section_title" msgid="7413252428447723032">"Ρυθμίσεις"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Προσωπικά δεδομένα"</string>
+    <string name="backup_settings_title" msgid="2968262658155327829">"Δημιουργία αντιγράφων ασφαλείας για τις ρυθμίσεις μου"</string>
+    <string name="backup_erase_dialog_title" msgid="6028429904055779443">"Αντίγραφο ασφαλείας ρυθμίσεων"</string>
+    <string name="backup_erase_dialog_message" msgid="9096433810456900531">"Είστε βέβαιοι ότι θέλετε να διακόψετε τη δημιουργία αντιγράφων ασφαλείας των ρυθμίσεών σας και να διαγράψετε όλα τα αντίγραφα από τους διακομιστές του Google;"</string>
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
     <skip />
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 8e965056e37..61337e5c039 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -24,38 +24,59 @@
     <item msgid="5345178126174698955">"Pacífico"</item>
     <item msgid="8392017019801393511">"Todos"</item>
   </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"No hay animaciones"</item>
+    <item msgid="6291186755504776720">"Algunas animaciones"</item>
+    <item msgid="3856065399819979491">"Todas las animaciones"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"No se muestran animaciones de ventana"</item>
+    <item msgid="4460915688877708508">"Se muestran algunas animaciones de ventana"</item>
+    <item msgid="488968798204105119">"Se muestran todas las animaciones de ventana"</item>
+  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 segundos"</item>
     <item msgid="8881760709354815449">"30 segundos"</item>
     <item msgid="7589406073232279088">"1 minuto"</item>
     <item msgid="7001195990902244174">"2 minutos"</item>
     <item msgid="5721688686241190620">"10 minutos"</item>
-    <item msgid="1781492122915870416">"Nunca se debe agotar el tiempo de espera"</item>
+    <item msgid="7156442995039264948">"30 minutos"</item>
+  </string-array>
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Muy lento"</item>
+    <item msgid="2361722960903353554">"Lento"</item>
+    <item msgid="1145554631248513562">"Normal"</item>
+    <item msgid="7553665153391107454">"Rápido"</item>
+    <item msgid="2538100882620724753">"Muy rápido"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item msgid="7526050907652687351">"Muy bajo"</item>
+    <item msgid="2692137425242433765">"Bajo"</item>
+    <item msgid="3332408460740717754">"Normal"</item>
+    <item msgid="4907380534957572531">"Alta"</item>
+    <item msgid="4699640516390840297">"Muy alto"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item msgid="478030717868306353">"Inglés americano"</item>
+    <item msgid="5192284521396794598">"Inglés británico"</item>
+    <item msgid="3000262452051711991">"Francés"</item>
+    <item msgid="9214080387341763401">"Alemán"</item>
+    <item msgid="5972100016440094433">"Italiano"</item>
+    <item msgid="5811378076054402537">"Español"</item>
+  </string-array>
+  <string-array name="wifi_security_entries">
+    <item msgid="2923732046112398627">"Automáticamente"</item>
+    <item msgid="5434666299123318296">"Ninguno"</item>
+    <item msgid="3159594845889645948">"WEP"</item>
+    <item msgid="1687348101566181433">"WPA/WPA2 PSK"</item>
+    <item msgid="329777238762866787">"Empresa 802.1x"</item>
+  </string-array>
+  <string-array name="wifi_security_without_auto_entries">
+    <item msgid="4402120432904877907">"Ninguno"</item>
+    <item msgid="2329148995431627488">"WEP"</item>
+    <item msgid="6903317668294332381">"WPA/WPA2 PSK"</item>
+    <item msgid="7280821339307729710">"Empresa 802.1x"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
-    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
-    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
-    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
-    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
-    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
-    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
-    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
-    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
-    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
-    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
-    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
-    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
-    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
-    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
-    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
-    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
-    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
-    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
-    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
-    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
-    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
-    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
-    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
   <string-array name="wifi_wep_type">
     <item msgid="1497433962958697183">"Automáticamente"</item>
     <item msgid="7182335713815377158">"WEP ASCII"</item>
@@ -84,15 +105,27 @@
     <item msgid="1908750532762193304">"Lanzar recuento"</item>
     <item msgid="1213951670006606353">"Nombre de la aplicación"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
-    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
-    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
-    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
-    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
-    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
-    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
-    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
-    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
-    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
-    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="1818786254010764570">"Ninguno"</item>
+    <item msgid="6189918678874123056">"PAP"</item>
+    <item msgid="1524112260493662517">"MSCHAP"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
+    <item msgid="8651992560135239389">"GTC"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Apagado"</item>
+    <item msgid="3165868966179561687">"Alerta"</item>
+    <item msgid="6038758039030476855">"Vibrar"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"Ninguno"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP o CHAP"</item>
+  </string-array>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1f1e9f4db99..e8b696bd01d 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -15,6 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"Sí"</string>
+    <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Encender la radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Apagar la radio"</string>
@@ -56,6 +58,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"Aceptar"</string>
     <string name="sdcard_setting" msgid="5922637503871474866">"Tarjeta SD"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Estado de batería:"</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"Enchufe:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Escala de batería:"</string>
     <string name="battery_info_level_label" msgid="8706526709307788737">"Nivel de la batería:"</string>
     <string name="battery_info_health_label" msgid="6416051542741886958">"Estado de la batería:"</string>
@@ -75,6 +78,11 @@
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"Descargando"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"No se realiza la carga"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Total"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Desconectado"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"CA+USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"Desconocido"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Desconocido"</string>
     <string name="battery_info_health_good" msgid="8070356565806711806">"Bueno"</string>
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"Recalentar"</string>
@@ -104,14 +112,19 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Solicitud de vinculación de Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Vinculando solicitud"</string>
     <string name="bluetooth_notif_message" msgid="5381418499788668724">"Seleccionar para vincularse con "</string>
+    <string name="device_picker" msgid="8721012448931226323">"Selector de dispositivo Bluetooth"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitud de permiso de Bluetooth"</string>
+    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Una aplicación de tu teléfono solicita permiso para activar Bluetooth. ¿Deseas activarlo?"</string>
+    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Una aplicación de tu teléfono solicita permiso para hacer que tu teléfono pueda ser detectable por otros dispositivos de Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Deseas activarlo?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Una aplicación de tu teléfono solicita permiso para activar Bluetooth y hacer que tu teléfono pueda ser detectable por otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Deseas activarlo?"</string>
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Activando Bluetooth…"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Configuración de fecha y hora"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 p. m."</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
     <string name="date_time_changeTime_text" msgid="7037437020000867740">"Cambiar hora"</string>
     <string name="date_time_changeDate_text" msgid="5259762626498028057">"Fecha"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Seleccionar zona horaria"</string>
-    <!-- no translation found for normal_date_format (1982904221918374153) -->
-    <skip />
+    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Vista previa:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Tamaño de fuente:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -192,33 +205,23 @@
     <string name="proxy_settings_label" msgid="3271174136184391743">"Configuración de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
     <string name="settings_label" msgid="1626402585530130914">"Configuración"</string>
-    <!-- no translation found for settings_shortcut (3672145147925639262) -->
-    <skip />
+    <string name="settings_shortcut" msgid="3672145147925639262">"Configurac."</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modo avión"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Desactivar todas las conexiones inalámbricas"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Desactivando conexiones inalámbricas…"</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Activando conexiones inalámbricas…"</string>
-    <string name="radio_controls_title" msgid="8356991079873437337">"Controles de tel. inalám."</string>
-    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
-    <skip />
-    <!-- no translation found for roaming (3596055926335478572) -->
-    <skip />
-    <!-- no translation found for roaming_enable (3737380951525303961) -->
-    <skip />
-    <!-- no translation found for roaming_disable (1295279574370898378) -->
-    <skip />
-    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
-    <skip />
-    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
-    <skip />
-    <!-- no translation found for roaming_warning (1269870211689178511) -->
-    <skip />
-    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
-    <skip />
-    <!-- no translation found for networks (6333316876545927039) -->
-    <skip />
-    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
-    <skip />
+    <string name="radio_controls_title" msgid="5868688473587168882">"Redes &amp; inalámbricas"</string>
+    <string name="wireless_networks_settings_title" msgid="149274247949769551">"Configuración inalámbrica y de red"</string>
+    <string name="radio_controls_summary" msgid="2998818677094465517">"Administrar Wi-Fi, Bluetooth, modo de avión, redes, móviles, &amp; VPN"</string>
+    <string name="roaming" msgid="3596055926335478572">"Roaming de datos"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Conectarse a servicios de datos en el roaming"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Conectarse a servicios de datos en el roaming"</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"Has perdido la conectividad de los datos porque has dejado la red doméstica con roaming de datos desactivado."</string>
+    <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Enciéndelo"</string>
+    <string name="roaming_warning" msgid="1269870211689178511">"¿Deseas permitir el roaming de datos? Ten en cuenta que podrás incurrir en gastos significativos."</string>
+    <string name="roaming_reenable_title" msgid="7626425894611573131">"Atención"</string>
+    <string name="networks" msgid="6333316876545927039">"Selección de operador"</string>
+    <string name="sum_carrier_select" msgid="6648929373316748020">"Seleccionar un operador de red"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Fecha y hora"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Establecer fecha, hora, zona horaria y formatos"</string>
     <string name="date_time_auto" msgid="3086083265745944725">"Automático"</string>
@@ -231,25 +234,31 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Selecc. el formato de fecha"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenar alfabéticamente"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por zona horaria"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"Seguridad y ubicación"</string>
-    <!-- no translation found for security_settings_summary (967393342537986570) -->
-    <skip />
+    <string name="security_settings_title" msgid="5168491784222013179">"Seguridad de la &amp; ubicación"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"Configuración de ubicación y seguridad"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de la tarjeta SIM, bloqueo de almacenamiento de la credencial"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de almacenamiento de credencial"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contraseñas"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activar Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Configuración de Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Config. de Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Administrar conexiones, establecer nombre y detección del dispositivo"</string>
-    <string name="bluetooth_pin_entry" msgid="5627349871303455279">"Solicitud de vinculación de Bluetooth"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Solicitud de vinculación de Bluetooth"</string>
     <string name="bluetooth_device_info" msgid="6644515376523965073">"Información del dispositivo Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="7551139612735632370">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Escribe el PIN para poder vincular."\n"(prueba con 0000 ó 1234)."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Escribe el PIN para poder vincular con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (prueba con 0000 ó 1234)."</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Escribe la llave maestra para vincular con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Para vincular con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", confirma que muestra la llave maestra: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"desea vincularse."</string>
+    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Ingresa <xliff:g id="PASSKEY">%2$s</xliff:g> en \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" para vincular."</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Vincular"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"No vincular"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"dispositivo bluetooth"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Atención"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Se ha producido un problema al vincular con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="6938408362011024289">"Se ha producido un problema al vincular <xliff:g id="DEVICE_NAME">%1$s</xliff:g> debido a que el PIN que has escrito es incorrecto."</string>
-    <!-- no translation found for bluetooth_pairing_device_down_error_message (6688215193824686741) -->
-    <skip />
-    <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
-    <skip />
+    <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Se ha producido un problema al vincular con <xliff:g id="DEVICE_NAME">%1$s</xliff:g> debido a que el PIN o la llave maestra es incorrecta."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"No es posible establecer la comunicación con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Vínculo rechazado por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Se ha producido un problema al conectarse con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Explorar dispositivos"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Conectar"</string>
@@ -261,6 +270,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectar a..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Medios"</string>
     <string name="bluetooth_profile_headset" msgid="1874975688666658946">"Teléfono"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Transferir"</string>
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Conectado al audio de medios"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Conectado al audio del teléfono"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Conectado al audio del teléfono y los medios"</string>
@@ -270,8 +280,11 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Perfiles"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado al audio de medios"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado al audio del teléfono"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado al servidor de transferencia de archivo"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"No conectado al servidor de transferencia de archivo"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilizar para el audio de medios"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilizar para el audio del teléfono"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilizar para la transferencia de archivos"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Encender Wi-Fi"</string>
@@ -288,25 +301,13 @@
     <string name="security" msgid="1040691896987225267">"Seguridad"</string>
     <string name="wifi_security_open" msgid="3513305614048816607">"Abrir"</string>
     <string name="wifi_security_wep" msgid="7082604129842065776">"WEP"</string>
-    <string name="wifi_security_wpa" msgid="8980169410565477162">"WPA"</string>
-    <string name="wifi_security_wpa2" msgid="5780665935088930524">"WPA2"</string>
-    <!-- no translation found for wifi_security_wpa_eap (7485687331651751101) -->
-    <skip />
-    <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
-    <skip />
+    <string name="wifi_security_psk" msgid="3392399380570381452">"WPA/WPA2 PSK"</string>
+    <string name="wifi_security_eap" msgid="8309434150934969132">"Empresa(802.1x)"</string>
     <string name="wifi_security_unknown" msgid="4564208312073060668">"Desconocido"</string>
-    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
-    <skip />
+    <string name="wifi_security_verbose_open" msgid="8117878112088901945">"abrir red"</string>
+    <string name="wifi_security_verbose_wep" msgid="9220757688700421508">"asegurado con WEP"</string>
+    <string name="wifi_security_verbose_psk" msgid="1110130025330416225">"asegurado con WPA/WPA2 PSK"</string>
+    <string name="wifi_security_verbose_eap" msgid="586632662086063">"asegurado con 802.1x EAP"</string>
     <string name="ip_address" msgid="850672263358989449">"Dirección IP"</string>
     <string name="signal" msgid="1947969631626413228">"Potencia de la señal"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"Encendiendo..."</string>
@@ -319,28 +320,19 @@
     <string name="error_saving" msgid="8294279443961615302">"No se ha podido guardar la red"</string>
     <string name="connect" msgid="3079076576295839400">"Conectar"</string>
     <string name="connect_to_blank" msgid="6950910074058025378">"Conectar a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for please_select_eap (4488240331626456338) -->
-    <skip />
-    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
-    <skip />
-    <!-- no translation found for please_type_identity (7061261155499513089) -->
-    <skip />
-    <!-- no translation found for please_type_anonymous_identity (835061562079965048) -->
-    <skip />
-    <!-- no translation found for please_select_client_certificate (2137906961594663234) -->
-    <skip />
-    <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
-    <skip />
-    <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
-    <skip />
+    <string name="please_select_eap" msgid="4488240331626456338">"Método de EAP"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Autenticación de fase 2"</string>
+    <string name="please_type_identity" msgid="7061261155499513089">"Identidad"</string>
+    <string name="please_type_anonymous_identity" msgid="835061562079965048">"Identidad anónima"</string>
+    <string name="please_select_client_certificate" msgid="2137906961594663234">"Certificado de cliente"</string>
+    <string name="please_select_ca_certificate" msgid="5010815181914420677">"Certificado de CA"</string>
     <string name="please_type_passphrase" msgid="8256017704131522462">"Contraseña de teléfono inalámbrico"</string>
     <string name="please_type_hex_key" msgid="8751224390407867551">"Clave hexadecimal WEP (0-9, A-F)"</string>
     <string name="wifi_show_password" msgid="4235237470701732009">"Mostrar contraseña."</string>
     <string name="scan_wifi" msgid="2459901725350542606">"Explorar"</string>
     <string name="summary_not_in_range" msgid="3926674700733548684">"Fuera del alcance"</string>
-    <!-- no translation found for summary_remembered (6079941090549401742) -->
-    <skip />
-    <string name="summary_connection_failed" msgid="7610394657613410489">"La conexión no se ha realizado correctamente, selecciona para volver a intentarlo"</string>
+    <string name="summary_remembered" msgid="6079941090549401742">"recordado"</string>
+    <string name="summary_connection_failed" msgid="2351885658101671413">"La conexión no se ha realizado correctamente, toca para volver a intentarlo"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes de Wi-Fi"</string>
     <string name="wifi_type_ssid" msgid="1326839657083292017">"SSID de red"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguridad"</string>
@@ -391,6 +383,7 @@
     <string name="status_disconnected" msgid="7561688569905126046">"Desconectado"</string>
     <string name="status_failed" msgid="610462050405904601">"Incorrecto"</string>
     <string name="sound_and_display_settings" msgid="349770582993029003">"Sonido y visualización"</string>
+    <string name="sound_and_display_settings_title" msgid="5036144539683697330">"Configuración de sonido y visualización"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Configuración de sonido"</string>
     <string name="sound_and_display_settings_summary" msgid="1433943789593286064">"Establecer tonos de llamada, notificaciones, brillo de pantalla"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Modo silencioso"</string>
@@ -416,17 +409,16 @@
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"Selección audible"</string>
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Reproducir el sonido al realizar la selección de pantalla"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Reproducir el sonido al realizar la selección de pantalla"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Comentarios hápticos"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrar al presionar teclas programables y ciertas interacciones de interfaz de usuario"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrar al presionar teclas programables y ciertas interacciones de interfaz de usuario"</string>
     <string name="play_media_notification_sounds_enable_title" msgid="1008791464029179529">"Notificac. de tarjeta SD"</string>
-    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
-    <skip />
-    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
-    <skip />
-    <string name="sync_settings" msgid="2212736205476453234">"Sincronización de datos"</string>
-    <string name="sync_settings_summary" msgid="6480534906375217074">"Seleccionar las aplicaciones que se sincronizan"</string>
-    <!-- no translation found for search_settings (1910951467596035063) -->
-    <skip />
-    <!-- no translation found for search_settings_summary (9205656546570654169) -->
-    <skip />
+    <string name="play_media_notification_sounds_enable_summary_on" msgid="7675466959375667370">"Reproducir el sonido para los avisos de la tarjeta SD"</string>
+    <string name="play_media_notification_sounds_enable_summary_off" msgid="8672617597028744693">"Reproducir el sonido para los avisos de la tarjeta SD"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Cuentas y sincronización"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"Agregar o eliminar cuentas, y cambiar la configuración de la cuenta"</string>
+    <string name="search_settings" msgid="1910951467596035063">"Buscar"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Administrar la configuración y el historial de búsqueda"</string>
     <string name="display_settings" msgid="3912042046350078328">"Configuración de visualización"</string>
     <string name="animations_title" msgid="1062189037402346023">"Animación"</string>
     <string name="animations_summary_on" msgid="8843613112130484436">"Mostrar animación al abrir y cerrar ventanas"</string>
@@ -438,6 +430,7 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar el brillo de la pantalla"</string>
     <string name="screen_timeout" msgid="4882669461447531301">"Tiempo de espera de la pant."</string>
     <string name="screen_timeout_summary" msgid="2905757633140605334">"Ajustar el tiempo de demora para que la pantalla se apague automáticamente"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Configuración de bloqueo de la tarjeta SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Conf. bloqueo de tarj. SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueo de la tarjeta SIM"</string>
@@ -470,18 +463,14 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"No disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
     <string name="device_status" msgid="607405385799807324">"Estado"</string>
-    <!-- no translation found for device_status_summary (2599162787451519618) -->
-    <skip />
-    <string name="storage_settings_title" msgid="8461515684514801302">"Tarjeta SD y almac. del tel."</string>
+    <string name="device_status_summary" msgid="2599162787451519618">"número de teléfono, señal, etc."</string>
+    <string name="storage_settings" msgid="6681164315506788024">"Tarjeta SD y almacenamiento del teléfono"</string>
+    <string name="storage_settings_title" msgid="5379463509034022773">"Configuración de la tarjeta SD y del almacenamiento del teléfono"</string>
     <string name="storage_settings_summary" msgid="9176693537325988610">"Desmontar tarjeta SD, ver espacio de almacenamiento disponible"</string>
-    <!-- no translation found for status_number (5123197324870153205) -->
-    <skip />
-    <!-- no translation found for status_min_number (3519504522179420597) -->
-    <skip />
-    <!-- no translation found for status_prl_version (8499039751817386529) -->
-    <skip />
-    <!-- no translation found for status_meid_number (1751442889111731088) -->
-    <skip />
+    <string name="status_number" msgid="5123197324870153205">"Mi número de teléfono"</string>
+    <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_prl_version" msgid="8499039751817386529">"Versión de PRL"</string>
+    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Tipo de red de celulares"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Estado de red de celulares"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Estado del servicio"</string>
@@ -520,6 +509,11 @@
     <string name="apn_mms_port" msgid="4074188088199243040">"Puerto MMS"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"Tipo de autenticación"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Ninguno"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP o CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Tipo de APN"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Eliminar APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN nuevo"</string>
@@ -535,11 +529,9 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Restablecimiento completado de configuración de APN predeterminada"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restablecim. de los datos de fábrica"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Borra todos los datos del teléfono"</string>
-    <!-- no translation found for master_clear_desc (7823268823499739178) -->
-    <skip />
+    <string name="master_clear_desc" msgid="7823268823499739178">"Todos los datos de tu teléfono serán eliminados, incluidos:"\n<li>"tu cuenta de Google"</li>\n<li>"la configuración y los datos de la aplicación y el sistema"</li>\n<li>"las aplicaciones descargadas"</li>\n"No se eliminarán:"\n<li>"el software del sistema actual y las aplicaciones en lote"</li>\n<li>"archivos de tarjeta SD, como por ejemplo, música o fotos"</li></string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Restablecer el teléfono"</string>
-    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
-    <skip />
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"¿Deseas borrar toda tu información personal y cualquier aplicación descargada?"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Borrar todo"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Extrae tu patrón de desbloqueo"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Debes extraer tu patrón de desbloqueo para confirmar el restablecimiento de un teléfono."</string>
@@ -556,20 +548,19 @@
     <string name="call_settings_summary" msgid="7291195704801002886">"Establecer correo de voz, desvío de llamadas, llamada en espera, identificador de llamadas"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes de celulares"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Establecer opciones para roaming, redes, APN"</string>
-    <!-- no translation found for location_title (1029961368397484576) -->
-    <skip />
+    <string name="location_title" msgid="1029961368397484576">"Mi ubicación"</string>
     <string name="location_network_based" msgid="8815705866861993344">"Utilizar redes inalám."</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Ver ubicación en las aplicaciones (como Mapas) mediante redes inalámbricas"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Ubicación determinada por Wi-Fi o redes de celulares"</string>
-    <string name="location_gps" msgid="375912731641377120">"Activar satélites de GPS"</string>
-    <string name="location_street_level" msgid="5899941752252356344">"Localiz. con una precisión del nivel de calle (deselecc. para conservar la batería)"</string>
+    <string name="location_gps" msgid="6296125378829097831">"Utilizar satélites de GPS"</string>
+    <string name="location_street_level" msgid="6460740847018275745">"Localizar con una precisión del nivel de calle (anular la selección para ahorrar batería)"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Localiz. a nivel de calle (nec. más batería además de la vista del cielo)"</string>
-    <!-- no translation found for use_location_title (7585990952633568732) -->
-    <skip />
-    <!-- no translation found for use_location_summary (4411467143899877395) -->
-    <skip />
-    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
-    <skip />
+    <string name="assisted_gps" msgid="4649317129586736885">"Utilizar GPS asistido"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizar el servidor para asistir el GPS (anular la selección para reducir el uso de la red)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizar el servidor para asistir el GPS (anula la selección para mejorar el rendimiento del GPS)"</string>
+    <string name="use_location_title" msgid="5447030582538504247">"Utilizar Mi ubicación"</string>
+    <string name="use_location_summary" msgid="1816849484040070431">"Utilizar Mi ubicación para los resultados de búsqueda de Google y otros servicios de Google"</string>
+    <string name="use_location_warning_message" msgid="1420184860518262439">"¿Deseas permitir que Google utilice la ubicación para los resultados de búsqueda mejorada y otros servicios?"</string>
     <string name="agree" msgid="6288718671527758326">"Acepto"</string>
     <string name="disagree" msgid="6221069272309799230">"No acepto"</string>
     <string name="about_settings" msgid="1743378368185371685">"Acerca del teléfono"</string>
@@ -579,12 +570,15 @@
     <string name="copyright_title" msgid="865906688917260647">"Derechos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Términos y condiciones"</string>
-    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
-    <skip />
+    <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Tutorial del sistema"</string>
     <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Aprende cómo utilizar tu teléfono"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Abrir licencias de origen"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Hay un problema para cargar las licencias."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Cargando…"</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Información de seguridad"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Información de seguridad"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Tu teléfono no está conectado al servicio de datos. Para ver esta información ahora, visita %s desde cualquier computadora conectada a Internet."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Cargando…"</string>
     <string name="lock_settings_title" msgid="5828348303971852121">"Patrón de desbloqueo de la pantalla"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Cambiar patrón de desbloqueo"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmar el patrón guardado"</string>
@@ -613,9 +607,9 @@
     <string name="skip_button_label" msgid="8680422740354436943">"Cancelar"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Siguiente"</string>
     <string name="lock_title" msgid="4059246467204273930">"Asegurando tu teléfono"</string>
-    <string name="lock_intro_message" msgid="5352897389718432077"><font size="17">"Protege a tu teléfono de usos no autorizados al crear un patrón de desbloqueo en la pantalla personal. "\n<font height="17">\n</font><b>"1"</b>"  En la pantalla siguiente, observa cómo se extrae un patrón de ejemplo. "\n<font height="17">\n</font><b>"2"</b>"  Cuando estés listo, extrae tu propio patrón de desbloqueo personal. Experimenta con diferentes patrones pero conecta al menos cuatro puntos. "\n<font height="17">\n</font><b>"3"</b>"  Revisa tu patrón para confirmar. "\n<font height="17">\n</font><b>"¿Estás listo para comenzar? Selecciona \"Siguiente\""</b>". "\n<font height="3">\n</font>"Si deseas dejar sin protección a tu teléfono, selecciona \"Cancelar\"."</font></string>
+    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Protege a tu teléfono de usos no autorizados al crear un patrón de desbloqueo en la pantalla personal. "\n<font height="17">\n</font><b>"1"</b>"  En la pantalla siguiente, observa cómo se extrae un patrón de ejemplo. "\n<font height="17">\n</font><b>"2"</b>"  Cuando estés listo, extrae tu propio patrón de desbloqueo personal. Experimenta con diferentes patrones pero conecta al menos cuatro puntos. "\n<font height="17">\n</font><b>"3"</b>"  Revisa tu patrón para confirmar. "\n<font height="17">\n</font><b>"¿Estás listo para comenzar? Toca \"Siguiente\""</b>". "\n<font height="3">\n</font>"Si deseas dejar sin protección a tu teléfono, toca \"Cancelar\"."</font></string>
     <string name="lock_example_title" msgid="8052305554017485410">"Patrón de ejemplo"</string>
-    <string name="lock_example_message" msgid="7431982730914254881">"Conecta al menos cuatro puntos."\n" "\n"Selecciona \"Siguiente\" cuando estés listo para extraer tu propio patrón."</string>
+    <string name="lock_example_message" msgid="1838650097090632706">"Conecta al menos cuatro puntos."\n" "\n"Toca \"Siguiente\" cuando estés listo para extraer tu propio patrón."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Administrar aplicaciones"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Administrar y eliminar aplicaciones instaladas"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Aplicaciones"</string>
@@ -638,8 +632,7 @@
     <string name="data_size_label" msgid="8679376373625710107">"Datos"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstalar..."</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Borrar datos"</string>
-    <!-- no translation found for app_factory_reset (6635744722502563022) -->
-    <skip />
+    <string name="app_factory_reset" msgid="6635744722502563022">"Desinstalar las actualizaciones"</string>
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Has elegido lanzar esta aplicación de manera predeterminada para algunas acciones."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"No hay configuraciones predeterminadas establecidas."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Borrar configuraciones predeterminadas"</string>
@@ -650,32 +643,41 @@
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Seleccionar opciones de filtro"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Todos"</string>
-    <string name="filter_apps_third_party" msgid="1096017647285183437">"Tercero"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Descargado"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"En ejecución"</string>
     <string name="loading" msgid="3200408047793887917">"Cargando…"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Recalculando el tamaño…"</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Eliminar"</string>
-    <string name="clear_data_dlg_text" msgid="8796694785488630642">"Toda la información que has guardado en esta aplicación se eliminará de manera permanente."</string>
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"Todos los datos de esta aplicación se suprimirán de forma permanente. Esto incluye todos los archivos, las configuraciones, las cuentas, las bases de datos, etc."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"Aceptar"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Cancelar"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"No se ha encontrado la aplicación"</string>
     <string name="app_not_found_dlg_text" msgid="2980271680333341554">"No se ha encontrado la aplicación en la lista de aplicaciones instaladas."</string>
     <string name="clear_data_failed" msgid="581956197586913865">"No se han podido borrar los datos de la aplicación."</string>
-    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
-    <skip />
-    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
-    <skip />
-    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
-    <skip />
-    <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
-    <skip />
+    <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Desinstalar las actualizaciones"</string>
+    <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"¿Deseas desinstalar todas las actualizaciones a esta aplicación del sistema Android?"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Borrar datos"</string>
+    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Error al borrar los datos de la aplicación"</string>
     <string name="security_settings_desc" msgid="3116027624526915561">"Esta aplicación puede acceder a lo siguiente en tu teléfono:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Calculando..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"No se ha podido calcular el tamaño del paquete"</string>
-    <string name="empty_list_msg" msgid="1883660401486953588">"No tienes instalada ninguna aplicación de terceros."</string>
-    <!-- no translation found for version_text (9189073826278676425) -->
-    <skip />
-    <string name="language_settings" msgid="2939555761536357092">"País y texto"</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"No tienes instalada ninguna aplicación de terceros."</string>
+    <string name="version_text" msgid="9189073826278676425">"versión <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicios en ejecución"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Ver y controlar servicios actuales en ejecución"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"Volver a comenzar"</string>
+    <string name="no_running_services" msgid="6981216347270280598">"Sin servicios en ejecución"</string>
+    <string name="confirm_stop_service" msgid="5700448757318301681">"¿Deseas detener el servicio?"</string>
+    <string name="confirm_stop_service_msg" msgid="1202118456282395730">"El servicio no ejecutará más hasta que comience de nuevo. Esto puede tener consecuencias no deseadas en la aplicación <xliff:g id="APPLICATION">%1$s</xliff:g>."</string>
+    <string name="confirm_stop_stop" msgid="7382363913280993331">"Detener"</string>
+    <string name="confirm_stop_cancel" msgid="206495326622692381">"Cancelar"</string>
+    <string name="service_started_by_app" msgid="8432097226392386802">"Comenzado por aplicación: tocar para detener"</string>
+    <string name="service_client_name" msgid="2337664610975074717">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: tocar para administrar"</string>
+    <string name="service_background_processes" msgid="5158600475629177758">"Disp.:<xliff:g id="FREE">%2$s</xliff:g>+<xliff:g id="MEMORY">%3$s</xliff:g> en <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_foreground_processes" msgid="4013890350284680796">"Otro: <xliff:g id="MEMORY">%2$s</xliff:g> en <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_process_name" msgid="8630408984456958400">"Proceso: <xliff:g id="PROCESS">%1$s</xliff:g>"</string>
+    <string name="language_settings" msgid="502219872342167227">"Idioma &amp; del teclado"</string>
+    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Idioma y Configuración del teclado"</string>
     <string name="language_settings_summary" msgid="595647729475399987">"Establecer opciones de país (idioma y región), ingreso de texto y corrección automática"</string>
     <string name="language_category" msgid="3391756582724541530">"Configuración de país"</string>
     <string name="text_category" msgid="6342540511465136739">"Configuración de texto"</string>
@@ -690,7 +692,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Presionar la tecla de espacio dos veces para insertar \".\""</string>
     <string name="show_password" msgid="2198798062604049206">"Contraseñas visibles"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Mostrar contraseña mientras escribe"</string>
-    <string name="ime_security_warning" msgid="3458652708716006477">"El método de entrada puede recopilar todo el texto que escribas, incluidos los datos personales como contraseñas y números de tarjetas de crédito. Proviene de la aplicación <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. ¿Deseas activar este método de entrada?"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"El método de entrada puede recopilar todo el texto que escribas, incluidos los datos personales como contraseñas y números de tarjetas de crédito. Proviene de la aplicación <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. ¿Deseas utilizar este método de entrada?"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diccionario del usuario"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"Diccionario del usuario"</string>
     <string name="user_dict_settings_summary" msgid="2460427065601355471">"Agregar y eliminar palabras del diccionario del usuario"</string>
@@ -718,7 +720,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Ingreso de texto"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Administrar opciones de ingreso de texto"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Configuración de <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="4919680715154885028">"Configuración de teclado en la pantalla"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Configuración del teclado en pantalla"</string>
     <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Teclado del dispositivo"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Configuración de teclado integrado"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Desarrollo"</string>
@@ -729,13 +731,11 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla nunca quedará inactiva mientras se realiza la carga"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permitir ubicac. de prueba"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir la creación de ubicaciones de prueba"</string>
-    <!-- no translation found for adb_warning_title (1756027479229533250) -->
-    <skip />
-    <!-- no translation found for adb_warning_message (5352555112049663033) -->
-    <skip />
+    <string name="adb_warning_title" msgid="6234463310896563253">"¿Permite la depuración de USB?"</string>
+    <string name="adb_warning_message" msgid="5352555112049663033">"La depuración de USB está prevista sólo con fines de desarrollo. Se puede utilizar para copiar datos entre tu computadora y tu dispositivo, instalar aplicaciones en tu dispositivo sin aviso y leer los datos de registro."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Elegir gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Elegir control"</string>
-    <string name="battery_history_details_for" msgid="5189636461798594740">"Detalles de %d de UID"</string>
+    <string name="battery_history_details_for" msgid="5924639922153109669">"Detalles de UID <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="battery_history_uid" msgid="1016606150528436298">"ID de usuario <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage" msgid="8010852371665217020">"Detalles de uso de la red para <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="battery_history_bytes_received" msgid="980307569180518302">"Bytes recibidos: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
@@ -746,14 +746,10 @@
     <string name="battery_history_system_time" msgid="2015862072724507547">"Hora del sistema:"</string>
     <string name="battery_history_total_time" msgid="3618703970098556104">"Tiempo total:"</string>
     <string name="battery_history_starts" msgid="9137453931978571696">"Comienza: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
-    <!-- no translation found for battery_history_days (7110262897769622564) -->
-    <skip />
-    <!-- no translation found for battery_history_hours (7525170329826274999) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
-    <skip />
-    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
-    <skip />
+    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>días <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>min <xliff:g id="SECONDS">%4$d</xliff:g>seg"</string>
+    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>min <xliff:g id="SECONDS">%3$d</xliff:g>seg"</string>
+    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> seg"</string>
+    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> seg"</string>
     <string name="battery_history_packages_sharing_this_uid" msgid="4101596071379250050">"Paquetes que comparten esta UID:"</string>
     <string name="battery_history_no_data" msgid="1177238743237067617">"No hay datos disponibles del uso de la batería"</string>
     <string name="battery_history_sensor" msgid="2333488996028993982">"Sensor:"</string>
@@ -775,400 +771,209 @@
     <string name="app_name_label" msgid="2000949925256858308">"Aplicación"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"Contar"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Hora de uso"</string>
-    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
-    <skip />
-    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
-    <skip />
-    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
-    <skip />
-    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
-    <skip />
-    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
-    <skip />
-    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
-    <skip />
-    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
-    <skip />
-    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
-    <skip />
-    <!-- no translation found for power_usage_summary (7237084831082848168) -->
-    <skip />
-    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
-    <skip />
-    <!-- no translation found for battery_since_reset (7464546661121187045) -->
-    <skip />
-    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
-    <skip />
+    <string name="accessibility_settings" msgid="3975902491934816215">"Accesibilidad"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Configuración de accesibilidad"</string>
+    <string name="accessibility_settings_summary" msgid="8185181964847149507">"Administrar opciones de accesibilidad"</string>
+    <string name="toggle_accessibility_title" msgid="650839277066574497">"Accesibilidad"</string>
+    <string name="accessibility_services_category" msgid="8127851026323672607">"Servicios de accesibilidad"</string>
+    <string name="no_accessibility_services_summary" msgid="694578333333808159">"No se han instalado servicios de accesibilidad"</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Este servicio de accesibilidad podrá recopilar todo el texto que escribas, incluido los números de tarjeta de crédito de tus datos personales, excepto las contraseñas. También podrá registrar las interacciones de tu interfaz de usuario. Proviene de la aplicación <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. ¿Deseas utilizar este servicio de accesibilidad?"</string>
+    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"¿Deseas desactivar la accesibilidad?"</string>
+    <string name="power_usage_summary_title" msgid="5180282911164282324">"Uso de la batería"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"Lo que ha utilizado la batería"</string>
+    <string name="battery_since_unplugged" msgid="338073389740738437">"Uso de la batería desde que se desconectó"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"Uso de la batería desde que se restableció"</string>
+    <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> desde que se desconectó"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <!-- no translation found for awake (387122265874485088) -->
-    <skip />
-    <!-- no translation found for wifi_on_time (4630925382578609056) -->
-    <skip />
-    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
-    <skip />
-    <!-- no translation found for usage_name_percent (1899151069711662289) -->
-    <skip />
-    <!-- no translation found for details_title (7564809986329021063) -->
-    <skip />
-    <!-- no translation found for details_subtitle (32593908269911734) -->
-    <skip />
-    <!-- no translation found for controls_subtitle (390468421138288702) -->
-    <skip />
-    <!-- no translation found for packages_subtitle (4736416171658062768) -->
-    <skip />
-    <!-- no translation found for power_screen (2353149143338929583) -->
-    <skip />
-    <!-- no translation found for power_wifi (2382791137776486974) -->
-    <skip />
-    <!-- no translation found for power_bluetooth (4373329044379008289) -->
-    <skip />
-    <!-- no translation found for power_cell (6596471490976003056) -->
-    <skip />
-    <!-- no translation found for power_phone (5392641106474567277) -->
-    <skip />
-    <!-- no translation found for power_idle (9055659695602194990) -->
-    <skip />
-    <!-- no translation found for usage_type_cpu (715162150698338714) -->
-    <skip />
-    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
-    <skip />
-    <!-- no translation found for usage_type_gps (7989688715128160790) -->
-    <skip />
-    <!-- no translation found for usage_type_phone (9108247984998041853) -->
-    <skip />
-    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
-    <skip />
-    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
-    <skip />
-    <!-- no translation found for usage_type_audio (6957269406840886290) -->
-    <skip />
-    <!-- no translation found for usage_type_video (4295357792078579944) -->
-    <skip />
-    <!-- no translation found for usage_type_on_time (3351200096173733159) -->
-    <skip />
-    <!-- no translation found for usage_type_no_coverage (3797004252954385053) -->
-    <skip />
-    <!-- no translation found for battery_action_stop (649958863744041872) -->
-    <skip />
-    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
-    <skip />
-    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
-    <skip />
-    <!-- no translation found for battery_action_display (5302763261448580102) -->
-    <skip />
-    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
-    <skip />
-    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
-    <skip />
-    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
-    <skip />
-    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
-    <skip />
-    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
-    <skip />
-    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
-    <skip />
-    <!-- no translation found for battery_desc_display (5432795282958076557) -->
-    <skip />
-    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
-    <skip />
-    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
-    <skip />
-    <!-- no translation found for battery_sugg_wifi (7542345142282261691) -->
-    <skip />
-    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
-    <skip />
-    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
-    <skip />
-    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
-    <skip />
-    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_gps (4145005297393800223) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
-    <skip />
-    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
-    <skip />
-    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
-    <skip />
-    <!-- no translation found for menu_stats_total (8973377864854807854) -->
-    <skip />
-    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
-    <skip />
-    <!-- no translation found for process_kernel_label (3916858646836739323) -->
-    <skip />
-    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
-    <skip />
-    <!-- no translation found for tts_settings (6454363854545277027) -->
-    <skip />
-    <!-- no translation found for tts_settings_summary (2627715231944602766) -->
-    <skip />
-    <!-- no translation found for tts_settings_title (5064947197040356736) -->
-    <skip />
-    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
-    <skip />
-    <!-- no translation found for use_default_tts_settings_summary (4253502106159206276) -->
-    <skip />
-    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
-    <skip />
-    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
-    <skip />
-    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
-    <skip />
-    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
-    <skip />
-    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
-    <skip />
-    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
-    <skip />
-    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
-    <skip />
-    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
-    <skip />
-    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
-    <skip />
-    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
-    <skip />
-    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
-    <skip />
-    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
-    <skip />
-    <!-- no translation found for tts_demo (405357591189935876) -->
-    <skip />
-    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
-    <skip />
-    <!-- no translation found for gadget_title (7455548605888590466) -->
-    <skip />
-    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
-    <skip />
-    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
-    <skip />
-    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
-    <skip />
-    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
-    <skip />
-    <!-- no translation found for vpn_a_username (6664733641993968692) -->
-    <skip />
-    <!-- no translation found for vpn_a_password (1537213632501483753) -->
-    <skip />
-    <!-- no translation found for vpn_save_username (1408415289165970790) -->
-    <skip />
-    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
-    <skip />
-    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
-    <skip />
-    <!-- no translation found for vpn_no_button (7620339571187119107) -->
-    <skip />
-    <!-- no translation found for vpn_back_button (192036339792734970) -->
-    <skip />
-    <!-- no translation found for vpn_mistake_button (1683383660912491270) -->
-    <skip />
-    <!-- no translation found for vpn_menu_done (93528279226907926) -->
-    <skip />
-    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
-    <skip />
-    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
-    <skip />
-    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
-    <skip />
-    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
-    <skip />
-    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
-    <skip />
-    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
-    <skip />
-    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
-    <skip />
-    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
-    <skip />
-    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
-    <skip />
-    <!-- no translation found for vpn_reconnect_from_lost (2442844155623372118) -->
-    <skip />
-    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
-    <skip />
-    <!-- no translation found for vpn_challenge_error_dialog_msg (6174901754230038601) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set_dialog_msg (8013052814131532765) -->
-    <skip />
-    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
-    <skip />
-    <!-- no translation found for vpn_remote_hung_up_error_dialog_msg (1566946015052633150) -->
-    <skip />
-    <!-- no translation found for vpn_type_title (6392933604218676224) -->
-    <skip />
-    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
-    <skip />
-    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
-    <skip />
-    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
-    <skip />
-    <!-- no translation found for vpns (3148141862835492816) -->
-    <skip />
-    <!-- no translation found for vpn_connecting (8039521381692090116) -->
-    <skip />
-    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
-    <skip />
-    <!-- no translation found for vpn_connected (7641723116362845781) -->
-    <skip />
-    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
-    <skip />
-    <!-- no translation found for vpn_name (1550918148476193076) -->
-    <skip />
-    <!-- no translation found for vpn_a_name (8445736942405283509) -->
-    <skip />
-    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
-    <skip />
-    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
-    <skip />
-    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
-    <skip />
-    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
-    <skip />
-    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
-    <skip />
-    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
-    <skip />
-    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
-    <skip />
-    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
-    <skip />
-    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
-    <skip />
-    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
-    <skip />
-    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
-    <skip />
-    <!-- no translation found for vpn_pptp_encryption_title (2236795167467896499) -->
-    <skip />
-    <!-- no translation found for vpn_pptp_encryption (2602329949737259686) -->
-    <skip />
-    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
-    <skip />
-    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
-    <skip />
-    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
-    <skip />
-    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
-    <skip />
-    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
-    <skip />
-    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
-    <skip />
-    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
-    <skip />
-    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
-    <skip />
-    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
-    <skip />
-    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
-    <skip />
-    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
-    <skip />
-    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
-    <skip />
-    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
-    <skip />
-    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
-    <skip />
-    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
-    <skip />
-    <!-- no translation found for vpn_secret_unchanged (8700613973594154529) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set (1037792636371641845) -->
-    <skip />
-    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
-    <skip />
-    <!-- no translation found for cstor_access_title (1739505390736236717) -->
-    <skip />
-    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
-    <skip />
-    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
-    <skip />
-    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
-    <skip />
-    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
-    <skip />
-    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
-    <skip />
-    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
-    <skip />
-    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
-    <skip />
-    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
-    <skip />
-    <!-- no translation found for cstor_credential_password (7187440553141199409) -->
-    <skip />
-    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
-    <skip />
-    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
-    <skip />
-    <!-- no translation found for cstor_old_password (979282118063084561) -->
-    <skip />
-    <!-- no translation found for cstor_new_password (6218562692435670047) -->
-    <skip />
-    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
-    <skip />
-    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
-    <skip />
-    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
-    <skip />
-    <!-- no translation found for cstor_password_error (2917326097260402464) -->
-    <skip />
-    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
-    <skip />
-    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
-    <skip />
-    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
-    <skip />
-    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
-    <skip />
-    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
-    <skip />
-    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
-    <skip />
-    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
-    <skip />
-    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
-    <skip />
-    <!-- no translation found for cstor_storage_error (7140697503172458161) -->
-    <skip />
-    <!-- no translation found for cstor_unable_to_save_cert (1631402544447196406) -->
-    <skip />
-    <!-- no translation found for cstor_cert_not_saved (6318149789449538491) -->
-    <skip />
-    <!-- no translation found for cstor_is_reset (449870501126790589) -->
-    <skip />
-    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
-    <skip />
-    <!-- no translation found for cstor_is_added (794788474010251572) -->
-    <skip />
-    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
-    <skip />
-    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <string name="awake" msgid="387122265874485088">"Hora de activación del dispositivo"</string>
+    <string name="wifi_on_time" msgid="4630925382578609056">"WiFi a tiempo"</string>
+    <string name="bluetooth_on_time" msgid="4478515071957280711">"WiFi a tiempo"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
+    <string name="details_title" msgid="7564809986329021063">"Detalles de uso de la batería"</string>
+    <string name="details_subtitle" msgid="32593908269911734">"Utilizar detalles"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"Ajustar el uso de energía"</string>
+    <string name="packages_subtitle" msgid="4736416171658062768">"Paquetes incluidos"</string>
+    <string name="power_screen" msgid="2353149143338929583">"Mostrar"</string>
+    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
+    <string name="power_cell" msgid="6596471490976003056">"Célula pendiente"</string>
+    <string name="power_phone" msgid="5392641106474567277">"Llamadas de voz"</string>
+    <string name="power_idle" msgid="9055659695602194990">"Teléfono inactivo"</string>
+    <string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
+    <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer plano de la CPU"</string>
+    <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
+    <string name="usage_type_phone" msgid="9108247984998041853">"Teléfono"</string>
+    <string name="usage_type_data_send" msgid="2857401966985425427">"Datos enviados"</string>
+    <string name="usage_type_data_recv" msgid="7251090882025234185">"Datos recibidos"</string>
+    <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"Hora de encendido"</string>
+    <string name="usage_type_no_coverage" msgid="3797004252954385053">"Hora sin una señal"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"Provocar la detención"</string>
+    <string name="battery_action_app_details" msgid="3275013531871113681">"Información de aplicación"</string>
+    <string name="battery_action_app_settings" msgid="350562653472577250">"Configuración de aplicación"</string>
+    <string name="battery_action_display" msgid="5302763261448580102">"Configuración de visualización"</string>
+    <string name="battery_action_wifi" msgid="5452076674659927993">"Configuración de WiFi"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Config. de Bluetooth"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"La batería está siendo utilizada por llamadas de voz"</string>
+    <string name="battery_desc_standby" msgid="3009080001948091424">"La batería se utiliza cuando el teléfono está inactivo"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"La batería está siendo utilizada por la radio celular"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"Cambiar a modo de avión para ahorrar energía en áreas sin cobertura celular"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"La batería está siendo utilizada por la pantalla y la luz de fondo"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"Reducir el brillo y el tiempo muerto de la pantalla"</string>
+    <string name="battery_desc_wifi" msgid="1702486494565080431">"La batería está siendo utilizada por Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="7542345142282261691">"Desactivar Wi-Fi cuando no se utiliza o cuando no está disponible"</string>
+    <string name="battery_desc_bluetooth" msgid="7535520658674621902">"La batería está siendo utilizada por bluetooth"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Desactiva Bluetooth cuando no lo utilizas"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Intentar conectarse a un dispositivo Bluetooth diferente"</string>
+    <string name="battery_desc_apps" msgid="8123202939321333639">"La batería es utilizada por las aplicaciones durante el roaming"</string>
+    <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Detener o desinstalar la aplicación"</string>
+    <string name="battery_sugg_apps_gps" msgid="4145005297393800223">"Desactivar el GPS cuando no lo utilizas"</string>
+    <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"La aplicación podrá ofrecer una configuración para reducir el uso de la batería"</string>
+    <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que se desconectó"</string>
+    <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Durante la última desconexión para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_total" msgid="8973377864854807854">"Total de usos"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"Actualizar"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"SO Android"</string>
+    <string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor de medios"</string>
+    <string name="tts_settings" msgid="3348626948015962987">"Texto a voz"</string>
+    <string name="tts_settings_summary" msgid="2627715231944602766">"Establecer opciones de texto a voz"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Configuración de texto a voz"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Usar siempre mi config."</string>
+    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Config. predet. debajo de la config. superpuesta de la aplicación"</string>
+    <string name="tts_default_settings_section" msgid="5787915620218907443">"Configuración predeterminada"</string>
+    <string name="tts_default_rate_title" msgid="6030550998379310088">"Índice de voz"</string>
+    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Velocidad en la que se habla el texto"</string>
+    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Sonido"</string>
+    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afecta el tono del texto hablado"</string>
+    <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Establece la voz específica de un idioma para el texto hablado"</string>
+    <string name="tts_play_example_title" msgid="7094780383253097230">"Escucha un ejemplo:"</string>
+    <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproducir una pequeña demostración de síntesis de voz"</string>
+    <string name="tts_install_data_title" msgid="4264378440508149986">"Instalar datos de voz"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"Instalar los datos de voz necesarios para la síntesis de voz"</string>
+    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Las voces necesarias para la síntesis de voz ya han sido instaladas correctamente"</string>
+    <string name="tts_demo" msgid="405357591189935876">"Éste es un ejemplo de síntesis de voz"</string>
+    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Tu configuración ha cambiado. Éste es un ejemplo de cómo suenan."</string>
+    <string name="gadget_title" msgid="7455548605888590466">"Control de energía"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Actualizando configuración de Wi-Fi"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Actualización de la configuración de Bluetooth"</string>
+    <string name="credential_installer_activity_title" msgid="7600661521831762521">"Programa de instalación de la credencial"</string>
+    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Configuración de VPN"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"Conectar a <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpn_username_colon" msgid="7854930370861306247">"Nombre de usuario:"</string>
+    <string name="vpn_password_colon" msgid="5716278710848606626">"Contraseña:"</string>
+    <string name="vpn_a_username" msgid="6664733641993968692">"un nombre de usuario"</string>
+    <string name="vpn_a_password" msgid="1537213632501483753">"una contraseña"</string>
+    <string name="vpn_save_username" msgid="1408415289165970790">"Recordar nombre de usuario"</string>
+    <string name="vpn_connect_button" msgid="1699007212602470655">"Conectar"</string>
+    <string name="vpn_yes_button" msgid="8034531001149843119">"Sí"</string>
+    <string name="vpn_no_button" msgid="7620339571187119107">"No"</string>
+    <string name="vpn_back_button" msgid="192036339792734970">"Atrás"</string>
+    <string name="vpn_mistake_button" msgid="1683383660912491270">"No"</string>
+    <string name="vpn_menu_done" msgid="93528279226907926">"Guardar"</string>
+    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Cancelar"</string>
+    <string name="vpn_menu_revert" msgid="4407762442281467659">"Revertir"</string>
+    <string name="vpn_menu_connect" msgid="1089399414463784218">"Conectar a la red"</string>
+    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Desconectar de la red"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Editar red"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Suprimir red"</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Debes ingresar <xliff:g id="CODE">%s</xliff:g>."</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Debes seleccionar <xliff:g id="OPTION">%s</xliff:g>."</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"El nombre de la VPN \"<xliff:g id="NAME">%s</xliff:g>\" ya existe. Busca otro nombre."</string>
+    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"¿Estás seguro de que deseas eliminar esta VPN?"</string>
+    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"¿Estás seguro de que no deseas crear este perfil?"</string>
+    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"¿Estás seguro de que deseas descartar los cambios realizados a este perfil?"</string>
+    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"No se puede conectar a la red. ¿Deseas volver a intentarlo?"</string>
+    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Conexión perdida. ¿Deseas volver a establecer la conexión?"</string>
+    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"El nombre del servidor no se ha podido resolver. ¿Deseas verificar la configuración del nombre el servidor?"</string>
+    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Error de desafío. ¿Deseas verificar tu configuración de secretos?"</string>
+    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Faltan uno o más secretos en esta configuración de VPN. ¿Deseas verificar tu configuración de secretos?"</string>
+    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"El nombre de usuario o la contraseña que has ingresado es incorrecto. ¿Deseas volver a intentarlo?"</string>
+    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Servidor en suspenso. El nombre de usuario o la contraseña que has ingresado pueden ser incorrectos. ¿Deseas volver a intentarlo?"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Servidor en suspenso. Es posible que te encuentres detrás de un cortafuegos que te impide conectarte con el servidor. ¿Deseas volver a intentarlo?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Hubo un error en la negociación del servidor. Es posible que el servidor no acuerde con tu opción de encriptación. ¿Deseas revisar tu configuración de encriptación?"</string>
+    <string name="vpn_type_title" msgid="6392933604218676224">"Agregar VPN"</string>
+    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Agregar VPN"</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Agregar <xliff:g id="NAME">%s</xliff:g> VPN"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"<xliff:g id="NAME">%s</xliff:g> detalles"</string>
+    <string name="vpns" msgid="3148141862835492816">"VPN"</string>
+    <string name="vpn_connecting" msgid="8039521381692090116">"Conectando..."</string>
+    <string name="vpn_disconnecting" msgid="7748050200708257066">"Desconectando..."</string>
+    <string name="vpn_connected" msgid="7641723116362845781">"Conectado"</string>
+    <string name="vpn_connect_hint" msgid="7442898962925875181">"Conectar a la red"</string>
+    <string name="vpn_name" msgid="1550918148476193076">"Nombre de VPN"</string>
+    <string name="vpn_a_name" msgid="8445736942405283509">"un nombre de VPN"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"\"<xliff:g id="NAME">%s</xliff:g>\" se ha agregado"</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"Se han realizado cambios a \'<xliff:g id="NAME">%s</xliff:g>\'"</string>
+    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Establecer certificado de usuario"</string>
+    <string name="vpn_user_certificate" msgid="949322691686938888">"Certificado del usuario"</string>
+    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"un certificado de usuario"</string>
+    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Establecer certificado de CA"</string>
+    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certificado de autoridad (CA) certificado"</string>
+    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"un certificado de CA"</string>
+    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Establecer secreto de L2TP"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Secreto de L2TP"</string>
+    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"un secreto de L2TP"</string>
+    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"encriptación"</string>
+    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Encriptación de PPTP"</string>
+    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Establecer clave precompartida de IPSec"</string>
+    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Clave precompartida de IPSec"</string>
+    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"una clave precompartida de IPSec"</string>
+    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Establecer servidor de VPN"</string>
+    <string name="vpn_vpn_server" msgid="1141754908824209260">"Servidor de VPN"</string>
+    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"un servidor de VPN"</string>
+    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Nombre del servidor de VPN"</string>
+    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Dominios de búsqueda de DNS"</string>
+    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Dominios de búsqueda de DNS"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> se ha establecido"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> no establecido"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> no establecido (opcional)"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"Activar<xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"Desactivar <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> está habilitado"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> está inhabilitada"</string>
+    <string name="vpn_settings_title" msgid="7327468307909556719">"Configuración de VPN"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"Establecer &amp; administrar Redes privadas virtuales (VPN)"</string>
+    <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(sin cambios)"</string>
+    <string name="vpn_secret_not_set" msgid="1037792636371641845">"(no establecido)"</string>
+    <string name="credentials_category" msgid="8536992056377271234">"Almacenamiento de la credencial"</string>
+    <string name="credentials_access" msgid="4843187230913860492">"Utilizar credenciales seguras"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"Permitir a las aplicaciones acceder a certificados seguros y otras credenciales"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"Ingresar contraseña"</string>
+    <string name="credentials_unlock_hint" msgid="594679530407918031">"Ingresar la contraseña de almacenamiento de la credencial"</string>
+    <string name="credentials_install_certificates" msgid="177337517568022236">"Instalar de la tarjeta SD"</string>
+    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Instalar certificados encriptados de la tarjeta SD"</string>
+    <string name="credentials_set_password" msgid="9104473585811899989">"Establecer contraseña"</string>
+    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Establecer o cambiar la contraseña de almacenamiento de la credencial"</string>
+    <string name="credentials_reset" msgid="9170150870552453457">"Borrar almacenamiento"</string>
+    <string name="credentials_reset_summary" msgid="1530388094693731636">"Borrar el almacenamiento de la credencial de todo el contenido y restablecer su contraseña"</string>
+    <string name="credentials_reset_hint" msgid="819990295796804516">"¿Estás seguro de que deseas eliminar todas las credenciales y restablecer la contraseña de almacenamiento de la credencial?"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"Contraseña actual:"</string>
+    <string name="credentials_new_password" msgid="267487774686796938">"Nueva contraseña:"</string>
+    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmar contraseña nueva:"</string>
+    <string name="credentials_first_time_hint" msgid="1567821077545346039">"Configurar una contraseña para el almacenamiento de la credencial (mínimo 8 caracteres)."</string>
+    <string name="credentials_wrong_password" msgid="7525192410790152041">"Ingresa la contraseña correcta."</string>
+    <string name="credentials_reset_warning" msgid="6392481296673345268">"Ingresa la contraseña correcta. Tienes una oportunidad más para ingresar la contraseña correcta antes de que el almacenamiento de la credencial se borre."</string>
+    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Ingresa la contraseña correcta. Tienes <xliff:g id="NUMBER">%1$d</xliff:g> oportunidades más para ingresar la contraseña correcta antes de que el almacenamiento de la credencial se borre."</string>
+    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Las contraseñas no coinciden."</string>
+    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Debes ingresar y confirmar una contraseña."</string>
+    <string name="credentials_password_empty" msgid="8292138152983330473">"Ingresa la contraseña."</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"La contraseña debe tener 8 caracteres como mínimo."</string>
+    <string name="credentials_erased" msgid="7700309135582200849">"El almacenamiento de la credencial se ha borrado."</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"El almacenamiento de la credencial está activado."</string>
+    <string name="credentials_disabled" msgid="7453188089059045380">"El almacenamiento de la credencial está inhabilitado."</string>
+    <string name="emergency_tone_title" msgid="1055954530111587114">"Tono de emergencia"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"Establecer el comportamiento cuando se establece una llamada de emergencia"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Privacidad"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Configuración de privacidad"</string>
+    <string name="location_section_title" msgid="6072558684044939786">"Ubicación"</string>
+    <string name="settings_section_title" msgid="7413252428447723032">"Configuración"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Datos personales"</string>
+    <string name="backup_settings_title" msgid="2968262658155327829">"Hacer una copia de seguridad de mi configuración"</string>
+    <string name="backup_erase_dialog_title" msgid="6028429904055779443">"Copia de seguridad de configuración"</string>
+    <string name="backup_erase_dialog_message" msgid="9096433810456900531">"¿Estás seguro de que deseas dejar de hacer copias de seguridad de tu configuración y borrar todas las copias de los servidores de Google?"</string>
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
     <skip />
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index d49a5eade52..2059391856e 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -24,13 +24,23 @@
     <item msgid="5345178126174698955">"Pacífico"</item>
     <item msgid="8392017019801393511">"Todas"</item>
   </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"Sin animaciones"</item>
+    <item msgid="6291186755504776720">"Algunas animaciones"</item>
+    <item msgid="3856065399819979491">"Todas las animaciones"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"No aparecen animaciones de ventana."</item>
+    <item msgid="4460915688877708508">"Aparecen algunas animaciones de ventana."</item>
+    <item msgid="488968798204105119">"Aparecen todas las animaciones de ventana."</item>
+  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 segundos"</item>
     <item msgid="8881760709354815449">"30 segundos"</item>
     <item msgid="7589406073232279088">"1 minuto"</item>
     <item msgid="7001195990902244174">"2 minutos"</item>
     <item msgid="5721688686241190620">"10 minutos"</item>
-    <item msgid="1781492122915870416">"Tiempo de espera ilimitado"</item>
+    <item msgid="7156442995039264948">"30 minutos"</item>
   </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Muy lenta"</item>
@@ -58,18 +68,14 @@
     <item msgid="2923732046112398627">"Automática"</item>
     <item msgid="5434666299123318296">"Ninguna"</item>
     <item msgid="3159594845889645948">"WEP"</item>
-    <item msgid="6303607119537134095">"WPA Personal"</item>
-    <item msgid="1977424472734732392">"WPA2 Personal"</item>
-    <item msgid="5185669984217684689">"WPA-EAP"</item>
-    <item msgid="8643206823103498303">"IEEE 802.1x"</item>
+    <item msgid="1687348101566181433">"WPA/WPA2 PSK"</item>
+    <item msgid="329777238762866787">"802.1x Enterprise"</item>
   </string-array>
   <string-array name="wifi_security_without_auto_entries">
     <item msgid="4402120432904877907">"Ninguna"</item>
     <item msgid="2329148995431627488">"WEP"</item>
-    <item msgid="2296204649410509235">"WPA Personal"</item>
-    <item msgid="8928468573279595315">"WPA2 Personal"</item>
-    <item msgid="8319241197948974314">"WPA-EAP"</item>
-    <item msgid="2222409752754955757">"IEEE 802.1x"</item>
+    <item msgid="6903317668294332381">"WPA/WPA2 PSK"</item>
+    <item msgid="7280821339307729710">"802.1x Enterprise"</item>
   </string-array>
   <string-array name="wifi_wep_type">
     <item msgid="1497433962958697183">"Automáticamente"</item>
@@ -108,7 +114,7 @@
     <item msgid="1818786254010764570">"Ninguno"</item>
     <item msgid="6189918678874123056">"PAP"</item>
     <item msgid="1524112260493662517">"MSCHAP"</item>
-    <item msgid="1586767102985419413">"MSCHAP2"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
@@ -116,4 +122,10 @@
     <item msgid="3165868966179561687">"Alerta"</item>
     <item msgid="6038758039030476855">"Vibración"</item>
   </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"Ninguno"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP o CHAP"</item>
+  </string-array>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1cba638c730..1ffcee889da 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -15,6 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"Sí"</string>
+    <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Activar señal móvil"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Desactivar señal móvil"</string>
@@ -56,6 +58,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"Aceptar"</string>
     <string name="sdcard_setting" msgid="5922637503871474866">"Tarjeta SD"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Estado de la batería:"</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"Cargar batería:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Nivel de batería:"</string>
     <string name="battery_info_level_label" msgid="8706526709307788737">"Nivel de batería:"</string>
     <string name="battery_info_health_label" msgid="6416051542741886958">"Estado de la batería:"</string>
@@ -75,6 +78,11 @@
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"Descargando..."</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"No se está cargando."</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Completa"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Sin conexión"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"Desconocido"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Desconocido"</string>
     <string name="battery_info_health_good" msgid="8070356565806711806">"Buena"</string>
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"Sobrecalentamiento"</string>
@@ -104,6 +112,12 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Solicitud de sincronización de Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitud de sincronización"</string>
     <string name="bluetooth_notif_message" msgid="5381418499788668724">"Seleccionar dispositivo para sincronización "</string>
+    <string name="device_picker" msgid="8721012448931226323">"Selector del dispositivo Bluetooth"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitud de permiso de Bluetooth"</string>
+    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Una aplicación del teléfono está solicitando permiso para activar la función Bluetooth. ¿Quieres realizar esta acción?"</string>
+    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Una aplicación del teléfono está solicitando permiso para hacer visible el teléfono para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Quieres realizar esta acción?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Una aplicación del teléfono está solicitando permiso para activar la función Bluetooth y hacer visible el teléfono para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Quieres realizar esta acción?"</string>
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Activando Bluetooth..."</string>
     <string name="date_and_time" msgid="4114084177056654663">"Configuración de fecha y hora"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 p.m."</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -196,7 +210,8 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Inhabilitar todas las conexiones inalámbricas"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Inhabilitando conexiones inalámbricas..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Habilitando conexiones inalámbricas..."</string>
-    <string name="radio_controls_title" msgid="8356991079873437337">"Conexiones inalámbricas"</string>
+    <string name="radio_controls_title" msgid="5868688473587168882">"Conexiones inalámbricas y redes"</string>
+    <string name="wireless_networks_settings_title" msgid="149274247949769551">"Configuración de red e inalámbrica"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Administrar Wi-Fi, Bluetooth, modo avión, redes móviles y VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Itinerancia de datos"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Establecer conexión con servicios de datos en itinerancia"</string>
@@ -219,20 +234,29 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Seleccionar formato de fecha"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenar alfabéticamente"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por zona horaria"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"Seguridad y ubicación"</string>
+    <string name="security_settings_title" msgid="5168491784222013179">"Ubicación y seguridad"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"Configuración de seguridad y de ubicación"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, bloqueo de pantalla, bloqueo de tarjeta SIM y bloqueo de almacenamiento de credenciales"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer ubicación, bloqueo de pantalla y bloqueo de almacenamiento de credenciales"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contraseñas"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activar Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Ajustes de Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Administrar conexiones, establecer el nombre del dispositivo y la visibilidad"</string>
-    <string name="bluetooth_pin_entry" msgid="5627349871303455279">"Solicitud de sincronización de Bluetooth"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Solicitud de sincronización de Bluetooth"</string>
     <string name="bluetooth_device_info" msgid="6644515376523965073">"Información de dispositivo Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="7551139612735632370">"<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_enter_pin_msg" msgid="856962526754150334">\n"Introduce el PIN para la sincronización con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Prueba con 0000 o con 1234)."</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Introduce la clave de acceso para la sincronización con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Para realizar la sincronización con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", confirma que muestre la clave de acceso <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"solicita la sincronización."</string>
+    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Introduce <xliff:g id="PASSKEY">%2$s</xliff:g> en \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" para realizar la sincronización."</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Sincronizar"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"No sincronizar"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"dispositivo Bluetooth"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Atención"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"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_pin_error_message" msgid="6938408362011024289">"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_pairing_pin_error_message" msgid="6065697229258906937">"Se ha producido un problema al realizar la sincronización con <xliff:g id="DEVICE_NAME">%1$s</xliff:g> porque la clave de acceso o el PIN son incorrectos."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"No se puede establecer comunicación con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Sincronización rechazada por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Se ha producido un problema al establecer conexión con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
@@ -246,6 +270,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Establecer conexión con…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Multimedia"</string>
     <string name="bluetooth_profile_headset" msgid="1874975688666658946">"Teléfono"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Transferencia"</string>
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Conectado al audio del medio"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Conectado al audio del teléfono"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Conectado a audio de medio y del teléfono"</string>
@@ -255,8 +280,11 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Perfiles"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado al audio del medio"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado al audio del teléfono"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Con conexión al servidor de transferencia de archivos"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Sin conexión al servidor de transferencia de archivos"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilizar para audio de medio"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilizar para audio del teléfono"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Uso de la transferencia de archivos"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activar Wi-Fi"</string>
@@ -273,17 +301,13 @@
     <string name="security" msgid="1040691896987225267">"Seguridad"</string>
     <string name="wifi_security_open" msgid="3513305614048816607">"Abierta"</string>
     <string name="wifi_security_wep" msgid="7082604129842065776">"WEP"</string>
-    <string name="wifi_security_wpa" msgid="8980169410565477162">"WPA"</string>
-    <string name="wifi_security_wpa2" msgid="5780665935088930524">"WPA2"</string>
-    <string name="wifi_security_wpa_eap" msgid="7485687331651751101">"WPA-EAP"</string>
-    <string name="wifi_security_ieee8021x" msgid="8538687609878109005">"IEEE8021X"</string>
+    <string name="wifi_security_psk" msgid="3392399380570381452">"WPA/WPA2 PSK"</string>
+    <string name="wifi_security_eap" msgid="8309434150934969132">"Enterprise (802.1x)"</string>
     <string name="wifi_security_unknown" msgid="4564208312073060668">"Desconocida"</string>
     <string name="wifi_security_verbose_open" msgid="8117878112088901945">"red abierta"</string>
     <string name="wifi_security_verbose_wep" msgid="9220757688700421508">"protegida con WEP"</string>
-    <string name="wifi_security_verbose_wpa" msgid="598697674252714455">"protegida con WPA"</string>
-    <string name="wifi_security_verbose_wpa2" msgid="4116236883347875722">"protegida con WPA2"</string>
-    <string name="wifi_security_verbose_wpa_eap" msgid="1984821646949066624">"protegida con WPA-EAP"</string>
-    <string name="wifi_security_verbose_ieee8021x" msgid="5552995793910186310">"protegida con IEEE 802.1x"</string>
+    <string name="wifi_security_verbose_psk" msgid="1110130025330416225">"protegida con WPA/WPA2 PSK"</string>
+    <string name="wifi_security_verbose_eap" msgid="586632662086063">"protegida con 802.1x EAP"</string>
     <string name="ip_address" msgid="850672263358989449">"Dirección IP"</string>
     <string name="signal" msgid="1947969631626413228">"Intensidad de la señal"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"Activando..."</string>
@@ -302,14 +326,13 @@
     <string name="please_type_anonymous_identity" msgid="835061562079965048">"Identidad anónima"</string>
     <string name="please_select_client_certificate" msgid="2137906961594663234">"Certificado de cliente"</string>
     <string name="please_select_ca_certificate" msgid="5010815181914420677">"Certificado de autenticación"</string>
-    <string name="please_type_private_key_passwd" msgid="4077744679722504443">"Contraseña de clave privada"</string>
     <string name="please_type_passphrase" msgid="8256017704131522462">"Contraseña de red inalámbrica"</string>
     <string name="please_type_hex_key" msgid="8751224390407867551">"Clave hex. WEP (0-9, A-F)"</string>
     <string name="wifi_show_password" msgid="4235237470701732009">"Mostrar contraseña"</string>
     <string name="scan_wifi" msgid="2459901725350542606">"Buscar"</string>
     <string name="summary_not_in_range" msgid="3926674700733548684">"Fuera de rango"</string>
     <string name="summary_remembered" msgid="6079941090549401742">"recordada"</string>
-    <string name="summary_connection_failed" msgid="7610394657613410489">"La conexión no se ha realizado correctamente; selecciónala para volver a intentarlo."</string>
+    <string name="summary_connection_failed" msgid="2351885658101671413">"La conexión no se ha realizado correctamente; toca para volver a intentarlo."</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
     <string name="wifi_type_ssid" msgid="1326839657083292017">"SSID de red"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguridad"</string>
@@ -360,6 +383,7 @@
     <string name="status_disconnected" msgid="7561688569905126046">"Desconectada"</string>
     <string name="status_failed" msgid="610462050405904601">"Con error"</string>
     <string name="sound_and_display_settings" msgid="349770582993029003">"Sonido y pantalla"</string>
+    <string name="sound_and_display_settings_title" msgid="5036144539683697330">"Configuración de sonido y de pantalla"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Configuración de sonido"</string>
     <string name="sound_and_display_settings_summary" msgid="1433943789593286064">"Establecer tonos, notificaciones, brillo de la pantalla"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Modo silencio"</string>
@@ -385,11 +409,14 @@
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"Selección sonora"</string>
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Reproducir sonido cuando se realiza una selección de pantalla"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Reproducir sonido cuando se realiza una selección de pantalla"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Respuesta táctil"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrar al pulsar teclas programables o durante ciertas interacciones con la interfaz de usuario"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrar al pulsar teclas programables o durante ciertas interacciones con la interfaz de usuario"</string>
     <string name="play_media_notification_sounds_enable_title" msgid="1008791464029179529">"Notificaciones tarjeta SD"</string>
     <string name="play_media_notification_sounds_enable_summary_on" msgid="7675466959375667370">"Reproducir sonido para notificaciones de la tarjeta SD"</string>
     <string name="play_media_notification_sounds_enable_summary_off" msgid="8672617597028744693">"Reproducir sonido para notificaciones de la tarjeta SD"</string>
-    <string name="sync_settings" msgid="2212736205476453234">"Sincronización de datos"</string>
-    <string name="sync_settings_summary" msgid="6480534906375217074">"Seleccionar las aplicaciones que están sincronizadas"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Cuentas y sincronización"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"Añadir o eliminar cuentas y modificar la configuración de las cuentas"</string>
     <string name="search_settings" msgid="1910951467596035063">"Buscar"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Administrar historial y configuración de búsqueda"</string>
     <string name="display_settings" msgid="3912042046350078328">"Configuración de pantalla"</string>
@@ -403,6 +430,7 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar el brillo de la pantalla"</string>
     <string name="screen_timeout" msgid="4882669461447531301">"Tiempo espera pantalla"</string>
     <string name="screen_timeout_summary" msgid="2905757633140605334">"Ajustar el tiempo de retraso antes de que la pantalla se apague automáticamente"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Configuración de bloqueo de tarjeta SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Bloqueo de tarjeta SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueo de tarjeta SIM"</string>
@@ -436,7 +464,8 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
     <string name="device_status" msgid="607405385799807324">"Estado"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Número de teléfono, señal, etc."</string>
-    <string name="storage_settings_title" msgid="8461515684514801302">"Almacenamiento"</string>
+    <string name="storage_settings" msgid="6681164315506788024">"Almacenamiento en teléfono y en tarjeta SD"</string>
+    <string name="storage_settings_title" msgid="5379463509034022773">"Configuración de almacenamiento en teléfono y en tarjeta SD"</string>
     <string name="storage_settings_summary" msgid="9176693537325988610">"Desactivar tarjeta SD, ver almacenamiento disponible."</string>
     <string name="status_number" msgid="5123197324870153205">"Mi número de teléfono"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
@@ -480,6 +509,11 @@
     <string name="apn_mms_port" msgid="4074188088199243040">"Puerto de MMS"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"Tipo de autenticación"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Ninguno"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP o CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Tipo de APN"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Eliminar APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN nuevo"</string>
@@ -518,12 +552,15 @@
     <string name="location_network_based" msgid="8815705866861993344">"Usar redes inalámbricas"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Para ver una ubicación en aplicaciones (por ejemplo, Google Maps)"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Ubicación determinada por redes móviles o Wi-Fi"</string>
-    <string name="location_gps" msgid="375912731641377120">"Habilitar satélites GPS"</string>
-    <string name="location_street_level" msgid="5899941752252356344">"Preciso en el nivel de calle (anula la selección para ahorrar batería)"</string>
+    <string name="location_gps" msgid="6296125378829097831">"Utilizar satélites GPS"</string>
+    <string name="location_street_level" msgid="6460740847018275745">"Durante la localización, preciso en el nivel de calle (desactivar para ahorrar batería)"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Localizar en nivel de calle (requiere más batería además de la vista aérea)"</string>
-    <string name="use_location_title" msgid="7585990952633568732">"Compartir con Google"</string>
-    <string name="use_location_summary" msgid="4411467143899877395">"Permitir que Google utilice tu ubicación para mejorar las búsquedas y otros servicios"</string>
-    <string name="use_location_warning_message" msgid="5696732842038416151">"Permitir que Google utilice tu ubicación para mejorar los resultados de búsqueda y otros servicios"</string>
+    <string name="assisted_gps" msgid="4649317129586736885">"Utilizar GPS asistido"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizar el servidor para asistir al GPS (desactivar para reducir el uso de la red)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizar el servidor para asistir al GPS (desactivar para mejorar el rendimiento del GPS)"</string>
+    <string name="use_location_title" msgid="5447030582538504247">"Utilizar Mi ubicación"</string>
+    <string name="use_location_summary" msgid="1816849484040070431">"Utilizar Mi ubicación para los resultados de búsqueda de Google y otros servicios de Google"</string>
+    <string name="use_location_warning_message" msgid="1420184860518262439">"¿Quieres que Google pueda utilizar tu ubicación para mejorar los resultados de búsqueda y otros servicios?"</string>
     <string name="agree" msgid="6288718671527758326">"Acepto"</string>
     <string name="disagree" msgid="6221069272309799230">"No acepto"</string>
     <string name="about_settings" msgid="1743378368185371685">"Acerca del teléfono"</string>
@@ -538,6 +575,10 @@
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencias de SW libre"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Se ha producido un problema al intentar cargar las licencias."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Cargando..."</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Información de seguridad"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Información de seguridad"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"El teléfono no está conectado a un servicio de datos. Para ver esta información, accede a %s desde cualquier equipo conectado a Internet."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Cargando..."</string>
     <string name="lock_settings_title" msgid="5828348303971852121">"Patrón de desbloqueo de pantalla"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Cambiar patrón de desbloqueo"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmar patrón guardado"</string>
@@ -566,9 +607,9 @@
     <string name="skip_button_label" msgid="8680422740354436943">"Cancelar"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Seguir"</string>
     <string name="lock_title" msgid="4059246467204273930">"Protección del teléfono"</string>
-    <string name="lock_intro_message" msgid="5352897389718432077"><font size="17">"Protege el teléfono de usos no autorizados mediante la creación de un patrón de desbloqueo de pantalla personal. "\n<font height="17">\n</font><b>"1"</b>"  En la siguiente pantalla, puedes observar cómo se crea un patrón de ejemplo. "\n<font height="17">\n</font><b>"2"</b>"  Cuando estés preparado, crea tu propio patrón de desbloqueo personal. Puedes experimentar con distintos patrones, pero recuerda que debes conectar al menos cuatro puntos. "\n<font height="17">\n</font><b>"3"</b>"  Vuelve a dibujar el patrón para confirmarlo. "\n<font height="17">\n</font><b>"Si estás preparado para comenzar, selecciona \"Seguir\""</b>". "\n<font height="3">\n</font>"Para dejar el teléfono desprotegido, selecciona \"Cancelar\"."</font></string>
+    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Protege el teléfono de usos no autorizados mediante la creación de un patrón de desbloqueo de pantalla personal. "\n<font height="17">\n</font><b>"1"</b>"  En la siguiente pantalla, puedes observar cómo se crea un patrón de ejemplo. "\n<font height="17">\n</font><b>"2"</b>"  Cuando estés preparado, crea tu propio patrón de desbloqueo personal. Puedes experimentar con distintos patrones, pero recuerda que debes conectar al menos cuatro puntos. "\n<font height="17">\n</font><b>"3"</b>"  Vuelve a dibujar el patrón para confirmarlo. "\n<font height="17">\n</font><b>"Si estás preparado para comenzar, toca en \"Siguiente\""</b>". "\n<font height="3">\n</font>"Para dejar el teléfono desprotegido, toca en \"Cancelar\"."</font></string>
     <string name="lock_example_title" msgid="8052305554017485410">"Patrón de ejemplo"</string>
-    <string name="lock_example_message" msgid="7431982730914254881">"Une al menos cuatro puntos."\n" "\n"Selecciona \"Seguir\" cuando estés preparado para crear tu propio patrón."</string>
+    <string name="lock_example_message" msgid="1838650097090632706">"Une al menos cuatro puntos."\n" "\n"Toca en \"Siguiente\" cuando estés preparado para crear tu propio patrón."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Administrar aplicaciones"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Administrar y eliminar aplicaciones instaladas"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Aplicaciones"</string>
@@ -602,12 +643,12 @@
     <string name="filter" msgid="2018011724373033887">"Filtrar"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Seleccionar opciones de filtrado"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Todas"</string>
-    <string name="filter_apps_third_party" msgid="1096017647285183437">"Externas"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Descargada"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"En ejecución"</string>
     <string name="loading" msgid="3200408047793887917">"Cargando..."</string>
     <string name="recompute_size" msgid="7722567982831691718">"Recalculando tamaño..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Suprimir"</string>
-    <string name="clear_data_dlg_text" msgid="8796694785488630642">"Toda la información que hayas guardado en la aplicación se eliminará permanentemente."</string>
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"Todos los datos de la aplicación se eliminarán de forma permanente, incluidos todos los archivos, la configuración, las cuentas, las bases de datos, etc."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"Aceptar"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Cancelar"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"No se ha encontrado la aplicación."</string>
@@ -620,9 +661,23 @@
     <string name="security_settings_desc" msgid="3116027624526915561">"Esta aplicación puede acceder a los siguientes elementos del teléfono:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Calculando…"</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"No se ha podido calcular el tamaño del paquete."</string>
-    <string name="empty_list_msg" msgid="1883660401486953588">"No tienes instalada ninguna aplicación externa."</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"No tienes instalada ninguna aplicación externa."</string>
     <string name="version_text" msgid="9189073826278676425">"versión <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
-    <string name="language_settings" msgid="2939555761536357092">"Idioma y país"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicios en ejecución"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Ver y controlar los servicios en ejecución"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"Reiniciando"</string>
+    <string name="no_running_services" msgid="6981216347270280598">"No hay servicios en ejecución."</string>
+    <string name="confirm_stop_service" msgid="5700448757318301681">"¿Quieres detener el servicio?"</string>
+    <string name="confirm_stop_service_msg" msgid="1202118456282395730">"El servicio no se ejecutará hasta que se vuelva a iniciar, lo que puede provocar consecuencias no deseadas en la aplicación <xliff:g id="APPLICATION">%1$s</xliff:g>."</string>
+    <string name="confirm_stop_stop" msgid="7382363913280993331">"Detener"</string>
+    <string name="confirm_stop_cancel" msgid="206495326622692381">"Cancelar"</string>
+    <string name="service_started_by_app" msgid="8432097226392386802">"Iniciado por la aplicación: tocar para detener"</string>
+    <string name="service_client_name" msgid="2337664610975074717">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: tocar para administrar"</string>
+    <string name="service_background_processes" msgid="5158600475629177758">"Disp.: <xliff:g id="FREE">%2$s</xliff:g>+<xliff:g id="MEMORY">%3$s</xliff:g> en <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_foreground_processes" msgid="4013890350284680796">"Otros: <xliff:g id="MEMORY">%2$s</xliff:g> en <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_process_name" msgid="8630408984456958400">"Proceso: <xliff:g id="PROCESS">%1$s</xliff:g>"</string>
+    <string name="language_settings" msgid="502219872342167227">"Idioma y teclado"</string>
+    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Configuración de teclado y de idioma"</string>
     <string name="language_settings_summary" msgid="595647729475399987">"Configuración local, opciones de autocorrección e introducción de texto"</string>
     <string name="language_category" msgid="3391756582724541530">"Configuración local"</string>
     <string name="text_category" msgid="6342540511465136739">"Configuración de texto"</string>
@@ -637,7 +692,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Pulsa la barra espaciadora dos veces para insertar el carácter \".\""</string>
     <string name="show_password" msgid="2198798062604049206">"Contraseñas visibles"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Mostrar contraseña mientras se escribe"</string>
-    <string name="ime_security_warning" msgid="3458652708716006477">"Este método de introducción de texto puede registrar todo lo que escribas, incluidos datos personales como las contraseñas y los números de las tarjetas de crédito. Procede de la aplicación <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. ¿Deseas habilitar este método de introducción?"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"Este método de introducción de texto puede registrar todo lo que escribas, incluidos datos personales, como las contraseñas y los números de las tarjetas de crédito. Procede de la aplicación <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. ¿Deseas utilizar este método de introducción de texto?"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diccionario del usuario"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"Diccionario del usuario"</string>
     <string name="user_dict_settings_summary" msgid="2460427065601355471">"Añadir y eliminar palabras del diccionario del usuario"</string>
@@ -665,7 +720,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Introducción de texto"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Administrar opciones de introducción de texto"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Configuración de <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="4919680715154885028">"Configuración del teclado en pantalla"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Configuración de teclado en pantalla"</string>
     <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Teclado del dispositivo"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Configuración del teclado integrado"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Desarrollo"</string>
@@ -676,11 +731,11 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla nunca entra en modo de suspensión durante la carga"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Ubicaciones simuladas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubicaciones simuladas"</string>
-    <string name="adb_warning_title" msgid="1756027479229533250">"¿Quieres habilitar la depuración USB?"</string>
+    <string name="adb_warning_title" msgid="6234463310896563253">"¿Permitir depuración USB?"</string>
     <string name="adb_warning_message" msgid="5352555112049663033">"La depuración USB sólo está indicada para actividades de desarrollo. Se puede utilizar para intercambiar datos entre el equipo y el dispositivo, para instalar aplicaciones en el dispositivo sin recibir notificaciones y para leer datos de registro."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Seleccionar gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Seleccionar widget"</string>
-    <string name="battery_history_details_for" msgid="5189636461798594740">"Detalles del ID único %d"</string>
+    <string name="battery_history_details_for" msgid="5924639922153109669">"Detalles del ID único <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="battery_history_uid" msgid="1016606150528436298">"ID único <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage" msgid="8010852371665217020">"Detalles de uso de red para <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
     <string name="battery_history_bytes_received" msgid="980307569180518302">"Bytes recibidos: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
@@ -716,12 +771,13 @@
     <string name="app_name_label" msgid="2000949925256858308">"Aplicación"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"Número"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Tiempo de uso"</string>
-    <string name="accessibility_settings_title" msgid="4239640930601071058">"Accesibilidad"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"Accesibilidad"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Configuración de accesibilidad"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Administrar opciones de accesibilidad"</string>
     <string name="toggle_accessibility_title" msgid="650839277066574497">"Accesibilidad"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Servicios de accesibilidad"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"No hay instalado ningún servicio de accesibilidad."</string>
-    <string name="accessibility_service_security_warning" msgid="8386156287296967181">"Este servicio de accesibilidad puede recopilar todo el texto que escribas, desde datos personales hasta números de tarjetas de crédito, a excepción de las contraseñas. También puede registrar las interacciones con la interfaz de usuario. Procede de la aplicación <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. ¿Quieres habilitar ese servicio de accesibilidad?"</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Este servicio de accesibilidad puede recopilar todo lo que escribas, desde datos personales hasta números de tarjetas de crédito, a excepción de las contraseñas. También puede registrar las interacciones con la interfaz de usuario. Procede de la aplicación <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. ¿Quieres utilizar este servicio de accesibilidad?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"¿Quieres inhabilitar la accesibilidad?"</string>
     <string name="power_usage_summary_title" msgid="5180282911164282324">"Uso de la batería"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Qué ha estado utilizando la batería"</string>
@@ -733,7 +789,7 @@
     <string name="awake" msgid="387122265874485088">"Tiempo de actividad del dispositivo"</string>
     <string name="wifi_on_time" msgid="4630925382578609056">"Tiempo de conexión WiFi"</string>
     <string name="bluetooth_on_time" msgid="4478515071957280711">"Tiempo de conexión WiFi"</string>
-    <string name="usage_name_percent" msgid="1899151069711662289">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="PERCENT">%2$s</xliff:g>%%"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Detalles de uso de la batería"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalles de uso"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Ajustar uso de la batería"</string>
@@ -769,7 +825,7 @@
     <string name="battery_desc_wifi" msgid="1702486494565080431">"Batería utilizada por la conexión Wi-Fi"</string>
     <string name="battery_sugg_wifi" msgid="7542345142282261691">"Desactiva la conexión Wi-Fi cuando no la estés utilizando o cuando no esté disponible."</string>
     <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Batería utilizada por Bluetooth"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="144393178427277439">"Desactiva el Bluetooth cuando no lo estés utilizando."</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Desactiva el Bluetooth cuando no lo estés utilizando."</string>
     <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Intenta conectarte a un dispositivo Bluetooth diferente."</string>
     <string name="battery_desc_apps" msgid="8123202939321333639">"Batería utilizada por aplicaciones en ejecución"</string>
     <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Detener o desinstalar la aplicación"</string>
@@ -781,9 +837,9 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Actualizar"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Sistema operativo de Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor multimedia"</string>
-    <string name="tts_settings" msgid="6454363854545277027">"Síntesis de voz"</string>
+    <string name="tts_settings" msgid="3348626948015962987">"Síntesis de voz"</string>
     <string name="tts_settings_summary" msgid="2627715231944602766">"Establecer opciones de síntesis de voz"</string>
-    <string name="tts_settings_title" msgid="5064947197040356736">"Controles del sintetizador de voz"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Configuración de síntesis de voz"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Utilizar siempre mi configuración"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"La configuración predeterminada que aparece a continuación anula la configuración de la aplicación."</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Configuración predeterminada"</string>
@@ -801,8 +857,11 @@
     <string name="tts_demo" msgid="405357591189935876">"Este es un ejemplo de síntesis de voz."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Tu configuración ha cambiado. Este es un ejemplo de cómo suena."</string>
     <string name="gadget_title" msgid="7455548605888590466">"Control de energía"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Actualización de la configuración de la conexión Wi-Fi"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Actualización de la configuración de la conexión Bluetooth"</string>
+    <string name="credential_installer_activity_title" msgid="7600661521831762521">"Instalador de credenciales"</string>
     <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Configuración de red VPN"</string>
-    <string name="vpn_connect_to" msgid="9040615733700098831">"Establecer conexión con %s"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"Establecer conexión con <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="vpn_username_colon" msgid="7854930370861306247">"Nombre de usuario:"</string>
     <string name="vpn_password_colon" msgid="5716278710848606626">"Contraseña:"</string>
     <string name="vpn_a_username" msgid="6664733641993968692">"un nombre de usuario"</string>
@@ -820,9 +879,9 @@
     <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Desconectar de la red"</string>
     <string name="vpn_menu_edit" msgid="4526245173583195618">"Editar red"</string>
     <string name="vpn_menu_delete" msgid="3326527392609513129">"Eliminar red"</string>
-    <string name="vpn_error_miss_entering" msgid="1467455143582547499">"Debes introducir %s."</string>
-    <string name="vpn_error_miss_selecting" msgid="953436717902387192">"Debes seleccionar %s."</string>
-    <string name="vpn_error_duplicate_name" msgid="2786397299628471911">"El nombre de la red VPN \"%s\" ya existe. Utiliza otro."</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Debes introducir <xliff:g id="CODE">%s</xliff:g>."</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Debes seleccionar <xliff:g id="OPTION">%s</xliff:g>."</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"El nombre de red VPN \"<xliff:g id="NAME">%s</xliff:g>\" ya existe. Utiliza otro."</string>
     <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"¿Estás seguro de que quieres eliminar esta red VPN?"</string>
     <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"¿Estás seguro de que no quieres crear este perfil?"</string>
     <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"¿Estás seguro de que quieres descartar los cambios realizados en este perfil?"</string>
@@ -833,10 +892,12 @@
     <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Faltan uno o varios secretos en la configuración de esta VPN. ¿Deseas comprobar tu configuración secreta?"</string>
     <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"El nombre de usuario o la contraseña introducidos no son correctos. ¿Quieres intentarlo de nuevo?"</string>
     <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"El servidor se ha bloqueado. Es posible que la contraseña o el nombre de usuario introducidos sean incorrectos. ¿Deseas volver a intentarlo?"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"El servidor se ha bloqueado. Es posible que tengas activado un cortafuegos que impide la conexión al servidor. ¿Quieres volver a intentarlo?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Error de negociación con el servidor. Es posible que el servidor no acepte tu opción de encriptación. ¿Quieres comprobar tus valores de configuración de la encriptación?"</string>
     <string name="vpn_type_title" msgid="6392933604218676224">"Añadir VPN"</string>
     <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Añadir VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2550661826320709266">"Añadir VPN %s"</string>
-    <string name="vpn_edit_title_edit" msgid="1769999313158207723">"Detalles de %s"</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Añadir red VPN \"<xliff:g id="NAME">%s</xliff:g>\""</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Detalles de <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="vpns" msgid="3148141862835492816">"Redes VPN"</string>
     <string name="vpn_connecting" msgid="8039521381692090116">"Estableciendo conexión..."</string>
     <string name="vpn_disconnecting" msgid="7748050200708257066">"Desconectando..."</string>
@@ -844,8 +905,8 @@
     <string name="vpn_connect_hint" msgid="7442898962925875181">"Establecer conexión con red"</string>
     <string name="vpn_name" msgid="1550918148476193076">"Nombre de VPN"</string>
     <string name="vpn_a_name" msgid="8445736942405283509">"un nombre de VPN"</string>
-    <string name="vpn_profile_added" msgid="2157095890825215726">"%s añadido"</string>
-    <string name="vpn_profile_replaced" msgid="384234123486734768">"Los cambios se han aplicado en %s."</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"Se ha añadido \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"Los cambios se han aplicado a \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Establecer certificado de usuario"</string>
     <string name="vpn_user_certificate" msgid="949322691686938888">"Certificado de usuario"</string>
     <string name="vpn_a_user_certificate" msgid="8943983437956898649">"un certificado de usuario"</string>
@@ -866,53 +927,53 @@
     <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Nombre de servidor VPN"</string>
     <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Dominios de búsqueda DNS"</string>
     <string name="vpn_dns_search_list" msgid="4230034234026605360">"Dominios de búsqueda de DNS"</string>
-    <string name="vpn_field_is_set" msgid="1880980734721258127">"%s se ha establecido."</string>
-    <string name="vpn_field_not_set" msgid="6827205815004809490">"%s no se ha definido."</string>
-    <string name="vpn_field_not_set_optional" msgid="8665901697706781015">"No se ha establecido %s (opcional)."</string>
-    <string name="vpn_enable_field" msgid="3348948489989523325">"Habilitar %s"</string>
-    <string name="vpn_disable_field" msgid="2286966253789266389">"Inhabilitar %s"</string>
-    <string name="vpn_is_enabled" msgid="5128973727115662815">"%s se ha habilitado."</string>
-    <string name="vpn_is_disabled" msgid="8028085699769751756">"%s se ha inhabilitado."</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"Se ha establecido el valor \"<xliff:g id="VALUE">%s</xliff:g>\"."</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"No se ha establecido el valor \"<xliff:g id="VALUE">%s</xliff:g>\"."</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"No se ha establecido el valor \"<xliff:g id="VALUE">%s</xliff:g>\" (opcional)."</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"Habilitar <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"Inhabilitar <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"Se ha habilitado <xliff:g id="OPTION">%s</xliff:g>."</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"Se ha inhabilitado <xliff:g id="OPTION">%s</xliff:g>."</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Configuración de red VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Configurar y administrar redes privadas virtuales (VPN)"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(sin modificar)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(sin definir)"</string>
-    <string name="cstor_settings_category" msgid="2284299080682591107">"Almacenamiento de credenciales"</string>
-    <string name="cstor_access_title" msgid="1739505390736236717">"Utilizar credenciales seguras"</string>
-    <string name="cstor_access_summary" msgid="4512681868217546677">"Permitir que las aplicaciones accedan a los certificados seguros y a otras credenciales"</string>
-    <string name="cstor_access_dialog_title" msgid="3024256293191879190">"Introducir contraseña"</string>
-    <string name="cstor_access_dialog_hint_from_action" msgid="679746865623760961">"Introduce la contraseña de almacenamiento de credenciales."</string>
-    <string name="cstor_set_passwd_title" msgid="6156763762703061470">"Establecer contraseña"</string>
-    <string name="cstor_set_passwd_summary" msgid="5248560429856597398">"Establecer o cambiar la contraseña de almacenamiento de credenciales"</string>
-    <string name="cstor_set_passwd_dialog_title" msgid="4071157542842979977">"Establecer contraseña"</string>
-    <string name="cstor_reset_title" msgid="6001600882136794382">"Borrar almacenamiento"</string>
-    <string name="cstor_reset_summary" msgid="7509525030771504833">"Borrar almacenamiento de credenciales de todo el contenido y restablecer su contraseña"</string>
-    <string name="cstor_reset_hint" msgid="5331632794451859788">"¿Estás seguro de que quieres eliminar todas las credenciales y restablecer la contraseña de almacenamiento de credenciales?"</string>
-    <string name="cstor_name_credential_dialog_title" msgid="1723509156126180662">"Nombre del certificado"</string>
-    <string name="cstor_credential_name" msgid="2958936431813760259">"Nombre del certificado:"</string>
-    <string name="cstor_credential_password" msgid="7187440553141199409">"Contraseña para extraer el certificado:"</string>
-    <string name="cstor_credential_info" msgid="6097346149400207440">"Detalles del certificado:"</string>
-    <string name="cstor_name_credential_hint" msgid="6889198058976515785">"El nombre sólo puede contener letras y números."</string>
-    <string name="cstor_old_password" msgid="979282118063084561">"Contraseña actual:"</string>
-    <string name="cstor_new_password" msgid="6218562692435670047">"Contraseña nueva:"</string>
-    <string name="cstor_confirm_password" msgid="8996028123356342466">"Confirmar contraseña nueva:"</string>
-    <string name="cstor_first_time_hint" msgid="1831593416099224962">"Establece una contraseña para el almacenamiento de credenciales."</string>
-    <string name="cstor_first_time_hint_from_action" msgid="4690937025845780557">"Establece una contraseña para el almacenamiento de credenciales."</string>
-    <string name="cstor_password_error" msgid="2917326097260402464">"Introduce la contraseña correcta."</string>
-    <string name="cstor_password_error_reset_warning" msgid="3336370539045905953">"Introduce la contraseña correcta. Dispones de un intento más para introducir la contraseña antes de que se borre el almacenamiento de credenciales."</string>
-    <string name="cstor_password_error_reset_warning_plural" msgid="6209069679269017200">"Introduce la contraseña correcta. Dispones de %d intentos más para introducir la contraseña antes de que se borre el almacenamiento de credenciales."</string>
-    <string name="cstor_passwords_error" msgid="956773958408751155">"Las contraseñas no coinciden."</string>
-    <string name="cstor_passwords_empty_error" msgid="6062539742626760734">"Debes introducir una contraseña y confirmarla."</string>
-    <string name="cstor_password_empty_error" msgid="7249632576906961482">"Introduce la contraseña."</string>
-    <string name="cstor_password_verification_error" msgid="8553930704493511389">"Introduce la contraseña de nuevo. La contraseña debe tener al menos 8 caracteres y no debe contener espacios."</string>
-    <string name="cstor_name_empty_error" msgid="7499971191993770322">"Introduce un nombre."</string>
-    <string name="cstor_name_char_error" msgid="8048089317968192516">"Introduce un nombre que contenga sólo letras y números."</string>
-    <string name="cstor_storage_error" msgid="7140697503172458161">"No es posible guardar el certificado. Haz clic en \"Aceptar\" para intentarlo de nuevo."</string>
-    <string name="cstor_unable_to_save_cert" msgid="1631402544447196406">"No se ha podido guardar el certificado. El almacenamiento de credenciales no está permitido o no se ha inicializado correctamente."</string>
-    <string name="cstor_cert_not_saved" msgid="6318149789449538491">"No se ha guardado el certificado."</string>
-    <string name="cstor_is_reset" msgid="449870501126790589">"Se ha borrado el almacenamiento de credenciales."</string>
-    <string name="cstor_is_enabled" msgid="4054049098081482785">"El almacenamiento de credenciales está habilitado."</string>
-    <string name="cstor_is_added" msgid="794788474010251572">"Se ha añadido %s."</string>
+    <string name="credentials_category" msgid="8536992056377271234">"Almacenamiento de credenciales"</string>
+    <string name="credentials_access" msgid="4843187230913860492">"Utilizar credenciales seguras"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"Permitir que las aplicaciones accedan a los certificados seguros y a otras credenciales"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"Introducir contraseña"</string>
+    <string name="credentials_unlock_hint" msgid="594679530407918031">"Introduce la contraseña de almacenamiento de credenciales."</string>
+    <string name="credentials_install_certificates" msgid="177337517568022236">"Instalar desde la tarjeta SD"</string>
+    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Instalar certificados encriptados de tarjeta SD"</string>
+    <string name="credentials_set_password" msgid="9104473585811899989">"Establecer contraseña"</string>
+    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Establecer o cambiar la contraseña de almacenamiento de credenciales"</string>
+    <string name="credentials_reset" msgid="9170150870552453457">"Borrar almacenamiento"</string>
+    <string name="credentials_reset_summary" msgid="1530388094693731636">"Borrar almacenamiento de credenciales de todo el contenido y restablecer su contraseña"</string>
+    <string name="credentials_reset_hint" msgid="819990295796804516">"¿Estás seguro de que quieres eliminar todas las credenciales y restablecer la contraseña de almacenamiento de credenciales?"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"Contraseña actual:"</string>
+    <string name="credentials_new_password" msgid="267487774686796938">"Contraseña nueva:"</string>
+    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmar contraseña nueva:"</string>
+    <string name="credentials_first_time_hint" msgid="1567821077545346039">"Establece una contraseña para el almacenamiento de credenciales (ocho caracteres como mínimo)."</string>
+    <string name="credentials_wrong_password" msgid="7525192410790152041">"Introduce la contraseña correcta."</string>
+    <string name="credentials_reset_warning" msgid="6392481296673345268">"Introduce la contraseña correcta. Dispones de un intento más para introducir la contraseña antes de que se borre el almacenamiento de credenciales."</string>
+    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Introduce la contraseña correcta. Dispones de <xliff:g id="NUMBER">%1$d</xliff:g> intentos más para introducir la contraseña antes de que se borre el almacenamiento de credenciales."</string>
+    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Las contraseñas no coinciden."</string>
+    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Debes introducir una contraseña y confirmarla."</string>
+    <string name="credentials_password_empty" msgid="8292138152983330473">"Introduce la contraseña."</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"La contraseña debe tener un mínimo de ocho caracteres."</string>
+    <string name="credentials_erased" msgid="7700309135582200849">"Se ha borrado el almacenamiento de credenciales."</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"Almacenamiento de credenciales habilitado"</string>
+    <string name="credentials_disabled" msgid="7453188089059045380">"Almacenamiento de credenciales inhabilitado"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tono de emergencia"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Establecer comportamiento al realizar una llamada de emergencia"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Privacidad"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Configuración de privacidad"</string>
+    <string name="location_section_title" msgid="6072558684044939786">"Ubicación"</string>
+    <string name="settings_section_title" msgid="7413252428447723032">"Configuración"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Datos personales"</string>
+    <string name="backup_settings_title" msgid="2968262658155327829">"Realizar copia de seguridad de mi configuración"</string>
+    <string name="backup_erase_dialog_title" msgid="6028429904055779443">"Copia de seguridad de la configuración"</string>
+    <string name="backup_erase_dialog_message" msgid="9096433810456900531">"¿Estás seguro de que quieres detener la copia de seguridad de tu configuración y borrar todas las copias de los servidores de Google?"</string>
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 7f99702d9d9..123bf2bd9ea 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -24,13 +24,23 @@
     <item msgid="5345178126174698955">"Pacifique"</item>
     <item msgid="8392017019801393511">"Tous"</item>
   </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"Aucune animation"</item>
+    <item msgid="6291186755504776720">"Quelques animations"</item>
+    <item msgid="3856065399819979491">"Toutes les animations"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"Aucune animation n\'est affichée."</item>
+    <item msgid="4460915688877708508">"Certaines animations sont affichées."</item>
+    <item msgid="488968798204105119">"Toutes les animations sont affichées."</item>
+  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 secondes"</item>
     <item msgid="8881760709354815449">"30 secondes"</item>
     <item msgid="7589406073232279088">"1 minute"</item>
     <item msgid="7001195990902244174">"2 minutes"</item>
     <item msgid="5721688686241190620">"10 minutes"</item>
-    <item msgid="1781492122915870416">"Ne jamais désactiver"</item>
+    <item msgid="7156442995039264948">"30 minutes"</item>
   </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Très lente"</item>
@@ -58,18 +68,14 @@
     <item msgid="2923732046112398627">"Automatique"</item>
     <item msgid="5434666299123318296">"Aucune"</item>
     <item msgid="3159594845889645948">"WEP"</item>
-    <item msgid="6303607119537134095">"WPA-PSK"</item>
-    <item msgid="1977424472734732392">"WPA2-PSK"</item>
-    <item msgid="5185669984217684689">"WPA-EAP"</item>
-    <item msgid="8643206823103498303">"IEEE 802.1x"</item>
+    <item msgid="1687348101566181433">"WPA/WPA2 PSK"</item>
+    <item msgid="329777238762866787">"802.1x Enterprise"</item>
   </string-array>
   <string-array name="wifi_security_without_auto_entries">
     <item msgid="4402120432904877907">"Aucun"</item>
     <item msgid="2329148995431627488">"WEP"</item>
-    <item msgid="2296204649410509235">"WPA-PSK"</item>
-    <item msgid="8928468573279595315">"WPA2-PSK"</item>
-    <item msgid="8319241197948974314">"WPA-EAP"</item>
-    <item msgid="2222409752754955757">"IEEE 802.1x"</item>
+    <item msgid="6903317668294332381">"WPA/WPA2 PSK"</item>
+    <item msgid="7280821339307729710">"802.1x Enterprise"</item>
   </string-array>
   <string-array name="wifi_wep_type">
     <item msgid="1497433962958697183">"Automatique"</item>
@@ -108,7 +114,7 @@
     <item msgid="1818786254010764570">"Aucun"</item>
     <item msgid="6189918678874123056">"PAP"</item>
     <item msgid="1524112260493662517">"MSCHAP"</item>
-    <item msgid="1586767102985419413">"MSCHAP2"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
@@ -116,4 +122,10 @@
     <item msgid="3165868966179561687">"Alerte"</item>
     <item msgid="6038758039030476855">"Vibreur"</item>
   </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"Aucune"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP ou CHAP"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 016298aab4a..daafb843fb2 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -15,6 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"Oui"</string>
+    <string name="no" msgid="6731231425810196216">"Non"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Inconnu"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Allumer le signal radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Éteindre le signal radio"</string>
@@ -56,6 +58,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
     <string name="sdcard_setting" msgid="5922637503871474866">"Carte SD"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"État de la batterie :"</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"Prise électrique :"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Batterie :"</string>
     <string name="battery_info_level_label" msgid="8706526709307788737">"Niveau de la batterie :"</string>
     <string name="battery_info_health_label" msgid="6416051542741886958">"État de la batterie :"</string>
@@ -75,6 +78,11 @@
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"Baisse du niveau de charge"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Débranchée"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Chargée"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Débranché"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"CA + USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"Inconnu"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Inconnu"</string>
     <string name="battery_info_health_good" msgid="8070356565806711806">"Bon"</string>
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"Surchauffe"</string>
@@ -104,6 +112,12 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Demande d\'association Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Demande d\'association"</string>
     <string name="bluetooth_notif_message" msgid="5381418499788668724">"Sélectionner pour associer à "</string>
+    <string name="device_picker" msgid="8721012448931226323">"Sélecteur de périphérique Bluetooth"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Demande d\'autorisation Bluetooth"</string>
+    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Une application sur votre téléphone demande l\'autorisation d\'activer Bluetooth. Voulez-vous l\'activer ?"</string>
+    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Une application sur votre téléphone demande l\'autorisation d\'activer la fonction de détection de votre téléphone par d\'autres appareils Bluetooth pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Voulez-vous l\'activer ?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Une application sur votre téléphone demande l\'autorisation d\'activer Bluetooth et de permettre à d\'autres appareils de détecter votre téléphone pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Voulez-vous l\'activer ?"</string>
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Activation de Bluetooth…"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Paramètres d\'heure et de date"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13:00 h"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -196,7 +210,8 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Désactiver toutes les connexions sans fil"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Désactivation des connexions sans fil…"</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Activation des connexions sans fil…"</string>
-    <string name="radio_controls_title" msgid="8356991079873437337">"Connexions sans fil"</string>
+    <string name="radio_controls_title" msgid="5868688473587168882">"Sans fil et réseaux"</string>
+    <string name="wireless_networks_settings_title" msgid="149274247949769551">"Paramètres sans fil et réseau"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Configurer le Wi-Fi, le mode Bluetooth, le mode Avion, les réseaux mobiles et le VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Itinérance des données"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Se connecter aux services de données lors de l\'itinérance"</string>
@@ -219,20 +234,29 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Sélectionner format de date"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Trier par ordre alphabétique"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Trier par fuseau horaire"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"Sécurité et localisation"</string>
+    <string name="security_settings_title" msgid="5168491784222013179">"Lieu et sécurité"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"Paramètres de sécurité et localisation"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Définir Ma position, le déverrouillage de l\'écran et le blocage des informations d\'identification stockées"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mots de passe"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activer Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Paramètres Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Paramètres Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Gérer les connexions, configurer le nom et l\'identification de l\'appareil"</string>
-    <string name="bluetooth_pin_entry" msgid="5627349871303455279">"Demande d\'association Bluetooth"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Demande d\'association Bluetooth"</string>
     <string name="bluetooth_device_info" msgid="6644515376523965073">"Informations sur l\'appareil Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="7551139612735632370">"<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_enter_pin_msg" msgid="856962526754150334">\n"Saisissez le code PIN pour associer l\'appareil à \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Essayez avec 0000 ou 1234.)"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Saisissez la clé d\'accès pour effectuer l\'association avec \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Avant de se connecter à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, vérifier qu\'il affiche la clé d\'accès : <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"souhaite effectuer l\'association."</string>
+    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Entrez <xliff:g id="PASSKEY">%2$s</xliff:g> sur \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" pour effectuer l\'association."</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Se connecter"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Ne pas se connecter"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"Périphérique Bluetooth"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Attention"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Un problème est survenu lors de l\'association à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="6938408362011024289">"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_pairing_pin_error_message" msgid="6065697229258906937">"Un problème est survenu lors de l\'association à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, car la clé d\'accès ou le code secret saisi est incorrect."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"Impossible d\'établir la communication avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Association refusée par <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Un problème est survenu lors de la connexion à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
@@ -246,6 +270,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Se connecter à…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Multimédia"</string>
     <string name="bluetooth_profile_headset" msgid="1874975688666658946">"Téléphone"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Transfert"</string>
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Connecté aux paramètres audio du média"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Connecté aux paramètres audio du téléphone"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Connecté aux paramètres audio du téléphone et du média"</string>
@@ -255,8 +280,11 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profils"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connecté aux paramètres audio du média"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connecté aux paramètres audio du téléphone"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connexion au serveur de transfert de fichiers"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Connexion au serveur de transfert de fichiers non établie"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utiliser pour les paramètres audio du média"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utiliser pour les paramètres audio du téléphone"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utiliser pour le transfert de fichiers"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activer le Wi-Fi"</string>
@@ -273,17 +301,13 @@
     <string name="security" msgid="1040691896987225267">"Sécurité"</string>
     <string name="wifi_security_open" msgid="3513305614048816607">"Ouvrir"</string>
     <string name="wifi_security_wep" msgid="7082604129842065776">"WEP"</string>
-    <string name="wifi_security_wpa" msgid="8980169410565477162">"WPA"</string>
-    <string name="wifi_security_wpa2" msgid="5780665935088930524">"WPA2"</string>
-    <string name="wifi_security_wpa_eap" msgid="7485687331651751101">"WPA-EAP"</string>
-    <string name="wifi_security_ieee8021x" msgid="8538687609878109005">"IEEE8021X"</string>
+    <string name="wifi_security_psk" msgid="3392399380570381452">"WPA/WPA2 PSK"</string>
+    <string name="wifi_security_eap" msgid="8309434150934969132">"Entreprise (802.1x)"</string>
     <string name="wifi_security_unknown" msgid="4564208312073060668">"Inconnu"</string>
     <string name="wifi_security_verbose_open" msgid="8117878112088901945">"réseau ouvert"</string>
     <string name="wifi_security_verbose_wep" msgid="9220757688700421508">"sécurisé par clé WEP"</string>
-    <string name="wifi_security_verbose_wpa" msgid="598697674252714455">"sécurisé par WPA"</string>
-    <string name="wifi_security_verbose_wpa2" msgid="4116236883347875722">"sécurisé par WPA2"</string>
-    <string name="wifi_security_verbose_wpa_eap" msgid="1984821646949066624">"sécurisé par WPA-EAP"</string>
-    <string name="wifi_security_verbose_ieee8021x" msgid="5552995793910186310">"sécurisé par IEEE 802.1x"</string>
+    <string name="wifi_security_verbose_psk" msgid="1110130025330416225">"sécurisé via WPA/WPA2 PSK"</string>
+    <string name="wifi_security_verbose_eap" msgid="586632662086063">"sécurisé par 802.1x EAP"</string>
     <string name="ip_address" msgid="850672263358989449">"Adresse IP"</string>
     <string name="signal" msgid="1947969631626413228">"Intensité du signal"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"Activation…"</string>
@@ -302,14 +326,13 @@
     <string name="please_type_anonymous_identity" msgid="835061562079965048">"Anonyme"</string>
     <string name="please_select_client_certificate" msgid="2137906961594663234">"Certificat client"</string>
     <string name="please_select_ca_certificate" msgid="5010815181914420677">"Certificat CA"</string>
-    <string name="please_type_private_key_passwd" msgid="4077744679722504443">"Mot de passe de clé privée"</string>
     <string name="please_type_passphrase" msgid="8256017704131522462">"Mot de passe sans fil"</string>
     <string name="please_type_hex_key" msgid="8751224390407867551">"Touche hex WEP (0-9, A-F)"</string>
     <string name="wifi_show_password" msgid="4235237470701732009">"Afficher le mot de passe"</string>
     <string name="scan_wifi" msgid="2459901725350542606">"Rechercher"</string>
     <string name="summary_not_in_range" msgid="3926674700733548684">"Hors de portée"</string>
     <string name="summary_remembered" msgid="6079941090549401742">"enregistré"</string>
-    <string name="summary_connection_failed" msgid="7610394657613410489">"Échec de la connexion. Sélectionnez cette option pour réessayer."</string>
+    <string name="summary_connection_failed" msgid="2351885658101671413">"Échec de la connexion. Appuyez dessus pour réessayer."</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Réseaux Wi-Fi"</string>
     <string name="wifi_type_ssid" msgid="1326839657083292017">"SSID du réseau"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sécurité"</string>
@@ -360,6 +383,7 @@
     <string name="status_disconnected" msgid="7561688569905126046">"Déconnecté"</string>
     <string name="status_failed" msgid="610462050405904601">"Échec"</string>
     <string name="sound_and_display_settings" msgid="349770582993029003">"Sons et affichage"</string>
+    <string name="sound_and_display_settings_title" msgid="5036144539683697330">"Paramètres des sons et affichages"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Paramètres sonores"</string>
     <string name="sound_and_display_settings_summary" msgid="1433943789593286064">"Configurer les sonneries, les notifications et la luminosité"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Mode silencieux"</string>
@@ -385,11 +409,14 @@
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"Sélections audibles"</string>
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Jouer un son lors des sélections à l\'écran"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Jouer un son lors des sélections à l\'écran"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Commentaire haptique"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrer lors de la sélection des touches programmables et lors de certaines interactions avec l\'interface utilisateur"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrer lors de la sélection des touches programmables et lors de certaines interactions avec l\'interface utilisateur"</string>
     <string name="play_media_notification_sounds_enable_title" msgid="1008791464029179529">"Notifications carte SD"</string>
     <string name="play_media_notification_sounds_enable_summary_on" msgid="7675466959375667370">"Émettre un son pour les notifications de la carte SD"</string>
     <string name="play_media_notification_sounds_enable_summary_off" msgid="8672617597028744693">"Émettre un son pour les notifications de la carte SD"</string>
-    <string name="sync_settings" msgid="2212736205476453234">"Synchro. des données"</string>
-    <string name="sync_settings_summary" msgid="6480534906375217074">"Sélectionner les applications à synchroniser"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Comptes et synchronisation"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"Ajouter ou supprimer des comptes et modifier leurs paramètres"</string>
     <string name="search_settings" msgid="1910951467596035063">"Recherche"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Configurer les paramètres et l\'historique de recherche"</string>
     <string name="display_settings" msgid="3912042046350078328">"Paramètres d\'affichage"</string>
@@ -403,6 +430,7 @@
     <string name="brightness_summary" msgid="838917350127550703">"Régler la luminosité de l\'écran"</string>
     <string name="screen_timeout" msgid="4882669461447531301">"Mise en veille de l\'écran"</string>
     <string name="screen_timeout_summary" msgid="2905757633140605334">"Définir le délai avant la mise hors tension automatique de l\'écran"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Paramètres de blocage carte SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configurer blocage SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Blocage de la carte SIM"</string>
@@ -436,7 +464,8 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"État"</string>
     <string name="device_status" msgid="607405385799807324">"État"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Numéro de téléphone, signal, etc."</string>
-    <string name="storage_settings_title" msgid="8461515684514801302">"Carte SD et mémoire"</string>
+    <string name="storage_settings" msgid="6681164315506788024">"Carte SD et mémoire"</string>
+    <string name="storage_settings_title" msgid="5379463509034022773">"Carte SD et paramètres de mémoire du téléphone"</string>
     <string name="storage_settings_summary" msgid="9176693537325988610">"Retirer la carte SD, afficher la mémoire disponible"</string>
     <string name="status_number" msgid="5123197324870153205">"Mon numéro de téléphone"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
@@ -480,6 +509,11 @@
     <string name="apn_mms_port" msgid="4074188088199243040">"Port MMS"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"Type d\'authentification"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Aucune"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP ou CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Type d\'APN (nom du point d\'accès)"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Supprimer l\'APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nouvel APN"</string>
@@ -518,12 +552,15 @@
     <string name="location_network_based" msgid="8815705866861993344">"Utiliser réseaux sans fil"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Afficher position dans les applications (comme Google Maps)"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Position géographique déterminée par réseaux Wi-Fi et/ou mobile"</string>
-    <string name="location_gps" msgid="375912731641377120">"Activer les satellites GPS"</string>
-    <string name="location_street_level" msgid="5899941752252356344">"Localisation précise au niveau de la rue lors du positionnement géographique (désélectionner pour économiser la batterie)"</string>
+    <string name="location_gps" msgid="6296125378829097831">"Utiliser les satellites GPS"</string>
+    <string name="location_street_level" msgid="6460740847018275745">"Localisation précise au niveau de la rue lors du positionnement géographique (désélectionner pour économiser la batterie)"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Localiser au niveau rue (requiert + de batterie et une vue dégagée)"</string>
-    <string name="use_location_title" msgid="7585990952633568732">"Partager avec Google"</string>
-    <string name="use_location_summary" msgid="4411467143899877395">"Autoriser Google à utiliser vos informations de localisation pour améliorer l\'efficacité des recherches et des autres services Google"</string>
-    <string name="use_location_warning_message" msgid="5696732842038416151">"Autoriser Google à utiliser vos informations de localisation pour améliorer l\'efficacité des recherches et des autres services Google"</string>
+    <string name="assisted_gps" msgid="4649317129586736885">"Utiliser le GPS assisté"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utiliser le serveur pour assister le GPS (désactiver pour réduire l\'utilisation du réseau)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utiliser le serveur pour assister le GPS (désactiver pour améliorer les performances du GPS)"</string>
+    <string name="use_location_title" msgid="5447030582538504247">"Utiliser ma position"</string>
+    <string name="use_location_summary" msgid="1816849484040070431">"Utiliser mes informations de localisation pour améliorer l\'efficacité des recherches et des autres services Google"</string>
+    <string name="use_location_warning_message" msgid="1420184860518262439">"Souhaitez-vous autoriser Google à utiliser vos informations de localisation pour améliorer l\'efficacité des recherches et des autres services ?"</string>
     <string name="agree" msgid="6288718671527758326">"Accepter"</string>
     <string name="disagree" msgid="6221069272309799230">"Refuser"</string>
     <string name="about_settings" msgid="1743378368185371685">"À propos du téléphone"</string>
@@ -538,6 +575,10 @@
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licences open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Un problème est survenu lors du chargement des licences."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Chargement..."</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Informations de sécurité"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informations de sécurité"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Votre téléphone n\'est connecté à aucun service de données. Pour consulter ces informations maintenant, accédez à %s depuis un ordinateur connecté à Internet."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Chargement…"</string>
     <string name="lock_settings_title" msgid="5828348303971852121">"Schéma de déverrouillage de l\'écran"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Modifier le schéma de déverrouillage"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmer le schéma enregistré"</string>
@@ -566,9 +607,9 @@
     <string name="skip_button_label" msgid="8680422740354436943">"Annuler"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Suivant"</string>
     <string name="lock_title" msgid="4059246467204273930">"Sécurisation de votre téléphone"</string>
-    <string name="lock_intro_message" msgid="5352897389718432077"><font size="17">"Protégez votre téléphone contre toute utilisation non autorisée en créant un schéma personnel de déverrouillage de l\'écran."\n<font height="17">\n</font><b>"1"</b>" L\'écran suivant vous présente un exemple de schéma "\n<font height="17">\n</font><b>"2"</b>" Lorsque vous êtes prêt, dessinez votre propre schéma de déverrouillage. Essayez différents schémas, mais reliez au moins quatre points."\n<font height="17">\n</font><b></b>"Reproduisez votre schéma pour confirmer."\n<font height="17">\n</font><b>"Pour commencer, sélectionnez \"Suivant\"."</b>\n<font height="3">\n</font>"Si vous ne souhaitez pas activer cette protection, sélectionnez \"Annuler\"."</font></string>
+    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Protégez votre téléphone contre toute utilisation non autorisée en créant un schéma personnel de déverrouillage de l\'écran. "\n<font height="17">\n</font><b>"1"</b>"  L\'écran suivant vous présente un exemple de schéma. "\n<font height="17">\n</font><b>"2"</b>"  Lorsque vous êtes prêt, dessinez votre propre schéma de déverrouillage. Essayez-en plusieurs, mais veillez à relier au moins quatre points. "\n<font height="17">\n</font><b>"3"</b>"  Reproduisez votre schéma pour confirmer votre choix. "\n<font height="17">\n</font><b>"Pour commencer, appuyez sur \"Suivant\""</b>". "\n<font height="3">\n</font>"Si vous ne souhaitez pas activer la protection, appuyez sur \"Annuler\"."</font></string>
     <string name="lock_example_title" msgid="8052305554017485410">"Exemple de schéma"</string>
-    <string name="lock_example_message" msgid="7431982730914254881">"Reliez au moins quatre points."\n" "\n"Sélectionnez \"Suivant\" pour créer votre propre schéma."</string>
+    <string name="lock_example_message" msgid="1838650097090632706">"Reliez au moins quatre points."\n" "\n"Sélectionnez \"Suivant\" pour créer votre propre schéma."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Gérer les applications"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Gérer et supprimer les applications installées"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Applications"</string>
@@ -602,12 +643,12 @@
     <string name="filter" msgid="2018011724373033887">"Filtrer"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Options du filtre"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Tous"</string>
-    <string name="filter_apps_third_party" msgid="1096017647285183437">"Tiers"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Téléchargées"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"En cours d\'exécution"</string>
     <string name="loading" msgid="3200408047793887917">"Chargement..."</string>
     <string name="recompute_size" msgid="7722567982831691718">"Calcul de la taille..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Supprimer"</string>
-    <string name="clear_data_dlg_text" msgid="8796694785488630642">"Toutes les informations enregistrées dans cette application seront définitivement supprimées."</string>
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"Toutes les données de cette application vont être définitivement supprimées, y compris tous les fichiers, les paramètres, les comptes, les bases de données, etc."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Annuler"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"L\'application n\'a pas été trouvée."</string>
@@ -620,9 +661,23 @@
     <string name="security_settings_desc" msgid="3116027624526915561">"Cette application peut accéder aux applications suivantes de votre téléphone :"</string>
     <string name="computing_size" msgid="1599186977475211186">"Traitement..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Impossible de calculer la taille du paquet."</string>
-    <string name="empty_list_msg" msgid="1883660401486953588">"Aucune application tierce n\'est installée sur votre téléphone."</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"Aucune application tierce n\'est installée."</string>
     <string name="version_text" msgid="9189073826278676425">"version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
-    <string name="language_settings" msgid="2939555761536357092">"Par. régionaux et texte"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"Services en cours d\'exécution"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Afficher et contrôler les services en cours d\'exécution"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"Redémarrage en cours"</string>
+    <string name="no_running_services" msgid="6981216347270280598">"Aucun service en cours d\'exécution"</string>
+    <string name="confirm_stop_service" msgid="5700448757318301681">"Arrêter le service ?"</string>
+    <string name="confirm_stop_service_msg" msgid="1202118456282395730">"Le service ne sera plus exécuté tant qu\'il ne sera pas relancé. Cette configuration peut avoir des conséquences gênantes sur l\'application <xliff:g id="APPLICATION">%1$s</xliff:g>."</string>
+    <string name="confirm_stop_stop" msgid="7382363913280993331">"Arrêter"</string>
+    <string name="confirm_stop_cancel" msgid="206495326622692381">"Annuler"</string>
+    <string name="service_started_by_app" msgid="8432097226392386802">"Service démarré par l\'application : appuyez dessus pour l\'arrêter."</string>
+    <string name="service_client_name" msgid="2337664610975074717">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g> : appuyez dessus pour gérer le service."</string>
+    <string name="service_background_processes" msgid="5158600475629177758">"Disponible : <xliff:g id="FREE">%2$s</xliff:g>+<xliff:g id="MEMORY">%3$s</xliff:g> dans <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_foreground_processes" msgid="4013890350284680796">"Autres : <xliff:g id="MEMORY">%2$s</xliff:g> dans <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_process_name" msgid="8630408984456958400">"Processus : <xliff:g id="PROCESS">%1$s</xliff:g>"</string>
+    <string name="language_settings" msgid="502219872342167227">"Langue et clavier"</string>
+    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Paramètres de langue et clavier"</string>
     <string name="language_settings_summary" msgid="595647729475399987">"Définir la langue et la région, la saisie de texte et la correction automatique"</string>
     <string name="language_category" msgid="3391756582724541530">"Paramètres régionaux"</string>
     <string name="text_category" msgid="6342540511465136739">"Paramètres du texte"</string>
@@ -637,7 +692,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Appuyez deux fois sur la touche Espace pour insérer \".\""</string>
     <string name="show_password" msgid="2198798062604049206">"Mots de passe visibles"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Afficher le mot de passe lors de la saisie"</string>
-    <string name="ime_security_warning" msgid="3458652708716006477">"Ce mode de saisie pourrait collecter le texte que vous saisissez, y compris vos données personnelles telles que les mots de passe et les numéros de carte de crédit. Ce mode est propre à l\'application <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Voulez-vous vraiment activer ce mode de saisie ?"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"Ce mode de saisie pourrait collecter le texte que vous saisissez, y compris vos données personnelles telles que les mots de passe et les numéros de carte de crédit. Il provient de l\'application <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Voulez-vous vraiment activer ce mode de saisie ?"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dictionnaire personnel"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"Dictionnaire personnel"</string>
     <string name="user_dict_settings_summary" msgid="2460427065601355471">"Ajouter et retirer des mots du dictionnaire personnel"</string>
@@ -665,7 +720,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Saisie de texte"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Gérer les options de saisie de texte"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Paramètres <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="4919680715154885028">"Paramètres du clavier à l\'écran"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Paramètres du clavier intégré"</string>
     <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Clavier de l\'appareil"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Paramètres du clavier intégré"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Développement"</string>
@@ -676,11 +731,11 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"L\'écran ne se met jamais en veille lors du chargement"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Positions fictives"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Autoriser les positions fictives"</string>
-    <string name="adb_warning_title" msgid="1756027479229533250">"Activer le débogage USB ?"</string>
+    <string name="adb_warning_title" msgid="6234463310896563253">"Autoriser le débogage USB ?"</string>
     <string name="adb_warning_message" msgid="5352555112049663033">"Le débogage USB est conçu à des fins de développement uniquement. Il peut servir à copier des données entre votre ordinateur et votre appareil, à installer des applications sur votre appareil sans notification et à lire les données de journal."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Choisir un gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Choisir un widget"</string>
-    <string name="battery_history_details_for" msgid="5189636461798594740">"Détails de l\'UID %d"</string>
+    <string name="battery_history_details_for" msgid="5924639922153109669">"Détails de l\'UID <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="battery_history_uid" msgid="1016606150528436298">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage" msgid="8010852371665217020">"Données d\'utilisation du réseau pour <xliff:g id="APP_NAME">%1$s</xliff:g> :"</string>
     <string name="battery_history_bytes_received" msgid="980307569180518302">"Octets reçus : <xliff:g id="BYTES">%1$d</xliff:g>"</string>
@@ -716,12 +771,13 @@
     <string name="app_name_label" msgid="2000949925256858308">"Application"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"Nombre"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Temps d\'utilisation"</string>
-    <string name="accessibility_settings_title" msgid="4239640930601071058">"Accessibilité"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"Accessibilité"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Paramètres d\'accessibilité"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Gérer les options d\'accessibilité"</string>
     <string name="toggle_accessibility_title" msgid="650839277066574497">"Accessibilité"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Services d\'accessibilité"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Aucun service d\'accessibilité installé"</string>
-    <string name="accessibility_service_security_warning" msgid="8386156287296967181">"Il est possible que ce service d\'accessibilité puisse recueillir tout le texte que vous saisissez, y compris les données personnelles et les numéros de cartes de crédit, mais pas les mots de passe. Il est également possible qu\'il enregistre vos interactions avec l\'interface utilisateur. Il provient de l\'application <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Activer ce service d\'accessibilité ?"</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Ce service d\'accessibilité est susceptible de recueillir tout le texte que vous saisissez, y compris les données personnelles et les numéros de cartes de crédit, mais pas les mots de passe. Il est également possible qu\'il enregistre vos interactions avec l\'interface utilisateur. Il provient de l\'application <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Utiliser ce service d\'accessibilité ?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Désactiver les services d\'accessibilité ?"</string>
     <string name="power_usage_summary_title" msgid="5180282911164282324">"Utilisation de la batterie"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Répartition·de·l\'utilisation·de·la·batterie"</string>
@@ -733,7 +789,7 @@
     <string name="awake" msgid="387122265874485088">"Durée de fonctionnement de l\'appareil"</string>
     <string name="wifi_on_time" msgid="4630925382578609056">"Temps de fonctionnement du Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="4478515071957280711">"Temps de fonctionnement du Wi-Fi"</string>
-    <string name="usage_name_percent" msgid="1899151069711662289">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="PERCENT">%2$s</xliff:g> %%"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Infos détaillées sur l\'utilisation de la batterie"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Détails d\'utilisation"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Ajuster la consommation"</string>
@@ -769,7 +825,7 @@
     <string name="battery_desc_wifi" msgid="1702486494565080431">"Batterie utilisée par le Wi-Fi"</string>
     <string name="battery_sugg_wifi" msgid="7542345142282261691">"Désactiver la fonctionnalité Wi-Fi lorsque vous ne l\'utilisez pas ou lorsqu\'elle n\'est pas disponible"</string>
     <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Batterie utilisée par Bluetooth"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="144393178427277439">"Désactiver Bluetooth lorsque vous ne l\'utilisez pas"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Désactivez Bluetooth lorsque vous ne l\'utilisez pas."</string>
     <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Essayez·de·vous·connecter·à·un·autre·appareil·Bluetooth"</string>
     <string name="battery_desc_apps" msgid="8123202939321333639">"Batterie utilisée par les applications en cours d\'exécution"</string>
     <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Arrêter ou désinstaller l\'application"</string>
@@ -781,9 +837,9 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Actualiser"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Système d\'exploitation Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Serveur multimédia"</string>
-    <string name="tts_settings" msgid="6454363854545277027">"Synthèse vocale"</string>
+    <string name="tts_settings" msgid="3348626948015962987">"SMS vocaux"</string>
     <string name="tts_settings_summary" msgid="2627715231944602766">"Définir les options de synthèse vocale"</string>
-    <string name="tts_settings_title" msgid="5064947197040356736">"Contrôles du synthétiseur vocal"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Paramètres de la synthèse vocale"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Toujours utiliser mes paramètres"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Les paramètres par défaut ci-dessous remplacent les paramètres de l\'application."</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Paramètres par défaut"</string>
@@ -801,8 +857,11 @@
     <string name="tts_demo" msgid="405357591189935876">"Voici un échantillon de synthèse vocale."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Vos paramètres ont été modifiés. Voici un échantillon illustrant les nouveaux paramètres."</string>
     <string name="gadget_title" msgid="7455548605888590466">"Contrôle de l\'alimentation"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Mise à jour des paramètres Wi-Fi"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Mise à jour des paramètres Bluetooth"</string>
+    <string name="credential_installer_activity_title" msgid="7600661521831762521">"Programme d\'installation des identifiants"</string>
     <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Paramètres de VPN"</string>
-    <string name="vpn_connect_to" msgid="9040615733700098831">"Se connecter à %s"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"Connexion à \"<xliff:g id="NAME">%s</xliff:g>\""</string>
     <string name="vpn_username_colon" msgid="7854930370861306247">"Nom d\'utilisateur :"</string>
     <string name="vpn_password_colon" msgid="5716278710848606626">"Mot de passe :"</string>
     <string name="vpn_a_username" msgid="6664733641993968692">"un nom d\'utilisateur"</string>
@@ -820,9 +879,9 @@
     <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Se déconnecter du réseau"</string>
     <string name="vpn_menu_edit" msgid="4526245173583195618">"Modifier le réseau"</string>
     <string name="vpn_menu_delete" msgid="3326527392609513129">"Supprimer un réseau"</string>
-    <string name="vpn_error_miss_entering" msgid="1467455143582547499">"Vous devez entrer %s."</string>
-    <string name="vpn_error_miss_selecting" msgid="953436717902387192">"Vous devez sélectionner %s."</string>
-    <string name="vpn_error_duplicate_name" msgid="2786397299628471911">"Le nom de VPN \"%s\" existe déjà. Veuillez choisir un autre nom."</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Vous devez entrer \"<xliff:g id="CODE">%s</xliff:g>\"."</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Vous devez sélectionner \"<xliff:g id="OPTION">%s</xliff:g>\"."</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Le nom de VPN \"<xliff:g id="NAME">%s</xliff:g>\" existe déjà. Veuillez choisir un autre nom."</string>
     <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Voulez-vous vraiment supprimer ce VPN ?"</string>
     <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Êtes-vous sûr de ne pas vouloir créer ce profil ?"</string>
     <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Voulez-vous vraiment annuler les modifications apportées à ce profil ?"</string>
@@ -833,10 +892,12 @@
     <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Un ou plusieurs secrets sont manquants dans cette configuration VPN. Voulez-vous contrôler les paramètres de vos secrets ?"</string>
     <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Le nom d\'utilisateur ou le mot de passe entré est incorrect. Voulez-vous réessayer ?"</string>
     <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Le serveur a raccroché. Le nom d\'utilisateur et le mot de passe que vous avez saisis sont peut-être incorrects. Voulez-vous réessayer ?"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Le serveur a raccroché. Il est possible que vous soyez protégé par un pare-feu qui empêche toute connexion au serveur. Souhaitez-vous réessayer ?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Échec de la négociation avec le serveur. Le serveur n\'est peut-être pas conforme au paramètre de cryptage. Voulez-vous vérifier le paramètre de cryptage ?"</string>
     <string name="vpn_type_title" msgid="6392933604218676224">"Ajouter un VPN"</string>
     <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Ajouter un VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2550661826320709266">"Ajouter un VPN %s"</string>
-    <string name="vpn_edit_title_edit" msgid="1769999313158207723">"Détails de %s"</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Ajouter le VPN \"<xliff:g id="NAME">%s</xliff:g>\""</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Détails du profil \"<xliff:g id="NAME">%s</xliff:g>\""</string>
     <string name="vpns" msgid="3148141862835492816">"VPN"</string>
     <string name="vpn_connecting" msgid="8039521381692090116">"Connexion en cours…"</string>
     <string name="vpn_disconnecting" msgid="7748050200708257066">"Déconnexion en cours…"</string>
@@ -844,8 +905,8 @@
     <string name="vpn_connect_hint" msgid="7442898962925875181">"Se connecter au réseau"</string>
     <string name="vpn_name" msgid="1550918148476193076">"Nom du VPN"</string>
     <string name="vpn_a_name" msgid="8445736942405283509">"un nom de VPN"</string>
-    <string name="vpn_profile_added" msgid="2157095890825215726">"Ajout de %s"</string>
-    <string name="vpn_profile_replaced" msgid="384234123486734768">"Modifications appliquées à %s"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"\"<xliff:g id="NAME">%s</xliff:g>\" a été ajouté."</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"Modifications appliquées à \"<xliff:g id="NAME">%s</xliff:g>\""</string>
     <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Définir le certificat utilisateur"</string>
     <string name="vpn_user_certificate" msgid="949322691686938888">"Certificat utilisateur"</string>
     <string name="vpn_a_user_certificate" msgid="8943983437956898649">"un certificat utilisateur"</string>
@@ -866,53 +927,53 @@
     <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Nom du serveur VPN"</string>
     <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Domaines de recherche DNS"</string>
     <string name="vpn_dns_search_list" msgid="4230034234026605360">"Domaines de recherche DNS"</string>
-    <string name="vpn_field_is_set" msgid="1880980734721258127">"%s défini"</string>
-    <string name="vpn_field_not_set" msgid="6827205815004809490">"%s non défini"</string>
-    <string name="vpn_field_not_set_optional" msgid="8665901697706781015">"%s non défini (facultatif)"</string>
-    <string name="vpn_enable_field" msgid="3348948489989523325">"Activer %s"</string>
-    <string name="vpn_disable_field" msgid="2286966253789266389">"Désactiver %s"</string>
-    <string name="vpn_is_enabled" msgid="5128973727115662815">"%s activé"</string>
-    <string name="vpn_is_disabled" msgid="8028085699769751756">"%s désactivé"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"Valeur \"<xliff:g id="VALUE">%s</xliff:g>\" définie"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"Valeur \"<xliff:g id="VALUE">%s</xliff:g>\" non définie"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"Valeur \"<xliff:g id="VALUE">%s</xliff:g>\" non définie (facultatif)"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"Activer \"<xliff:g id="OPTION">%s</xliff:g>\""</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"Désactiver \"<xliff:g id="OPTION">%s</xliff:g>\""</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"L\'option \"<xliff:g id="OPTION">%s</xliff:g>\" est activée."</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"L\'option \"<xliff:g id="OPTION">%s</xliff:g>\" est désactivée."</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Paramètres de VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Configurer et gérer les réseaux privés virtuels (VPN)"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(aucune modification)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(non défini)"</string>
-    <string name="cstor_settings_category" msgid="2284299080682591107">"Stockage des identifiants"</string>
-    <string name="cstor_access_title" msgid="1739505390736236717">"Utiliser des identifiants sécurisés"</string>
-    <string name="cstor_access_summary" msgid="4512681868217546677">"Autoriser l\'accès des applications aux certificats sécurisés et identifiants"</string>
-    <string name="cstor_access_dialog_title" msgid="3024256293191879190">"Saisir le mot de passe"</string>
-    <string name="cstor_access_dialog_hint_from_action" msgid="679746865623760961">"Saisissez le mot de passe du stockage des identifiants."</string>
-    <string name="cstor_set_passwd_title" msgid="6156763762703061470">"Définir le mot de passe"</string>
-    <string name="cstor_set_passwd_summary" msgid="5248560429856597398">"Définir/modifier le mot de passe du stockage des identifiants"</string>
-    <string name="cstor_set_passwd_dialog_title" msgid="4071157542842979977">"Définir le mot de passe"</string>
-    <string name="cstor_reset_title" msgid="6001600882136794382">"Effacer le stockage"</string>
-    <string name="cstor_reset_summary" msgid="7509525030771504833">"Effacer le contenu du stockage des identifiants et réinitialiser le mot de passe"</string>
-    <string name="cstor_reset_hint" msgid="5331632794451859788">"Voulez-vous vraiment supprimer tous les identifiants et réinitialiser le mot de passe du stockage des identifiants ?"</string>
-    <string name="cstor_name_credential_dialog_title" msgid="1723509156126180662">"Attribuer un nom au certificat"</string>
-    <string name="cstor_credential_name" msgid="2958936431813760259">"Nom du certificat :"</string>
-    <string name="cstor_credential_password" msgid="7187440553141199409">"Mot de passe d\'extraction du certificat :"</string>
-    <string name="cstor_credential_info" msgid="6097346149400207440">"Détails du certificat :"</string>
-    <string name="cstor_name_credential_hint" msgid="6889198058976515785">"Le nom ne peut contenir que des lettres et des chiffres."</string>
-    <string name="cstor_old_password" msgid="979282118063084561">"Mot de passe actuel :"</string>
-    <string name="cstor_new_password" msgid="6218562692435670047">"Nouveau mot de passe :"</string>
-    <string name="cstor_confirm_password" msgid="8996028123356342466">"Confirmer le nouveau mot de passe :"</string>
-    <string name="cstor_first_time_hint" msgid="1831593416099224962">"Définissez le mot de passe du stockage des identifiants."</string>
-    <string name="cstor_first_time_hint_from_action" msgid="4690937025845780557">"Définissez le mot de passe du stockage des identifiants."</string>
-    <string name="cstor_password_error" msgid="2917326097260402464">"Veuillez entrer le mot de passe approprié."</string>
-    <string name="cstor_password_error_reset_warning" msgid="3336370539045905953">"Entrez le mot de passe approprié. Il vous reste un essai avant que le stockage des identifiants ne soit effacé."</string>
-    <string name="cstor_password_error_reset_warning_plural" msgid="6209069679269017200">"Entrez le mot de passe approprié. Il vous reste %d essais avant que le stockage d\'identifiants ne soit effacé."</string>
-    <string name="cstor_passwords_error" msgid="956773958408751155">"Les mots de passe ne concordent pas."</string>
-    <string name="cstor_passwords_empty_error" msgid="6062539742626760734">"Vous devez entrer un mot de passe et le confirmer."</string>
-    <string name="cstor_password_empty_error" msgid="7249632576906961482">"Veuillez entrer le mot de passe."</string>
-    <string name="cstor_password_verification_error" msgid="8553930704493511389">"Veuillez ressaisir le mot de passe. Il doit contenir au moins 8 caractères sans espace."</string>
-    <string name="cstor_name_empty_error" msgid="7499971191993770322">"Veuillez entrer un nom."</string>
-    <string name="cstor_name_char_error" msgid="8048089317968192516">"Entrez un nom ne contenant que des lettres et des chiffres."</string>
-    <string name="cstor_storage_error" msgid="7140697503172458161">"Impossible d\'enregistrer le certificat. Cliquez sur OK pour réessayer."</string>
-    <string name="cstor_unable_to_save_cert" msgid="1631402544447196406">"Impossible d\'enregistrer le certificat. Le stockage des informations d\'identification n\'est pas activé ou initialisé correctement."</string>
-    <string name="cstor_cert_not_saved" msgid="6318149789449538491">"Le certificat n\'est pas enregistré."</string>
-    <string name="cstor_is_reset" msgid="449870501126790589">"Les informations d\'identification stockées sont effacées."</string>
-    <string name="cstor_is_enabled" msgid="4054049098081482785">"Stockage des identifiants activé."</string>
-    <string name="cstor_is_added" msgid="794788474010251572">"%s ajouté"</string>
+    <string name="credentials_category" msgid="8536992056377271234">"Stockage des identifiants"</string>
+    <string name="credentials_access" msgid="4843187230913860492">"Utiliser des identifiants sécurisés"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"Autoriser l\'accès des applications aux certificats sécurisés et aux identifiants"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"Saisir le mot de passe"</string>
+    <string name="credentials_unlock_hint" msgid="594679530407918031">"Saisissez le mot de passe du stockage des identifiants."</string>
+    <string name="credentials_install_certificates" msgid="177337517568022236">"Installer depuis la carte SD"</string>
+    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Installer les certificats cryptés depuis la carte SD"</string>
+    <string name="credentials_set_password" msgid="9104473585811899989">"Définir le mot de passe"</string>
+    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Définir/modifier le mot de passe de stockage des identifiants"</string>
+    <string name="credentials_reset" msgid="9170150870552453457">"Effacer le stockage"</string>
+    <string name="credentials_reset_summary" msgid="1530388094693731636">"Effacer le contenu du stockage des identifiants et réinitialiser le mot de passe"</string>
+    <string name="credentials_reset_hint" msgid="819990295796804516">"Voulez-vous vraiment supprimer tous les identifiants et réinitialiser le mot de passe du stockage des identifiants ?"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"Mot de passe actuel :"</string>
+    <string name="credentials_new_password" msgid="267487774686796938">"Nouveau mot de passe :"</string>
+    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmer le nouveau mot de passe :"</string>
+    <string name="credentials_first_time_hint" msgid="1567821077545346039">"Définissez un mot de passe pour le stockage des identifiants (au moins 8 caractères)."</string>
+    <string name="credentials_wrong_password" msgid="7525192410790152041">"Veuillez entrer le mot de passe approprié."</string>
+    <string name="credentials_reset_warning" msgid="6392481296673345268">"Entrez le mot de passe approprié. Il vous reste un essai avant que le stockage des identifiants ne soit effacé."</string>
+    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Entrez le mot de passe approprié. Il vous reste <xliff:g id="NUMBER">%1$d</xliff:g> essais avant que les identifiants stockés ne soient effacés."</string>
+    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Les mots de passe ne concordent pas."</string>
+    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Vous devez entrer un mot de passe et le confirmer."</string>
+    <string name="credentials_password_empty" msgid="8292138152983330473">"Veuillez entrer le mot de passe."</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"Le mot de passe doit contenir au moins 8 caractères."</string>
+    <string name="credentials_erased" msgid="7700309135582200849">"Le stockage des identifiants est effacé."</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"Stockage des identifiants activé"</string>
+    <string name="credentials_disabled" msgid="7453188089059045380">"Stockage des identifiants désactivé"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Sonnerie d\'urgence"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Définir le comportement en cas d\'appel d\'urgence"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Confidentialité"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Paramètres de confidentialité"</string>
+    <string name="location_section_title" msgid="6072558684044939786">"Localisation"</string>
+    <string name="settings_section_title" msgid="7413252428447723032">"Paramètres"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Données personnelles"</string>
+    <string name="backup_settings_title" msgid="2968262658155327829">"Sauvegarder mes paramètres"</string>
+    <string name="backup_erase_dialog_title" msgid="6028429904055779443">"Sauvegarde des paramètres"</string>
+    <string name="backup_erase_dialog_message" msgid="9096433810456900531">"Voulez-vous vraiment arrêter de sauvegarder vos paramètres et supprimer toutes les copies des serveurs Google ?"</string>
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
+    <skip />
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 7fadeaef09e..47d2c7c7a9f 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -24,13 +24,23 @@
     <item msgid="5345178126174698955">"Pacifico"</item>
     <item msgid="8392017019801393511">"Tutte"</item>
   </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"Nessuna animazione"</item>
+    <item msgid="6291186755504776720">"Alcune animazioni"</item>
+    <item msgid="3856065399819979491">"Tutte le animazioni"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"Non viene visualizzata alcuna animazione delle finestre"</item>
+    <item msgid="4460915688877708508">"Vengono visualizzate alcune animazioni delle finestre"</item>
+    <item msgid="488968798204105119">"Vengono visualizzate tutte le animazioni delle finestre"</item>
+  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 secondi"</item>
     <item msgid="8881760709354815449">"30 secondi"</item>
     <item msgid="7589406073232279088">"1 minuto"</item>
     <item msgid="7001195990902244174">"2 minuti"</item>
     <item msgid="5721688686241190620">"10 minuti"</item>
-    <item msgid="1781492122915870416">"Mai timeout"</item>
+    <item msgid="7156442995039264948">"30 minuti"</item>
   </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Molto lenta"</item>
@@ -58,18 +68,14 @@
     <item msgid="2923732046112398627">"Automatico"</item>
     <item msgid="5434666299123318296">"Nessuna"</item>
     <item msgid="3159594845889645948">"WEP"</item>
-    <item msgid="6303607119537134095">"WPA Personal"</item>
-    <item msgid="1977424472734732392">"WPA2 Personal"</item>
-    <item msgid="5185669984217684689">"WPA-EAP"</item>
-    <item msgid="8643206823103498303">"IEEE 802.1x"</item>
+    <item msgid="1687348101566181433">"WPA/WPA2 PSK"</item>
+    <item msgid="329777238762866787">"802.1x Enterprise"</item>
   </string-array>
   <string-array name="wifi_security_without_auto_entries">
     <item msgid="4402120432904877907">"Nessuna"</item>
     <item msgid="2329148995431627488">"WEP"</item>
-    <item msgid="2296204649410509235">"WPA Personal"</item>
-    <item msgid="8928468573279595315">"WPA2 Personal"</item>
-    <item msgid="8319241197948974314">"WPA-EAP"</item>
-    <item msgid="2222409752754955757">"IEEE 802.1x"</item>
+    <item msgid="6903317668294332381">"WPA/WPA2 PSK"</item>
+    <item msgid="7280821339307729710">"802.1x Enterprise"</item>
   </string-array>
   <string-array name="wifi_wep_type">
     <item msgid="1497433962958697183">"Automatico"</item>
@@ -108,7 +114,7 @@
     <item msgid="1818786254010764570">"Nessuna"</item>
     <item msgid="6189918678874123056">"PAP"</item>
     <item msgid="1524112260493662517">"MSCHAP"</item>
-    <item msgid="1586767102985419413">"MSCHAP2"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
@@ -116,4 +122,10 @@
     <item msgid="3165868966179561687">"Avviso"</item>
     <item msgid="6038758039030476855">"Vibrazione"</item>
   </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"Nessuno"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP o CHAP"</item>
+  </string-array>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e5a743d804a..51f9afc8353 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -15,6 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"Sì"</string>
+    <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Sconosciuto"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Attiva segnale cellulare"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Disattiva segnale cellulare"</string>
@@ -56,6 +58,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
     <string name="sdcard_setting" msgid="5922637503871474866">"Scheda SD"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Stato batteria:"</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"Presa di corrente:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Scala batteria:"</string>
     <string name="battery_info_level_label" msgid="8706526709307788737">"Livello batteria:"</string>
     <string name="battery_info_health_label" msgid="6416051542741886958">"Condizioni batteria:"</string>
@@ -75,6 +78,11 @@
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"Quasi scarica"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Non in carica"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Carica"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Non collegato"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"CA+USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"Sconosciuto"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Sconosciuto"</string>
     <string name="battery_info_health_good" msgid="8070356565806711806">"Buono"</string>
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"Surriscaldamento"</string>
@@ -104,6 +112,12 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Richiesta accoppiamento Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Richiesta accoppiamento"</string>
     <string name="bluetooth_notif_message" msgid="5381418499788668724">"Seleziona per accoppiare "</string>
+    <string name="device_picker" msgid="8721012448931226323">"Selettore dispositivo Bluetooth"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Richiesta autorizzazione Bluetooth"</string>
+    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Un\'applicazione sul tuo telefono chiede l\'autorizzazione per attivare Bluetooth. Procedere?"</string>
+    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Un\'applicazione sul tuo telefono chiede l\'autorizzazione per rendere il tuo telefono rilevabile da altri dispositivi Bluetooth per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi. Procedere?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Un\'applicazione sul tuo telefono chiede l\'autorizzazione per attivare Bluetooth e rendere il tuo telefono rilevabile da altri dispositivi per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi. Procedere?"</string>
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Attivazione Bluetooth in corso…"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Impostazioni data e ora"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 pm"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -196,7 +210,8 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Disattiva tutte le connessioni wireless"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Disattivazione connessioni wireless..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Attivazione connessioni wireless..."</string>
-    <string name="radio_controls_title" msgid="8356991079873437337">"Controlli wireless"</string>
+    <string name="radio_controls_title" msgid="5868688473587168882">"Wireless e reti"</string>
+    <string name="wireless_networks_settings_title" msgid="149274247949769551">"Impostazioni wireless e reti"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Gestisci Wi-Fi, Bluetooth, modalità aereo, reti mobili e VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming dati"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Connessione a servizi di dati in roaming"</string>
@@ -219,20 +234,29 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Seleziona formato data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordine alfabetico"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordina per fuso orario"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"Protezione e posizione"</string>
+    <string name="security_settings_title" msgid="5168491784222013179">"Posizione e protezione"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"Impostazioni di posizione e protezione"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Imposta La mia posizione, sblocco schermo, blocco SIM, blocco cred."</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Imposta La mia posizione, sblocco schermo, blocco archivio credenziali"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Password"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Attiva Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Impostazioni Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Impostazioni Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Gestisci le connessioni, imposta il nome e la rilevabilità del dispositivo"</string>
-    <string name="bluetooth_pin_entry" msgid="5627349871303455279">"Richiesta accoppiamento Bluetooth"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Richiesta accoppiamento Bluetooth"</string>
     <string name="bluetooth_device_info" msgid="6644515376523965073">"Info dispositivo Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="7551139612735632370">"<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_enter_pin_msg" msgid="856962526754150334">\n"Digita il PIN per l\'accoppiamento con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". Prova a utilizzare 0000 o 1234."</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Digita passkey per eseguire accoppiamento con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Per eseguire l\'accoppiamento con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", conferma che è visualizzata la passkey: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"chiede di eseguire l\'accoppiamento."</string>
+    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Inserisci <xliff:g id="PASSKEY">%2$s</xliff:g> in \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" per eseguire l\'accoppiamento."</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Accoppia"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Non accoppiare"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"dispositivo Bluetooth"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Attenzione"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Errore durante l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="6938408362011024289">"Errore durante l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Il PIN digitato è errato."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Errore durante l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. La passkey o il PIN è errato."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"Impossibile stabilire la comunicazione con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Accoppiamento rifiutato da <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Errore durante la connessione a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
@@ -246,6 +270,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Connessione a…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Media"</string>
     <string name="bluetooth_profile_headset" msgid="1874975688666658946">"Telefono"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Trasferisci"</string>
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Collegato ad audio media"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Collegato ad audio telefono"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Collegato ad audio telefono e media"</string>
@@ -255,8 +280,11 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profili"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Collegato ad audio media"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Collegato ad audio telefono"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Collegato al server di trasferimento file"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Non collegato al server di trasferimento file"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Usa per audio media"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Usa per audio telefono"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Usa per trasferimento file"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Attiva Wi-Fi"</string>
@@ -273,17 +301,13 @@
     <string name="security" msgid="1040691896987225267">"Protezione"</string>
     <string name="wifi_security_open" msgid="3513305614048816607">"Apri"</string>
     <string name="wifi_security_wep" msgid="7082604129842065776">"WEP"</string>
-    <string name="wifi_security_wpa" msgid="8980169410565477162">"WPA"</string>
-    <string name="wifi_security_wpa2" msgid="5780665935088930524">"WPA2"</string>
-    <string name="wifi_security_wpa_eap" msgid="7485687331651751101">"WPA-EAP"</string>
-    <string name="wifi_security_ieee8021x" msgid="8538687609878109005">"IEEE8021X"</string>
+    <string name="wifi_security_psk" msgid="3392399380570381452">"WPA/WPA2 PSK"</string>
+    <string name="wifi_security_eap" msgid="8309434150934969132">"Enterprise (802.1x)"</string>
     <string name="wifi_security_unknown" msgid="4564208312073060668">"Sconosciuta"</string>
     <string name="wifi_security_verbose_open" msgid="8117878112088901945">"rete aperta"</string>
     <string name="wifi_security_verbose_wep" msgid="9220757688700421508">"protetta con WEP"</string>
-    <string name="wifi_security_verbose_wpa" msgid="598697674252714455">"protetta con WPA"</string>
-    <string name="wifi_security_verbose_wpa2" msgid="4116236883347875722">"protetta con WPA2"</string>
-    <string name="wifi_security_verbose_wpa_eap" msgid="1984821646949066624">"protetta con WPA-EAP"</string>
-    <string name="wifi_security_verbose_ieee8021x" msgid="5552995793910186310">"protetta con IEEE 802.1x"</string>
+    <string name="wifi_security_verbose_psk" msgid="1110130025330416225">"protetta con WPA/WPA2 PSK"</string>
+    <string name="wifi_security_verbose_eap" msgid="586632662086063">"protetta con 802.1x EAP"</string>
     <string name="ip_address" msgid="850672263358989449">"Indirizzo IP"</string>
     <string name="signal" msgid="1947969631626413228">"Intensità segnale"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"Attivazione..."</string>
@@ -302,14 +326,13 @@
     <string name="please_type_anonymous_identity" msgid="835061562079965048">"Identità anonima"</string>
     <string name="please_select_client_certificate" msgid="2137906961594663234">"Certificato client"</string>
     <string name="please_select_ca_certificate" msgid="5010815181914420677">"Certificato CA"</string>
-    <string name="please_type_private_key_passwd" msgid="4077744679722504443">"Password chiave privata"</string>
     <string name="please_type_passphrase" msgid="8256017704131522462">"Password wireless"</string>
     <string name="please_type_hex_key" msgid="8751224390407867551">"Chiave esadecimale WEP (0-9, A-F)"</string>
     <string name="wifi_show_password" msgid="4235237470701732009">"Mostra password."</string>
     <string name="scan_wifi" msgid="2459901725350542606">"Scansione"</string>
     <string name="summary_not_in_range" msgid="3926674700733548684">"Fuori portata"</string>
     <string name="summary_remembered" msgid="6079941090549401742">"memorizzata"</string>
-    <string name="summary_connection_failed" msgid="7610394657613410489">"Connessione non riuscita. Seleziona per riprovare"</string>
+    <string name="summary_connection_failed" msgid="2351885658101671413">"Connessione non riuscita. Tocca per riprovare"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Reti Wi-Fi"</string>
     <string name="wifi_type_ssid" msgid="1326839657083292017">"SSID rete"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Protezione"</string>
@@ -360,6 +383,7 @@
     <string name="status_disconnected" msgid="7561688569905126046">"Disconnesso"</string>
     <string name="status_failed" msgid="610462050405904601">"Non riuscita"</string>
     <string name="sound_and_display_settings" msgid="349770582993029003">"Audio e display"</string>
+    <string name="sound_and_display_settings_title" msgid="5036144539683697330">"Impostazioni audio e display"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Impostazioni audio"</string>
     <string name="sound_and_display_settings_summary" msgid="1433943789593286064">"Imposta suonerie, notifiche e luminosità dello schermo"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Modalità silenziosa"</string>
@@ -385,11 +409,14 @@
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"Selezione sonora"</string>
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Riproduci toni durante una selezione sullo schermo"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Riproduci toni durante una selezione sullo schermo"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Feedback aptico"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrazione alla pressione di un tasto softkey e durante certe interazioni con l\'interfaccia utente"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrazione alla pressione di un tasto softkey e durante certe interazioni con l\'interfaccia utente"</string>
     <string name="play_media_notification_sounds_enable_title" msgid="1008791464029179529">"Notifiche scheda SD"</string>
     <string name="play_media_notification_sounds_enable_summary_on" msgid="7675466959375667370">"Riproduci suono per notifiche scheda SD"</string>
     <string name="play_media_notification_sounds_enable_summary_off" msgid="8672617597028744693">"Riproduci suono per notifiche scheda SD"</string>
-    <string name="sync_settings" msgid="2212736205476453234">"Sincronizzazione dati"</string>
-    <string name="sync_settings_summary" msgid="6480534906375217074">"Seleziona le applicazioni da sincronizzare"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Account e sincronizzazione"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"Aggiungi o rimuovi account e modifica impostazioni account"</string>
     <string name="search_settings" msgid="1910951467596035063">"Ricerca"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Gestisci le impostazioni e la cronologia delle ricerche"</string>
     <string name="display_settings" msgid="3912042046350078328">"Impostazioni display"</string>
@@ -403,6 +430,7 @@
     <string name="brightness_summary" msgid="838917350127550703">"Regola la luminosità dello schermo"</string>
     <string name="screen_timeout" msgid="4882669461447531301">"Timeout schermo"</string>
     <string name="screen_timeout_summary" msgid="2905757633140605334">"Regola il tempo che deve trascorrere prima che lo schermo si spenga automaticamente"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"Luminosità automatica"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Impostazioni blocco SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Impostazioni blocco SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Blocco della SIM"</string>
@@ -436,7 +464,8 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stato"</string>
     <string name="device_status" msgid="607405385799807324">"Stato"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Numero di telefono, segnale ecc."</string>
-    <string name="storage_settings_title" msgid="8461515684514801302">"Scheda SD e memoria"</string>
+    <string name="storage_settings" msgid="6681164315506788024">"Scheda SD e memoria"</string>
+    <string name="storage_settings_title" msgid="5379463509034022773">"Impostazioni scheda SD e memoria"</string>
     <string name="storage_settings_summary" msgid="9176693537325988610">"Smonta la scheda SD, visualizza spazio di archiviazione disponibile"</string>
     <string name="status_number" msgid="5123197324870153205">"Il mio numero di telefono"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
@@ -480,6 +509,11 @@
     <string name="apn_mms_port" msgid="4074188088199243040">"Porta MMS"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"Tipo di autenticazione"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Nessuno"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP o CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Tipo APN"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Elimina APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nuovo APN"</string>
@@ -518,12 +552,15 @@
     <string name="location_network_based" msgid="8815705866861993344">"Usa reti wireless"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Visualizza la posizione nelle applicazioni (ad esempio Maps) utilizzando le reti wireless"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Posizione determinata dalle reti mobili e/o Wi-Fi"</string>
-    <string name="location_gps" msgid="375912731641377120">"Attiva satelliti GPS"</string>
-    <string name="location_street_level" msgid="5899941752252356344">"Accuratezza a livello stradale (deseleziona per risparmiare batteria)"</string>
+    <string name="location_gps" msgid="6296125378829097831">"Utilizza satelliti GPS"</string>
+    <string name="location_street_level" msgid="6460740847018275745">"Accuratezza a livello stradale (deseleziona per risparmiare batteria)"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Localizza a livello stradale (richiede più batteria e la vista del cielo)"</string>
-    <string name="use_location_title" msgid="7585990952633568732">"Condividi con Google"</string>
-    <string name="use_location_summary" msgid="4411467143899877395">"Consenti utilizzo posizione per migliorare ricerca e altri servizi"</string>
-    <string name="use_location_warning_message" msgid="5696732842038416151">"Consenti a Google di utilizzare la posizione per migliorare i tuoi risultati di ricerca e altri servizi"</string>
+    <string name="assisted_gps" msgid="4649317129586736885">"Utilizza GPS assistito"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizza il server per assistere il GPS (deseleziona per ridurre l\'utilizzo della rete)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizza il server per assistere il GPS (deseleziona per migliorare le prestazioni GPS)"</string>
+    <string name="use_location_title" msgid="5447030582538504247">"Utilizza La mia posizione"</string>
+    <string name="use_location_summary" msgid="1816849484040070431">"Utilizza \"La mia posizione\" per i risultati di ricerca di Google e altri servizi Google"</string>
+    <string name="use_location_warning_message" msgid="1420184860518262439">"Consentire a Google di utilizzare la posizione per migliorare i risultati di ricerca e altri servizi?"</string>
     <string name="agree" msgid="6288718671527758326">"Accetto"</string>
     <string name="disagree" msgid="6221069272309799230">"Non accetto"</string>
     <string name="about_settings" msgid="1743378368185371685">"Info sul telefono"</string>
@@ -538,6 +575,10 @@
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenze open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Errore durante il caricamento delle licenze."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Caricamento..."</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Informazioni sulla sicurezza"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informazioni sulla sicurezza"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Il telefono non è collegato a un servizio dati. Per visualizzare ora le informazioni, accedi a %s da qualsiasi computer collegato a Internet."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Caricamento in corso..."</string>
     <string name="lock_settings_title" msgid="5828348303971852121">"Sequenza di sblocco schermo"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Cambia sequenza sblocco"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Conferma sequenza salvata"</string>
@@ -566,9 +607,9 @@
     <string name="skip_button_label" msgid="8680422740354436943">"Annulla"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Avanti"</string>
     <string name="lock_title" msgid="4059246467204273930">"Protezione del telefono"</string>
-    <string name="lock_intro_message" msgid="5352897389718432077"><font size="17">"Proteggi il telefono dall\'uso non autorizzato creando una sequenza di sblocco dello schermo personalizzata. "\n<font height="17">\n</font><b>"1"</b>"  Nella prossima schermata, osserva la creazione di una sequenza di esempio. "\n<font height="17">\n</font><b>"2"</b>"  Quando sei pronto, crea la tua sequenza di sblocco personale. Prova diverse sequenze collegando sempre almeno quattro punti. "\n<font height="17">\n</font><b>"3"</b>"  Inserisci di nuovo la sequenza per confermare. "\n<font height="17">\n</font><b>"Pronto per iniziare? Seleziona “Avanti”"</b>". "\n<font height="3">\n</font>"Se non desideri proteggere il telefono, seleziona “Annulla”."</font></string>
+    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Proteggi il telefono dall\'uso non autorizzato creando una sequenza di sblocco dello schermo personale. "\n<font height="17">\n</font><b>"1"</b>" Nella schermata successiva, osserva la creazione di una sequenza di esempio. "\n<font height="17">\n</font><b>"2"</b>" Quando sei pronto, crea la tua sequenza di sblocco personale. Prova diverse sequenze collegando sempre almeno quattro punti. "\n<font height="17">\n</font><b>"3"</b>" Inserisci di nuovo la sequenza per confermare. "\n<font height="17">\n</font><b>"Pronto per iniziare? Tocca \"Avanti\""</b>". "\n<font height="3">\n</font>"Se non desideri proteggere il telefono, tocca \"Annulla\"."</font></string>
     <string name="lock_example_title" msgid="8052305554017485410">"Sequenza di esempio"</string>
-    <string name="lock_example_message" msgid="7431982730914254881">"Collega almeno quattro punti."\n" "\n"Seleziona \"Avanti\" quando sei pronto a creare la tua sequenza."</string>
+    <string name="lock_example_message" msgid="1838650097090632706">"Collega almeno quattro punti."\n" "\n"Tocca \"Avanti\" quando sei pronto a creare la tua sequenza."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Gestisci applicazioni"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Gestisci e rimuovi applicazioni installate"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Applicazioni"</string>
@@ -602,12 +643,12 @@
     <string name="filter" msgid="2018011724373033887">"Filtra"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Seleziona opzioni di filtro"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Tutte"</string>
-    <string name="filter_apps_third_party" msgid="1096017647285183437">"Terze parti"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Scaricate"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"In esecuzione"</string>
     <string name="loading" msgid="3200408047793887917">"Caricamento..."</string>
     <string name="recompute_size" msgid="7722567982831691718">"Ricalcolo dimensioni..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Elimina"</string>
-    <string name="clear_data_dlg_text" msgid="8796694785488630642">"Tutte le informazioni salvate nell\'applicazione verranno eliminate definitivamente."</string>
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"Tutti i dati dell\'applicazione verranno eliminati definitivamente, inclusi tutti i file, le impostazioni, gli account, i database e così via."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Annulla"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"Applicazione non trovata"</string>
@@ -620,9 +661,23 @@
     <string name="security_settings_desc" msgid="3116027624526915561">"Contenuti a cui può accedere l\'applicazione sul telefono:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Elaborazione..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Impossibile stabilire le dimensioni del pacchetto"</string>
-    <string name="empty_list_msg" msgid="1883660401486953588">"Nessuna applicazione di terze parti installata."</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"Nessuna applicazione di terze parti installata."</string>
     <string name="version_text" msgid="9189073826278676425">"versione <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
-    <string name="language_settings" msgid="2939555761536357092">"Lingua e testo"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"Servizi in esecuzione"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Visualizza e controlla i servizi attualmente in esecuzione"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"In fase di riavvio"</string>
+    <string name="no_running_services" msgid="6981216347270280598">"Nessun servizio in esecuzione"</string>
+    <string name="confirm_stop_service" msgid="5700448757318301681">"Interrompere il servizio?"</string>
+    <string name="confirm_stop_service_msg" msgid="1202118456282395730">"Il servizio non verrà più eseguito fino al riavvio. Questa operazione potrebbe avere conseguenze indesiderate sull\'applicazione <xliff:g id="APPLICATION">%1$s</xliff:g>."</string>
+    <string name="confirm_stop_stop" msgid="7382363913280993331">"Interrompi"</string>
+    <string name="confirm_stop_cancel" msgid="206495326622692381">"Annulla"</string>
+    <string name="service_started_by_app" msgid="8432097226392386802">"Avviato dall\'applicazione: tocca per interrompere"</string>
+    <string name="service_client_name" msgid="2337664610975074717">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: tocca per la gestione"</string>
+    <string name="service_background_processes" msgid="5158600475629177758">"Disponibile: <xliff:g id="FREE">%2$s</xliff:g>+<xliff:g id="MEMORY">%3$s</xliff:g> in <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_foreground_processes" msgid="4013890350284680796">"Altro: <xliff:g id="MEMORY">%2$s</xliff:g> in <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_process_name" msgid="8630408984456958400">"Processo: <xliff:g id="PROCESS">%1$s</xliff:g>"</string>
+    <string name="language_settings" msgid="502219872342167227">"Lingua e tastiera"</string>
+    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Impostazioni lingua e tastiera"</string>
     <string name="language_settings_summary" msgid="595647729475399987">"Impostazioni internazionali (lingua e regione), di inserimento e correzione automatica del testo"</string>
     <string name="language_category" msgid="3391756582724541530">"Impostazioni lingua"</string>
     <string name="text_category" msgid="6342540511465136739">"Impostazioni testo"</string>
@@ -637,7 +692,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Premi due volte la barra spaziatrice per inserire \".\""</string>
     <string name="show_password" msgid="2198798062604049206">"Password visibili"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Mostra la password durante la digitazione"</string>
-    <string name="ime_security_warning" msgid="3458652708716006477">"Questo metodo di inserimento potrebbe riuscire a raccogliere tutto il testo digitato, compresi i dati personali come password e numeri di carte di credito. Si tratta del metodo dell\'applicazione <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Attivare questo metodo di inserimento?"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"Questo metodo di inserimento potrebbe riuscire a raccogliere tutto il testo digitato, compresi i dati personali come password e numeri di carte di credito. Deriva dall\'applicazione <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Utilizzare questo metodo di inserimento?"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dizionario utente"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"Dizionario utente"</string>
     <string name="user_dict_settings_summary" msgid="2460427065601355471">"Aggiungi e rimuovi parole dal dizionario utente"</string>
@@ -665,7 +720,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Inserimento testo"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Gestisci opzioni inserimento testo"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Impostazioni di <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="4919680715154885028">"Impostazioni tastiera sullo schermo"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Impostazioni tastiera sullo schermo"</string>
     <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Tastiera dispositivo"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Impostazioni tastiera incorporate"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Sviluppo"</string>
@@ -676,11 +731,11 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Lo schermo non va mai in stand-by se sotto carica"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Posizioni fittizie"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Consenti posizioni fittizie"</string>
-    <string name="adb_warning_title" msgid="1756027479229533250">"Attivare debug USB?"</string>
+    <string name="adb_warning_title" msgid="6234463310896563253">"Consentire debug USB?"</string>
     <string name="adb_warning_message" msgid="5352555112049663033">"Il debug USB è solo a scopo di sviluppo. Può servire per copiare dati tra il computer e il dispositivo, per installare applicazioni sul tuo dispositivo senza notifica e per leggere i dati dei log."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Scegli gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Scegli widget"</string>
-    <string name="battery_history_details_for" msgid="5189636461798594740">"Dettagli per UID %d"</string>
+    <string name="battery_history_details_for" msgid="5924639922153109669">"Dettagli per UID <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="battery_history_uid" msgid="1016606150528436298">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage" msgid="8010852371665217020">"Dettagli di utilizzo della rete per <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
     <string name="battery_history_bytes_received" msgid="980307569180518302">"Byte ricevuti: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
@@ -716,12 +771,13 @@
     <string name="app_name_label" msgid="2000949925256858308">"Applicazione"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"Conteggio"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Tempo di utilizzo"</string>
-    <string name="accessibility_settings_title" msgid="4239640930601071058">"Accesso facilitato"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"Accesso facilitato"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Impostazioni di accesso facilitato"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Gestisci opzioni di accesso facilitato"</string>
     <string name="toggle_accessibility_title" msgid="650839277066574497">"Accesso facilitato"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Servizi di accesso facilitato"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Nessun servizio di accesso facilitato installato."</string>
-    <string name="accessibility_service_security_warning" msgid="8386156287296967181">"Questo servizio di accesso facilitato potrebbe riuscire a raccogliere tutto il testo digitato, compresi i numeri di carte di credito ma eccetto le password. Potrebbe anche registrare le tue interazioni con l\'interfaccia utente. Deriva dall\'applicazione <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Attivare questo servizio di accesso facilitato?"</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Questo servizio di accesso facilitato potrebbe riuscire a raccogliere tutto il testo digitato, compresi i numeri di carte di credito ma eccetto le password. Potrebbe anche registrare le tue interazioni con l\'interfaccia utente. Deriva dall\'applicazione <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Utilizzare questo servizio di accesso facilitato?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Disattivare accesso facilitato?"</string>
     <string name="power_usage_summary_title" msgid="5180282911164282324">"Utilizzo batteria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Consumo batteria"</string>
@@ -733,7 +789,7 @@
     <string name="awake" msgid="387122265874485088">"Tempo di attività dispositivo"</string>
     <string name="wifi_on_time" msgid="4630925382578609056">"Tempo accensione Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="4478515071957280711">"Tempo accensione Wi-Fi"</string>
-    <string name="usage_name_percent" msgid="1899151069711662289">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="PERCENT">%2$s</xliff:g>%%"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Dettagli utilizzo batteria"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Dettagli di utilizzo"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Regola consumo alimentazione"</string>
@@ -769,7 +825,7 @@
     <string name="battery_desc_wifi" msgid="1702486494565080431">"Batteria utilizzata da Wi-Fi"</string>
     <string name="battery_sugg_wifi" msgid="7542345142282261691">"Disattiva Wi-Fi quando non è in uso o dove non è disponibile"</string>
     <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Batteria utilizzata da Bluetooth"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="144393178427277439">"Disattiva Bluetooth quando non è in uso"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Disattiva Bluetooth quando non è in uso"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Prova a connetterti a un altro dispositivo Bluetooth"</string>
     <string name="battery_desc_apps" msgid="8123202939321333639">"Batteria utilizzata dalle applicazioni in esecuzione"</string>
     <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Interrompi o disinstalla l\'applicazione"</string>
@@ -781,9 +837,9 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Aggiorna"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Sistema operativo Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"MediaServer"</string>
-    <string name="tts_settings" msgid="6454363854545277027">"Sintesi vocale"</string>
+    <string name="tts_settings" msgid="3348626948015962987">"Sintesi vocale"</string>
     <string name="tts_settings_summary" msgid="2627715231944602766">"Imposta opzioni testo-voce"</string>
-    <string name="tts_settings_title" msgid="5064947197040356736">"Controlli sintetizzatore vocale"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Impostazioni di sintesi vocale"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Usa sempre le mie impostazioni"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Le seguenti impostazioni predefinite hanno la priorità sulle impostazioni dell\'applicazione"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Impostazioni predefinite"</string>
@@ -801,8 +857,11 @@
     <string name="tts_demo" msgid="405357591189935876">"Questo è un esempio di sintesi vocale."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Le tue impostazioni sono cambiate. Ecco un esempio di come possono suonare."</string>
     <string name="gadget_title" msgid="7455548605888590466">"Controllo risparmio energia"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Aggiornamento impostazione Wi-Fi"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Aggiornamento impostazione Bluetooth"</string>
+    <string name="credential_installer_activity_title" msgid="7600661521831762521">"Programma di installazione credenziali"</string>
     <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Impostazioni VPN"</string>
-    <string name="vpn_connect_to" msgid="9040615733700098831">"Connetti a %s"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"Connessione a <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="vpn_username_colon" msgid="7854930370861306247">"Nome utente:"</string>
     <string name="vpn_password_colon" msgid="5716278710848606626">"Password:"</string>
     <string name="vpn_a_username" msgid="6664733641993968692">"un nome utente"</string>
@@ -820,9 +879,9 @@
     <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Disconnetti dalla rete"</string>
     <string name="vpn_menu_edit" msgid="4526245173583195618">"Modifica rete"</string>
     <string name="vpn_menu_delete" msgid="3326527392609513129">"Elimina rete"</string>
-    <string name="vpn_error_miss_entering" msgid="1467455143582547499">"Inserisci %s."</string>
-    <string name="vpn_error_miss_selecting" msgid="953436717902387192">"Seleziona %s."</string>
-    <string name="vpn_error_duplicate_name" msgid="2786397299628471911">"Il nome VPN \"%s\" esiste già. Trova un altro nome."</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Devi inserire <xliff:g id="CODE">%s</xliff:g>."</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Seleziona <xliff:g id="OPTION">%s</xliff:g>."</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Il nome VPN \"<xliff:g id="NAME">%s</xliff:g>\" esiste già. Trova un altro nome."</string>
     <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Eliminare questa VPN?"</string>
     <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Non creare questo profilo?"</string>
     <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Ignorare le modifiche apportate a questo profilo?"</string>
@@ -833,10 +892,12 @@
     <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"In questa configurazione VPN mancano uno o più segreti. Controllare la relativa impostazione?"</string>
     <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"La password o il nome utente inserito non è corretto. Riprovare?"</string>
     <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Server bloccato. La password o il nome utente inserito potrebbe non essere corretto. Riprovare?"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Server bloccato. È possibile che un firewall ti impedisca di collegarti al server. Riprovare?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Negoziazione con il server non riuscita. È possibile che il server non accetti la tua opzione di crittografia. Controllare l\'impostazione di crittografia?"</string>
     <string name="vpn_type_title" msgid="6392933604218676224">"Aggiungi VPN"</string>
     <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Aggiungi VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2550661826320709266">"Aggiungi VPN %s"</string>
-    <string name="vpn_edit_title_edit" msgid="1769999313158207723">"Dettagli di %s"</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Aggiungi VPN <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Dettagli <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="vpns" msgid="3148141862835492816">"VPN"</string>
     <string name="vpn_connecting" msgid="8039521381692090116">"Connessione..."</string>
     <string name="vpn_disconnecting" msgid="7748050200708257066">"Disconnessione..."</string>
@@ -844,8 +905,8 @@
     <string name="vpn_connect_hint" msgid="7442898962925875181">"Connetti alla rete"</string>
     <string name="vpn_name" msgid="1550918148476193076">"Nome VPN"</string>
     <string name="vpn_a_name" msgid="8445736942405283509">"un nome VPN"</string>
-    <string name="vpn_profile_added" msgid="2157095890825215726">"%s è stato aggiunto"</string>
-    <string name="vpn_profile_replaced" msgid="384234123486734768">"Le modifiche vengono apportate a %s"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"\"<xliff:g id="NAME">%s</xliff:g>\" è stato aggiunto"</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"Le modifiche vengono apportate a \"<xliff:g id="NAME">%s</xliff:g>\""</string>
     <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Imposta certificato utente"</string>
     <string name="vpn_user_certificate" msgid="949322691686938888">"Certificato utente"</string>
     <string name="vpn_a_user_certificate" msgid="8943983437956898649">"un certificato utente"</string>
@@ -866,53 +927,53 @@
     <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Nome server VPN"</string>
     <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Domini di ricerca DNS"</string>
     <string name="vpn_dns_search_list" msgid="4230034234026605360">"Domini di ricerca DNS"</string>
-    <string name="vpn_field_is_set" msgid="1880980734721258127">"%s impostato"</string>
-    <string name="vpn_field_not_set" msgid="6827205815004809490">"%s non impostato"</string>
-    <string name="vpn_field_not_set_optional" msgid="8665901697706781015">"%s non impostato (facoltativo)"</string>
-    <string name="vpn_enable_field" msgid="3348948489989523325">"Attiva %s"</string>
-    <string name="vpn_disable_field" msgid="2286966253789266389">"Disattiva %s"</string>
-    <string name="vpn_is_enabled" msgid="5128973727115662815">"%s è attivo"</string>
-    <string name="vpn_is_disabled" msgid="8028085699769751756">"%s non è attivo"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> impostato"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> non impostato"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> non impostato (facoltativo)"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"Attiva <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"Disattiva <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> è attiva"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> non è attiva"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Impostazioni VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Configura e gestisci le reti private virtuali (VPN)"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(invariato)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(non impostato)"</string>
-    <string name="cstor_settings_category" msgid="2284299080682591107">"Archivio credenziali"</string>
-    <string name="cstor_access_title" msgid="1739505390736236717">"Usa credenziali protez."</string>
-    <string name="cstor_access_summary" msgid="4512681868217546677">"Consenti accesso applicazioni a certificati protezione e altre credenziali"</string>
-    <string name="cstor_access_dialog_title" msgid="3024256293191879190">"Inserisci password"</string>
-    <string name="cstor_access_dialog_hint_from_action" msgid="679746865623760961">"Inserisci la password dell\'archivio di credenziali."</string>
-    <string name="cstor_set_passwd_title" msgid="6156763762703061470">"Imposta password"</string>
-    <string name="cstor_set_passwd_summary" msgid="5248560429856597398">"Imposta o modifica la password dell\'archivio di credenziali"</string>
-    <string name="cstor_set_passwd_dialog_title" msgid="4071157542842979977">"Imposta password"</string>
-    <string name="cstor_reset_title" msgid="6001600882136794382">"Cancella archivio"</string>
-    <string name="cstor_reset_summary" msgid="7509525030771504833">"Cancella l\'archivio di credenziali di tutti i contenuti e reimposta la relativa password"</string>
-    <string name="cstor_reset_hint" msgid="5331632794451859788">"Eliminare tutte le credenziali e reimpostare la password dell\'archivio di credenziali?"</string>
-    <string name="cstor_name_credential_dialog_title" msgid="1723509156126180662">"Specifica un nome per il certificato"</string>
-    <string name="cstor_credential_name" msgid="2958936431813760259">"Nome certificato:"</string>
-    <string name="cstor_credential_password" msgid="7187440553141199409">"Password per l\'estrazione del certificato:"</string>
-    <string name="cstor_credential_info" msgid="6097346149400207440">"Dettagli certificato:"</string>
-    <string name="cstor_name_credential_hint" msgid="6889198058976515785">"Il nome può contenere soltanto lettere e numeri."</string>
-    <string name="cstor_old_password" msgid="979282118063084561">"Password attuale:"</string>
-    <string name="cstor_new_password" msgid="6218562692435670047">"Nuova password:"</string>
-    <string name="cstor_confirm_password" msgid="8996028123356342466">"Conferma nuova password:"</string>
-    <string name="cstor_first_time_hint" msgid="1831593416099224962">"Imposta una password per l\'archivio di credenziali."</string>
-    <string name="cstor_first_time_hint_from_action" msgid="4690937025845780557">"Imposta una password per l\'archivio di credenziali."</string>
-    <string name="cstor_password_error" msgid="2917326097260402464">"Inserisci la password corretta."</string>
-    <string name="cstor_password_error_reset_warning" msgid="3336370539045905953">"Inserisci la password corretta. Hai a disposizione un altro tentativo per inserirla, dopodiché l\'archivio di credenziali verrà cancellato."</string>
-    <string name="cstor_password_error_reset_warning_plural" msgid="6209069679269017200">"Inserisci la password corretta. Hai a disposizione altri %d tentativi per inserirla, dopodiché l\'archivio di credenziali verrà cancellato."</string>
-    <string name="cstor_passwords_error" msgid="956773958408751155">"Le password non corrispondono."</string>
-    <string name="cstor_passwords_empty_error" msgid="6062539742626760734">"Inserisci una password e confermala."</string>
-    <string name="cstor_password_empty_error" msgid="7249632576906961482">"Inserisci la password."</string>
-    <string name="cstor_password_verification_error" msgid="8553930704493511389">"Inserisci di nuovo la password. La password deve essere formata da almeno 8 caratteri e non deve contenere spazi."</string>
-    <string name="cstor_name_empty_error" msgid="7499971191993770322">"Inserisci un nome."</string>
-    <string name="cstor_name_char_error" msgid="8048089317968192516">"Inserisci un nome contenente soltanto lettere e numeri."</string>
-    <string name="cstor_storage_error" msgid="7140697503172458161">"Impossibile salvare il certificato. Fai clic su OK per riprovare."</string>
-    <string name="cstor_unable_to_save_cert" msgid="1631402544447196406">"Impossibile salvare il certificato. L\'archivio di credenziali non è abilitato o inizializzato in modo appropriato."</string>
-    <string name="cstor_cert_not_saved" msgid="6318149789449538491">"Il certificato non è stato salvato."</string>
-    <string name="cstor_is_reset" msgid="449870501126790589">"L\'archivio di credenziali è cancellato."</string>
-    <string name="cstor_is_enabled" msgid="4054049098081482785">"L\'archivio di credenziali è attivo."</string>
-    <string name="cstor_is_added" msgid="794788474010251572">"%s è stato aggiunto."</string>
+    <string name="credentials_category" msgid="8536992056377271234">"Archivio credenziali"</string>
+    <string name="credentials_access" msgid="4843187230913860492">"Usa credenziali protezione"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"Consenti accesso applicazioni a certificati protezione e altre credenziali"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"Inserisci password"</string>
+    <string name="credentials_unlock_hint" msgid="594679530407918031">"Inserisci la password dell\'archivio di credenziali."</string>
+    <string name="credentials_install_certificates" msgid="177337517568022236">"Installa da scheda SD"</string>
+    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Installa certificati crittografati da scheda SD"</string>
+    <string name="credentials_set_password" msgid="9104473585811899989">"Imposta password"</string>
+    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Imposta o modifica la password dell\'archivio di credenziali"</string>
+    <string name="credentials_reset" msgid="9170150870552453457">"Cancella archivio"</string>
+    <string name="credentials_reset_summary" msgid="1530388094693731636">"Cancella·tutti·i·contenuti·dall\'archivio·di·credenziali·e·reimposta·la·relativa·password"</string>
+    <string name="credentials_reset_hint" msgid="819990295796804516">"Eliminare tutte le credenziali e reimpostare la password dell\'archivio di credenziali?"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"Password attuale:"</string>
+    <string name="credentials_new_password" msgid="267487774686796938">"Nuova password:"</string>
+    <string name="credentials_confirm_password" msgid="4732250000633424345">"Conferma nuova password:"</string>
+    <string name="credentials_first_time_hint" msgid="1567821077545346039">"Imposta una password per l\'archivio di credenziali (almeno 8 caratteri)."</string>
+    <string name="credentials_wrong_password" msgid="7525192410790152041">"Inserisci la password corretta."</string>
+    <string name="credentials_reset_warning" msgid="6392481296673345268">"Inserisci la password corretta. Hai a disposizione un altro tentativo per inserirla, dopodiché l\'archivio di credenziali verrà cancellato."</string>
+    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Inserisci la password corretta. Hai a disposizione altri <xliff:g id="NUMBER">%1$d</xliff:g> tentativi per inserirla, dopodiché l\'archivio di credenziali verrà cancellato."</string>
+    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Le password non corrispondono."</string>
+    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Devi inserire una password e confermarla."</string>
+    <string name="credentials_password_empty" msgid="8292138152983330473">"Inserisci la password."</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"La password deve essere formata da almeno 8 caratteri."</string>
+    <string name="credentials_erased" msgid="7700309135582200849">"L\'archivio di credenziali è cancellato."</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"L\'archivio di credenziali è attivo."</string>
+    <string name="credentials_disabled" msgid="7453188089059045380">"L\'archivio di credenziali non è attivo."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tono chiamate di emergenza"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Imposta il comportamento in caso di chiamata di emergenza"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Privacy"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Impostazioni privacy"</string>
+    <string name="location_section_title" msgid="6072558684044939786">"Posizione"</string>
+    <string name="settings_section_title" msgid="7413252428447723032">"Impostazioni"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Dati personali"</string>
+    <string name="backup_settings_title" msgid="2968262658155327829">"Backup delle mie impostazioni"</string>
+    <string name="backup_erase_dialog_title" msgid="6028429904055779443">"Backup impostazioni"</string>
+    <string name="backup_erase_dialog_message" msgid="9096433810456900531">"Interrompere il backup delle impostazioni e cancellare tutte le copie sui server Google?"</string>
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 8db484ff71b..02436dff9d2 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -24,13 +24,23 @@
     <item msgid="5345178126174698955">"太平洋"</item>
     <item msgid="8392017019801393511">"すべて"</item>
   </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"アニメーションなし"</item>
+    <item msgid="6291186755504776720">"一部のアニメーション"</item>
+    <item msgid="3856065399819979491">"すべてのアニメーション"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"ウィンドウアニメーションを表示しない"</item>
+    <item msgid="4460915688877708508">"ウィンドウアニメーションの一部を表示"</item>
+    <item msgid="488968798204105119">"ウィンドウアニメーションをすべて表示"</item>
+  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15秒"</item>
     <item msgid="8881760709354815449">"30秒"</item>
     <item msgid="7589406073232279088">"1分"</item>
     <item msgid="7001195990902244174">"2分"</item>
     <item msgid="5721688686241190620">"10分"</item>
-    <item msgid="1781492122915870416">"常時点灯"</item>
+    <item msgid="7156442995039264948">"30分"</item>
   </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"非常に遅い"</item>
@@ -58,18 +68,14 @@
     <item msgid="2923732046112398627">"自動"</item>
     <item msgid="5434666299123318296">"なし"</item>
     <item msgid="3159594845889645948">"WEP"</item>
-    <item msgid="6303607119537134095">"WPA Personal"</item>
-    <item msgid="1977424472734732392">"WPA2 Personal"</item>
-    <item msgid="5185669984217684689">"WPA-EAP"</item>
-    <item msgid="8643206823103498303">"IEEE 802.1x"</item>
+    <item msgid="1687348101566181433">"WPA/WPA2 PSK"</item>
+    <item msgid="329777238762866787">"802.1x Enterprise"</item>
   </string-array>
   <string-array name="wifi_security_without_auto_entries">
     <item msgid="4402120432904877907">"なし"</item>
     <item msgid="2329148995431627488">"WEP"</item>
-    <item msgid="2296204649410509235">"WPA Personal"</item>
-    <item msgid="8928468573279595315">"WPA2 Personal"</item>
-    <item msgid="8319241197948974314">"WPA-EAP"</item>
-    <item msgid="2222409752754955757">"IEEE 802.1x"</item>
+    <item msgid="6903317668294332381">"WPA/WPA2 PSK"</item>
+    <item msgid="7280821339307729710">"802.1x Enterprise"</item>
   </string-array>
   <string-array name="wifi_wep_type">
     <item msgid="1497433962958697183">"自動"</item>
@@ -108,7 +114,7 @@
     <item msgid="1818786254010764570">"なし"</item>
     <item msgid="6189918678874123056">"PAP"</item>
     <item msgid="1524112260493662517">"MSCHAP"</item>
-    <item msgid="1586767102985419413">"MSCHAP2"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
@@ -116,4 +122,10 @@
     <item msgid="3165868966179561687">"アラート"</item>
     <item msgid="6038758039030476855">"バイブレーション"</item>
   </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"なし"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAPまたはCHAP"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 1baf6bca7cf..7d382f013b9 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -15,6 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"はい"</string>
+    <string name="no" msgid="6731231425810196216">"いいえ"</string>
     <string name="device_info_default" msgid="7847265875578739287">"不明"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"無線通信をオン"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"無線通信をオフ"</string>
@@ -56,6 +58,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
     <string name="sdcard_setting" msgid="5922637503871474866">"SDカード"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"充電状況"</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"電源:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"電池の残量表示:"</string>
     <string name="battery_info_level_label" msgid="8706526709307788737">"電池残量:"</string>
     <string name="battery_info_health_label" msgid="6416051542741886958">"電池の状態:"</string>
@@ -75,6 +78,11 @@
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"放電中"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"充電していません"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"満充電"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"電池使用時間:"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"不明"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"不明"</string>
     <string name="battery_info_health_good" msgid="8070356565806711806">"半分以上残っています"</string>
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"加熱状態"</string>
@@ -104,6 +112,12 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetoothペア設定リクエスト"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"ペア設定リクエスト"</string>
     <string name="bluetooth_notif_message" msgid="5381418499788668724">"ペアとして設定 "</string>
+    <string name="device_picker" msgid="8721012448931226323">"Bluetooth端末の選択"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth許可リクエスト"</string>
+    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"アプリケーションがBluetoothをONにする許可をリクエストしています。許可しますか？"</string>
+    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"アプリケーションが、この端末を<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他のBluetooth端末から検出できるようにする許可をリクエストしています。許可しますか？"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"アプリケーションが、BluetoothをONにしてこの端末を<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他の端末から検出できるようにする許可をリクエストしています。許可しますか？"</string>
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"BluetoothをONにしています..."</string>
     <string name="date_and_time" msgid="4114084177056654663">"日付と時刻"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 PM"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -196,7 +210,8 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"ワイヤレス接続をすべて無効にする"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"ワイヤレス接続を無効にしています..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"ワイヤレス接続を有効にしています..."</string>
-    <string name="radio_controls_title" msgid="8356991079873437337">"ワイヤレス設定"</string>
+    <string name="radio_controls_title" msgid="5868688473587168882">"無線とネットワーク"</string>
+    <string name="wireless_networks_settings_title" msgid="149274247949769551">"ワイヤレスとネットワークの設定"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Wi-Fi、Bluetooth、機内モード、モバイルネットワーク、VPNの設定"</string>
     <string name="roaming" msgid="3596055926335478572">"データローミング"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"ローミング中にデータサービスに接続します"</string>
@@ -219,20 +234,29 @@
     <string name="date_time_date_format" msgid="436706100255870967">"日付形式"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"アルファベット順"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"タイムゾーン順"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"セキュリティ &amp; 位置情報"</string>
+    <string name="security_settings_title" msgid="5168491784222013179">"現在地情報とセキュリティ"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"位置情報とセキュリティの設定"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"現在地、画面のロック解除、SIMカードのロック、認証情報ストレージのロックの設定"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"現在地、画面のロック解除、認証情報ストレージのロックを設定します"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"パスワード"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"BluetoothをONにする"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth設定"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth設定"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"端末の名前、接続や検出設定"</string>
-    <string name="bluetooth_pin_entry" msgid="5627349871303455279">"Bluetoothペア設定リクエスト"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetoothのペア設定リクエスト"</string>
     <string name="bluetooth_device_info" msgid="6644515376523965073">"Bluetooth端末情報"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="7551139612735632370">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"ペアにするPINを入力してください。"\n"(0000か1234を試してください)"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」とペア設定するためのPINを入力してください（0000か1234を試してください）。"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」とペア設定するためのパスキーを入力してください。"</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」とペア設定するには、パスキー:<xliff:g id="PASSKEY">%2$s</xliff:g>が表示されていることを確認してください。"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"がペア設定をリクエストしています。"</string>
+    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"ペア設定のため<xliff:g id="PASSKEY">%2$s</xliff:g>を「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」に入力してください。"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"ペア設定する"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"ペア設定しない"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"Bluetooth端末"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"注意"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>とのペアリングで問題が発生しました。"</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="6938408362011024289">"入力されたPINが正しくないため、<xliff:g id="DEVICE_NAME">%1$s</xliff:g>とのペアリングで問題が発生しました。"</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"入力されたPINまたはパスキーが正しくないため、<xliff:g id="DEVICE_NAME">%1$s</xliff:g>とのペア設定で問題が発生しました。"</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>との通信を確立できません。"</string>
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"ペア設定が<xliff:g id="DEVICE_NAME">%1$s</xliff:g>に拒否されました。"</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>への接続で問題が発生しました。"</string>
@@ -246,6 +270,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"接続先..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"メディア"</string>
     <string name="bluetooth_profile_headset" msgid="1874975688666658946">"電話"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"転送"</string>
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"メディアの音声に接続"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"携帯電話の音声に接続"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"携帯電話とメディアの音声に接続"</string>
@@ -255,8 +280,11 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"プロフィール"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"メディアの音声に接続"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"携帯電話の音声に接続"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ファイル転送サーバーに接続"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ファイル転送サーバーに接続しない"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"メディアの音声に使用"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"携帯電話の音声に使用"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ファイル転送に使用"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Wi-FiをONにする"</string>
@@ -273,17 +301,13 @@
     <string name="security" msgid="1040691896987225267">"セキュリティ"</string>
     <string name="wifi_security_open" msgid="3513305614048816607">"オープン"</string>
     <string name="wifi_security_wep" msgid="7082604129842065776">"WEP"</string>
-    <string name="wifi_security_wpa" msgid="8980169410565477162">"WPA"</string>
-    <string name="wifi_security_wpa2" msgid="5780665935088930524">"WPA2"</string>
-    <string name="wifi_security_wpa_eap" msgid="7485687331651751101">"WPA-EAP"</string>
-    <string name="wifi_security_ieee8021x" msgid="8538687609878109005">"IEEE8021X"</string>
+    <string name="wifi_security_psk" msgid="3392399380570381452">"WPA/WPA2 PSK"</string>
+    <string name="wifi_security_eap" msgid="8309434150934969132">"Enterprise（802.1x）"</string>
     <string name="wifi_security_unknown" msgid="4564208312073060668">"不明"</string>
     <string name="wifi_security_verbose_open" msgid="8117878112088901945">"オープンネットワーク"</string>
     <string name="wifi_security_verbose_wep" msgid="9220757688700421508">"WEPで保護"</string>
-    <string name="wifi_security_verbose_wpa" msgid="598697674252714455">"WPAで保護"</string>
-    <string name="wifi_security_verbose_wpa2" msgid="4116236883347875722">"WPA2で保護"</string>
-    <string name="wifi_security_verbose_wpa_eap" msgid="1984821646949066624">"WPA-EAPで保護"</string>
-    <string name="wifi_security_verbose_ieee8021x" msgid="5552995793910186310">"IEEE 802.1xで保護"</string>
+    <string name="wifi_security_verbose_psk" msgid="1110130025330416225">"WPA/WPA2 PSKで保護"</string>
+    <string name="wifi_security_verbose_eap" msgid="586632662086063">"802.1x EAPで保護"</string>
     <string name="ip_address" msgid="850672263358989449">"IPアドレス"</string>
     <string name="signal" msgid="1947969631626413228">"電波強度"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"ONにしています..."</string>
@@ -302,14 +326,13 @@
     <string name="please_type_anonymous_identity" msgid="835061562079965048">"匿名ID"</string>
     <string name="please_select_client_certificate" msgid="2137906961594663234">"クライアント証明書"</string>
     <string name="please_select_ca_certificate" msgid="5010815181914420677">"CA証明書"</string>
-    <string name="please_type_private_key_passwd" msgid="4077744679722504443">"秘密鍵のパスワード"</string>
     <string name="please_type_passphrase" msgid="8256017704131522462">"ワイヤレス接続パスワード"</string>
     <string name="please_type_hex_key" msgid="8751224390407867551">"WEPの16進キー (0～9、A～F)"</string>
     <string name="wifi_show_password" msgid="4235237470701732009">"パスワードを表示"</string>
     <string name="scan_wifi" msgid="2459901725350542606">"スキャン"</string>
     <string name="summary_not_in_range" msgid="3926674700733548684">"圏外"</string>
     <string name="summary_remembered" msgid="6079941090549401742">"接続履歴あり"</string>
-    <string name="summary_connection_failed" msgid="7610394657613410489">"接続できませんでした。選択すると再試行します。"</string>
+    <string name="summary_connection_failed" msgid="2351885658101671413">"接続できませんでした。タップすると再試行します。"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fiネットワーク"</string>
     <string name="wifi_type_ssid" msgid="1326839657083292017">"ネットワークSSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"セキュリティ"</string>
@@ -360,6 +383,7 @@
     <string name="status_disconnected" msgid="7561688569905126046">"切断"</string>
     <string name="status_failed" msgid="610462050405904601">"失敗"</string>
     <string name="sound_and_display_settings" msgid="349770582993029003">"サウンド &amp; 画面設定"</string>
+    <string name="sound_and_display_settings_title" msgid="5036144539683697330">"音と表示の設定"</string>
     <string name="sound_settings" msgid="5007659014828162881">"音の設定"</string>
     <string name="sound_and_display_settings_summary" msgid="1433943789593286064">"着信音、操作音、画面の明るさなど"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"マナーモード"</string>
@@ -385,11 +409,14 @@
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"選択時の操作音"</string>
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"メニュー選択時の操作音をONにする"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"メニュー選択時の操作音をONにする"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"入力時のバイブレーション"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"ソフトキーを押したときおよび特定のUI操作が発生したときにバイブレーションさせます"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"ソフトキーを押したときおよび特定のUI操作が発生したときにバイブレーションさせます"</string>
     <string name="play_media_notification_sounds_enable_title" msgid="1008791464029179529">"SDカードの通知"</string>
     <string name="play_media_notification_sounds_enable_summary_on" msgid="7675466959375667370">"SDカード通知時に音を鳴らします"</string>
     <string name="play_media_notification_sounds_enable_summary_off" msgid="8672617597028744693">"SDカード通知時に音を鳴らします"</string>
-    <string name="sync_settings" msgid="2212736205476453234">"データの同期"</string>
-    <string name="sync_settings_summary" msgid="6480534906375217074">"同期するアプリケーションの選択"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"アカウントと同期"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"アカウントの追加や削除、アカウント設定の変更を行います"</string>
     <string name="search_settings" msgid="1910951467596035063">"検索"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"検索設定と履歴の管理"</string>
     <string name="display_settings" msgid="3912042046350078328">"画面設定"</string>
@@ -403,6 +430,7 @@
     <string name="brightness_summary" msgid="838917350127550703">"画面の明るさを調整する"</string>
     <string name="screen_timeout" msgid="4882669461447531301">"バックライト消灯"</string>
     <string name="screen_timeout_summary" msgid="2905757633140605334">"画面バックライトを自動消灯するまでの時間"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"明るさを自動調整"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIMカードロック設定"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIMカードロック設定"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIMカードロック"</string>
@@ -436,7 +464,8 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"端末の状態"</string>
     <string name="device_status" msgid="607405385799807324">"端末の状態"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"電話番号、電波状態など"</string>
-    <string name="storage_settings_title" msgid="8461515684514801302">"SDカード &amp; 端末容量"</string>
+    <string name="storage_settings" msgid="6681164315506788024">"SDカードと端末容量"</string>
+    <string name="storage_settings_title" msgid="5379463509034022773">"SDカードと端末容量の設定"</string>
     <string name="storage_settings_summary" msgid="9176693537325988610">"SDカードの取り外し、空き容量の表示"</string>
     <string name="status_number" msgid="5123197324870153205">"電話番号"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
@@ -480,6 +509,11 @@
     <string name="apn_mms_port" msgid="4074188088199243040">"MMSポート"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"認証タイプ"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"なし"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAPまたはCHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APNタイプ"</string>
     <string name="menu_delete" msgid="6981294422841124659">"APNを削除"</string>
     <string name="menu_new" msgid="3014205883303921729">"新しいAPN"</string>
@@ -518,12 +552,15 @@
     <string name="location_network_based" msgid="8815705866861993344">"ワイヤレスネットワークを使用"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"無線ネットワークを使用するアプリケーション(地図など)で位置を表示する"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Wi-Fi/モバイルネットワークで位置を検出する"</string>
-    <string name="location_gps" msgid="375912731641377120">"GPS機能をONにする"</string>
-    <string name="location_street_level" msgid="5899941752252356344">"高精度測位（電池の消費を節約する場合はOFFにしてください）"</string>
+    <string name="location_gps" msgid="6296125378829097831">"GPS機能を使用"</string>
+    <string name="location_street_level" msgid="6460740847018275745">"高精度測位（電池の消費を節約する場合はOFFにしてください）"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"高精度測位（電池消費増、電波が良好な場所で使用）"</string>
-    <string name="use_location_title" msgid="7585990952633568732">"Googleと共有する"</string>
-    <string name="use_location_summary" msgid="4411467143899877395">"検索やサービスの品質向上にGoogleが位置情報を使用することを許可しますか？"</string>
-    <string name="use_location_warning_message" msgid="5696732842038416151">"検索結果やサービスの品質向上にGoogleが位置情報を使用することを許可しますか？"</string>
+    <string name="assisted_gps" msgid="4649317129586736885">"A-GPSを使用"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"サーバーでGPSを補助します（OFFにするとネットワーク使用率が減少します）"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"サーバーでGPSを補助します（OFFにするとGPS性能が向上します）"</string>
+    <string name="use_location_title" msgid="5447030582538504247">"現在地情報を使用"</string>
+    <string name="use_location_summary" msgid="1816849484040070431">"現在地情報をGoogleの検索結果やサービスで利用する"</string>
+    <string name="use_location_warning_message" msgid="1420184860518262439">"検索結果やサービスの品質向上にGoogleが位置情報を使用することを許可しますか？"</string>
     <string name="agree" msgid="6288718671527758326">"同意する"</string>
     <string name="disagree" msgid="6221069272309799230">"同意しない"</string>
     <string name="about_settings" msgid="1743378368185371685">"端末情報"</string>
@@ -538,6 +575,10 @@
     <string name="settings_license_activity_title" msgid="7553683406244228650">"オープンソースライセンス"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"ライセンスの読み込み中に問題が発生しました。"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"読み込み中..."</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"安全に関する情報"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"安全に関する情報"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"この電話はデータサービスに接続されていません。この情報を表示するにはインターネットに接続されたコンピュータから%sにアクセスしてください。"</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"読み込み中..."</string>
     <string name="lock_settings_title" msgid="5828348303971852121">"画面ロックの解除パターン"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"パターンを変更する"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"現在のパターンを入力"</string>
@@ -566,9 +607,9 @@
     <string name="skip_button_label" msgid="8680422740354436943">"キャンセル"</string>
     <string name="next_button_label" msgid="8890792540116568321">"次へ"</string>
     <string name="lock_title" msgid="4059246467204273930">"携帯電話の保護"</string>
-    <string name="lock_intro_message" msgid="5352897389718432077"><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_intro_message" msgid="9100785646737118042"><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" msgid="8052305554017485410">"パターン例"</string>
-    <string name="lock_example_message" msgid="7431982730914254881">"少なくとも4つの点を結んで下さい。"\n" "\n"パターンを決めたら[次へ]を選択して進みます。"</string>
+    <string name="lock_example_message" msgid="1838650097090632706">"最低4つの点を結んでください。"\n" "\n"パターンを決めたら[次へ]をタップしてパターンを描画します。"</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"アプリケーションの管理"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"インストール済みアプリケーションを管理/削除します"</string>
     <string name="applications_settings" msgid="3736173521008476946">"アプリケーション"</string>
@@ -602,12 +643,12 @@
     <string name="filter" msgid="2018011724373033887">"フィルタ"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"フィルタオプションを選択"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"すべて"</string>
-    <string name="filter_apps_third_party" msgid="1096017647285183437">"サードパーティ"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"ダウンロード済み"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"実行中"</string>
     <string name="loading" msgid="3200408047793887917">"読み込み中..."</string>
     <string name="recompute_size" msgid="7722567982831691718">"サイズを再計算中..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"削除"</string>
-    <string name="clear_data_dlg_text" msgid="8796694785488630642">"このアプリケーションで保存したすべての情報が完全に削除されます。"</string>
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"このアプリケーションのすべてのデータ（ファイル、設定、アカウント、データベースを含む）が完全に削除されます。"</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"キャンセル"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"アプリケーションが見つかりません"</string>
@@ -620,9 +661,23 @@
     <string name="security_settings_desc" msgid="3116027624526915561">"このアプリケーションは下記にアクセスできます:"</string>
     <string name="computing_size" msgid="1599186977475211186">"計算中..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"パッケージのサイズを計算できません"</string>
-    <string name="empty_list_msg" msgid="1883660401486953588">"サードパーティ製のアプリケーションはインストールされていません。"</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"サードパーティ製アプリケーションはインストールされていません。"</string>
     <string name="version_text" msgid="9189073826278676425">"バージョン<xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
-    <string name="language_settings" msgid="2939555761536357092">"地域/言語 &amp; 文字入力"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"実行中のサービス"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"現在実行中のサービスを表示して制御"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"再起動中"</string>
+    <string name="no_running_services" msgid="6981216347270280598">"実行中のサービスはありません"</string>
+    <string name="confirm_stop_service" msgid="5700448757318301681">"サービスを停止しますか？"</string>
+    <string name="confirm_stop_service_msg" msgid="1202118456282395730">"このサービスは、再起動するまで実行されません。アプリケーション<xliff:g id="APPLICATION">%1$s</xliff:g>にとって望ましくない結果になることがあります。"</string>
+    <string name="confirm_stop_stop" msgid="7382363913280993331">"停止"</string>
+    <string name="confirm_stop_cancel" msgid="206495326622692381">"キャンセル"</string>
+    <string name="service_started_by_app" msgid="8432097226392386802">"アプリケーションから起動: 停止するにはタップしてください"</string>
+    <string name="service_client_name" msgid="2337664610975074717">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: タップして管理"</string>
+    <string name="service_background_processes" msgid="5158600475629177758">"使用可能: <xliff:g id="FREE">%2$s</xliff:g>+<xliff:g id="MEMORY">%3$s</xliff:g>（<xliff:g id="COUNT">%1$d</xliff:g>内）"</string>
+    <string name="service_foreground_processes" msgid="4013890350284680796">"その他: <xliff:g id="MEMORY">%2$s</xliff:g>（<xliff:g id="COUNT">%1$d</xliff:g>内）"</string>
+    <string name="service_process_name" msgid="8630408984456958400">"プロセス: <xliff:g id="PROCESS">%1$s</xliff:g>"</string>
+    <string name="language_settings" msgid="502219872342167227">"言語とキーボード"</string>
+    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"言語とキーボードの設定"</string>
     <string name="language_settings_summary" msgid="595647729475399987">"言語と地域、文字入力の設定"</string>
     <string name="language_category" msgid="3391756582724541530">"地域/言語設定"</string>
     <string name="text_category" msgid="6342540511465136739">"文字入力設定"</string>
@@ -637,7 +692,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"英語: Spaceキー2回でピリオド(.)を挿入"</string>
     <string name="show_password" msgid="2198798062604049206">"パスワードを表示"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"入力時にパスワードを表示する"</string>
-    <string name="ime_security_warning" msgid="3458652708716006477">"この入力方法では入力したすべてのテキストの収集を許可します。収集されるテキストには個人情報データやクレジットカード番号などが含まれます。これはアプリケーション<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>によるものです。この入力方法を有効にしますか？"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"この入力方法を選択すると、入力する全文字列の収集をアプリケーション（<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>）に許可することになります。これにはパスワードやクレジットカード番号などの個人情報も含まれます。この入力方法を使用しますか？"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"ユーザー辞書"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"ユーザー辞書"</string>
     <string name="user_dict_settings_summary" msgid="2460427065601355471">"ユーザー辞書に単語を登録／削除する"</string>
@@ -665,7 +720,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"文字入力"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"テキスト入力オプションを管理"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>の設定"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="4919680715154885028">"画面キーボードの設定"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"画面キーボードの設定"</string>
     <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"端末内蔵キーボード"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"端末内蔵キーボードの設定"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"開発"</string>
@@ -676,11 +731,11 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充電中に画面をスリープにしない"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"擬似ロケーションを許可"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"擬似ロケーションを許可"</string>
-    <string name="adb_warning_title" msgid="1756027479229533250">"USBデバッグを有効にしますか？"</string>
+    <string name="adb_warning_title" msgid="6234463310896563253">"USBデバッグを許可しますか？"</string>
     <string name="adb_warning_message" msgid="5352555112049663033">"USBデバッグは開発専用に設計されています。コンピュータと端末の間でデータをコピーする場合、アプリケーションを通知なしで端末にインストールする場合、ログ データを読み取る場合に使用できます。"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"ガジェットを選択"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"ウィジェットを選択"</string>
-    <string name="battery_history_details_for" msgid="5189636461798594740">"UID %dの詳細"</string>
+    <string name="battery_history_details_for" msgid="5924639922153109669">"UID <xliff:g id="NUMBER">%d</xliff:g>の詳細"</string>
     <string name="battery_history_uid" msgid="1016606150528436298">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage" msgid="8010852371665217020">"<xliff:g id="APP_NAME">%1$s</xliff:g>のネットワーク使用詳細:"</string>
     <string name="battery_history_bytes_received" msgid="980307569180518302">"受信バイト数:<xliff:g id="BYTES">%1$d</xliff:g>"</string>
@@ -716,12 +771,13 @@
     <string name="app_name_label" msgid="2000949925256858308">"アプリケーション"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"回数"</string>
     <string name="usage_time_label" msgid="295954901452833058">"使用時間"</string>
-    <string name="accessibility_settings_title" msgid="4239640930601071058">"ユーザー補助"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"ユーザー補助"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"ユーザー補助の設定"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"ユーザー補助オプションの管理"</string>
     <string name="toggle_accessibility_title" msgid="650839277066574497">"ユーザー補助"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"ユーザー補助サービス"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"ユーザー補助サービスがインストールされていません。"</string>
-    <string name="accessibility_service_security_warning" msgid="8386156287296967181">"このユーザー補助サービスを選択すると、入力する全テキストの収集をアプリケーション（<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>）に許可することになります。これにはクレジットカード番号などの個人情報（パスワードを除く）も含まれます。また、ユーザーインターフェースでのやり取りも記録されます。このユーザー補助サービスを有効にしますか？"</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"このユーザー補助サービスを選択すると、入力する全テキストの収集をアプリケーション（<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>）に許可することになります。これにはクレジットカード番号などの個人情報（パスワードを除く）も含まれます。また、ユーザーインターフェースでのやり取りも記録されます。このユーザー補助サービスを使用しますか？"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"ユーザー補助サービスを無効にしますか？"</string>
     <string name="power_usage_summary_title" msgid="5180282911164282324">"電池使用量"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"電池を使用している操作"</string>
@@ -733,7 +789,7 @@
     <string name="awake" msgid="387122265874485088">"端末使用時間"</string>
     <string name="wifi_on_time" msgid="4630925382578609056">"WiFiをONにしている時間"</string>
     <string name="bluetooth_on_time" msgid="4478515071957280711">"BluetoothをONにしている時間"</string>
-    <string name="usage_name_percent" msgid="1899151069711662289">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="PERCENT">%2$s</xliff:g>%%"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"電池使用量の詳細"</string>
     <string name="details_subtitle" msgid="32593908269911734">"詳細を使用"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"消費電力の調整"</string>
@@ -769,7 +825,7 @@
     <string name="battery_desc_wifi" msgid="1702486494565080431">"Wi-Fiの電池使用量"</string>
     <string name="battery_sugg_wifi" msgid="7542345142282261691">"未使用時または電波が届かないときはWi-FiをOFFにします"</string>
     <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Bluetoothの電池使用量"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="144393178427277439">"未使用時はBluetoothをOFFにします"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"未使用時はBluetoothをOFFにします"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"別のBluetooth端末に接続してみてください"</string>
     <string name="battery_desc_apps" msgid="8123202939321333639">"アプリケーションの実行時の電池使用量"</string>
     <string name="battery_sugg_apps_info" msgid="6065882899391322442">"アプリケーションを停止またはアンインストールします"</string>
@@ -781,9 +837,9 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"更新"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"メディアサーバー"</string>
-    <string name="tts_settings" msgid="6454363854545277027">"音声合成"</string>
+    <string name="tts_settings" msgid="3348626948015962987">"テキスト読み上げ"</string>
     <string name="tts_settings_summary" msgid="2627715231944602766">"テキストから音声への変換オプションの設定"</string>
-    <string name="tts_settings_title" msgid="5064947197040356736">"音声合成の制御"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"テキスト読み上げの設定"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"常に自分の設定を使用する"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"アプリケーション設定を下のデフォルト設定で上書きします"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"デフォルト設定"</string>
@@ -801,8 +857,11 @@
     <string name="tts_demo" msgid="405357591189935876">"これは音声合成のサンプルです。"</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"設定が変更されました。これがサンプル音です。"</string>
     <string name="gadget_title" msgid="7455548605888590466">"電源管理"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Wi-Fi設定の更新"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth設定の更新"</string>
+    <string name="credential_installer_activity_title" msgid="7600661521831762521">"認証情報インストーラ"</string>
     <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN設定"</string>
-    <string name="vpn_connect_to" msgid="9040615733700098831">"%sに接続"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"<xliff:g id="NAME">%s</xliff:g>に接続"</string>
     <string name="vpn_username_colon" msgid="7854930370861306247">"ユーザー名:"</string>
     <string name="vpn_password_colon" msgid="5716278710848606626">"パスワード:"</string>
     <string name="vpn_a_username" msgid="6664733641993968692">"ユーザー名"</string>
@@ -820,9 +879,9 @@
     <string name="vpn_menu_disconnect" msgid="8254492450022562235">"ネットワークから切断"</string>
     <string name="vpn_menu_edit" msgid="4526245173583195618">"ネットワークの編集"</string>
     <string name="vpn_menu_delete" msgid="3326527392609513129">"ネットワークを削除"</string>
-    <string name="vpn_error_miss_entering" msgid="1467455143582547499">"%sを入力する必要があります。"</string>
-    <string name="vpn_error_miss_selecting" msgid="953436717902387192">"%sを選択する必要があります。"</string>
-    <string name="vpn_error_duplicate_name" msgid="2786397299628471911">"VPN名「%s」は既に存在します。別の名前にしてください。"</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"<xliff:g id="CODE">%s</xliff:g>を入力する必要があります。"</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"<xliff:g id="OPTION">%s</xliff:g>を選択する必要があります。"</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"VPN名「<xliff:g id="NAME">%s</xliff:g>」は既に存在します。別の名前にしてください。"</string>
     <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"このVPNを削除してもよろしいですか？"</string>
     <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"このプロフィールの作成を中止してもよろしいですか？"</string>
     <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"このプロフィールに加えた変更を破棄してもよろしいですか？"</string>
@@ -833,10 +892,12 @@
     <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"このVPN設定には未設定のシークレット設定があります。シークレット設定を確認しますか？"</string>
     <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"入力したユーザー名またはパスワードが正しくありません。もう一度入力し直しますか？"</string>
     <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"サーバーから切断されました。入力したユーザー名またはパスワードが間違っている可能性があります。もう一度入力し直しますか？"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"サーバーから切断されました。ファイアウォールの背後にいるためにサーバーに接続できない可能性があります。もう一度接続しますか？"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"サーバーとのネゴシエーションに失敗しました。サーバーが暗号化オプションに同意しない場合があります。暗号化設定を確認しますか？"</string>
     <string name="vpn_type_title" msgid="6392933604218676224">"VPNの追加"</string>
     <string name="vpn_add_new_vpn" msgid="5438260689052714550">"VPNの追加"</string>
-    <string name="vpn_edit_title_add" msgid="2550661826320709266">"%s VPNの追加"</string>
-    <string name="vpn_edit_title_edit" msgid="1769999313158207723">"%sの詳細"</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"<xliff:g id="NAME">%s</xliff:g> VPNを追加"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"<xliff:g id="NAME">%s</xliff:g>の詳細"</string>
     <string name="vpns" msgid="3148141862835492816">"VPN"</string>
     <string name="vpn_connecting" msgid="8039521381692090116">"接続しています..."</string>
     <string name="vpn_disconnecting" msgid="7748050200708257066">"切断しています..."</string>
@@ -844,8 +905,8 @@
     <string name="vpn_connect_hint" msgid="7442898962925875181">"ネットワークに接続します"</string>
     <string name="vpn_name" msgid="1550918148476193076">"VPN名"</string>
     <string name="vpn_a_name" msgid="8445736942405283509">"VPN名"</string>
-    <string name="vpn_profile_added" msgid="2157095890825215726">"%sが追加されました"</string>
-    <string name="vpn_profile_replaced" msgid="384234123486734768">"%sが変更されました"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"「<xliff:g id="NAME">%s</xliff:g>」を追加しました"</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"「<xliff:g id="NAME">%s</xliff:g>」を変更しました"</string>
     <string name="vpn_user_certificate_title" msgid="6812545893924071742">"証明書を設定する"</string>
     <string name="vpn_user_certificate" msgid="949322691686938888">"ユーザー証明書"</string>
     <string name="vpn_a_user_certificate" msgid="8943983437956898649">"ユーザー証明書"</string>
@@ -866,53 +927,53 @@
     <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"VPNサーバー名"</string>
     <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS検索ドメイン"</string>
     <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS検索ドメイン"</string>
-    <string name="vpn_field_is_set" msgid="1880980734721258127">"%sが設定されました"</string>
-    <string name="vpn_field_not_set" msgid="6827205815004809490">"%sは設定されていません"</string>
-    <string name="vpn_field_not_set_optional" msgid="8665901697706781015">"%sは設定されていません（省略可）"</string>
-    <string name="vpn_enable_field" msgid="3348948489989523325">"%sを有効にする"</string>
-    <string name="vpn_disable_field" msgid="2286966253789266389">"%sを無効にする"</string>
-    <string name="vpn_is_enabled" msgid="5128973727115662815">"%sは有効になっています"</string>
-    <string name="vpn_is_disabled" msgid="8028085699769751756">"%sは無効になっています"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g>が設定されました"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g>は設定されていません"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g>は設定されていません（省略可）"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"<xliff:g id="OPTION">%s</xliff:g>を有効にする"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"<xliff:g id="OPTION">%s</xliff:g>を無効にする"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g>は有効です"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g>は無効です"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"VPN設定"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"VPNを設定および管理します"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"（変更なし）"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"（未設定）"</string>
-    <string name="cstor_settings_category" msgid="2284299080682591107">"認証情報ストレージ"</string>
-    <string name="cstor_access_title" msgid="1739505390736236717">"安全な認証情報を使用する"</string>
-    <string name="cstor_access_summary" msgid="4512681868217546677">"安全な証明書とその他の認証情報へのアクセスをアプリケーションに許可する"</string>
-    <string name="cstor_access_dialog_title" msgid="3024256293191879190">"パスワードを入力する"</string>
-    <string name="cstor_access_dialog_hint_from_action" msgid="679746865623760961">"認証情報ストレージパスワードを入力します。"</string>
-    <string name="cstor_set_passwd_title" msgid="6156763762703061470">"パスワードの設定"</string>
-    <string name="cstor_set_passwd_summary" msgid="5248560429856597398">"認証情報ストレージパスワードを設定または変更する"</string>
-    <string name="cstor_set_passwd_dialog_title" msgid="4071157542842979977">"パスワードの設定"</string>
-    <string name="cstor_reset_title" msgid="6001600882136794382">"ストレージをクリアする"</string>
-    <string name="cstor_reset_summary" msgid="7509525030771504833">"認証情報ストレージのすべてのコンテンツをクリアしてパスワードをリセットする"</string>
-    <string name="cstor_reset_hint" msgid="5331632794451859788">"すべての認証情報を削除して認証情報ストレージパスワードをリセットしてもよろしいですか？"</string>
-    <string name="cstor_name_credential_dialog_title" msgid="1723509156126180662">"証明書の名前を指定する"</string>
-    <string name="cstor_credential_name" msgid="2958936431813760259">"証明書名:"</string>
-    <string name="cstor_credential_password" msgid="7187440553141199409">"証明書を抽出するためのパスワード:"</string>
-    <string name="cstor_credential_info" msgid="6097346149400207440">"証明書の詳細:"</string>
-    <string name="cstor_name_credential_hint" msgid="6889198058976515785">"名前には文字と数字以外を使用することはできません。"</string>
-    <string name="cstor_old_password" msgid="979282118063084561">"現在のパスワード:"</string>
-    <string name="cstor_new_password" msgid="6218562692435670047">"新しいパスワード:"</string>
-    <string name="cstor_confirm_password" msgid="8996028123356342466">"新しいパスワードの確認:"</string>
-    <string name="cstor_first_time_hint" msgid="1831593416099224962">"認証情報ストレージのパスワードを設定します。"</string>
-    <string name="cstor_first_time_hint_from_action" msgid="4690937025845780557">"認証情報ストレージのパスワードを設定します。"</string>
-    <string name="cstor_password_error" msgid="2917326097260402464">"正しいパスワードを入力してください。"</string>
-    <string name="cstor_password_error_reset_warning" msgid="3336370539045905953">"正しいパスワードを入力してください。パスワードの入力にもう1回失敗すると、認証情報ストレージが削除されます。"</string>
-    <string name="cstor_password_error_reset_warning_plural" msgid="6209069679269017200">"正しいパスワードを入力してください。パスワードの入力にあと%d回失敗すると、認証情報ストレージが削除されます。"</string>
-    <string name="cstor_passwords_error" msgid="956773958408751155">"パスワードが一致しません。"</string>
-    <string name="cstor_passwords_empty_error" msgid="6062539742626760734">"パスワードを入力して確認する必要があります。"</string>
-    <string name="cstor_password_empty_error" msgid="7249632576906961482">"パスワードを入力してください。"</string>
-    <string name="cstor_password_verification_error" msgid="8553930704493511389">"パスワードを再入力してください。パスワードは8文字以上である必要があり、スペースを含めることはできません。"</string>
-    <string name="cstor_name_empty_error" msgid="7499971191993770322">"名前を入力してください。"</string>
-    <string name="cstor_name_char_error" msgid="8048089317968192516">"文字と数字だけを含んだ名前を入力してください。"</string>
-    <string name="cstor_storage_error" msgid="7140697503172458161">"証明書を保存できません。[OK]をタップしてやり直してください。"</string>
-    <string name="cstor_unable_to_save_cert" msgid="1631402544447196406">"証明書を保存できません。認証情報ストレージが無効か、適切に初期化されていません。"</string>
-    <string name="cstor_cert_not_saved" msgid="6318149789449538491">"証明書は保存されていません。"</string>
-    <string name="cstor_is_reset" msgid="449870501126790589">"認証情報ストレージが消去されました。"</string>
-    <string name="cstor_is_enabled" msgid="4054049098081482785">"認証情報ストレージが有効になりました。"</string>
-    <string name="cstor_is_added" msgid="794788474010251572">"%sが追加されました。"</string>
+    <string name="credentials_category" msgid="8536992056377271234">"認証情報ストレージ"</string>
+    <string name="credentials_access" msgid="4843187230913860492">"安全な認証情報の使用"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"安全な証明書とその他の認証情報へのアクセスをアプリケーションに許可する"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"パスワードを入力する"</string>
+    <string name="credentials_unlock_hint" msgid="594679530407918031">"認証情報ストレージパスワードを入力します。"</string>
+    <string name="credentials_install_certificates" msgid="177337517568022236">"SDカードからインストール"</string>
+    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"暗号化された証明書をSDカードからインストールする"</string>
+    <string name="credentials_set_password" msgid="9104473585811899989">"パスワードの設定"</string>
+    <string name="credentials_set_password_summary" msgid="8287876917562085701">"認証情報ストレージパスワードを設定または変更する"</string>
+    <string name="credentials_reset" msgid="9170150870552453457">"ストレージの消去"</string>
+    <string name="credentials_reset_summary" msgid="1530388094693731636">"認証情報ストレージのすべてのコンテンツを消去してパスワードをリセットする"</string>
+    <string name="credentials_reset_hint" msgid="819990295796804516">"すべての認証情報を削除して認証情報ストレージパスワードをリセットしてもよろしいですか？"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"現在のパスワード:"</string>
+    <string name="credentials_new_password" msgid="267487774686796938">"新しいパスワード:"</string>
+    <string name="credentials_confirm_password" msgid="4732250000633424345">"新しいパスワードの確認:"</string>
+    <string name="credentials_first_time_hint" msgid="1567821077545346039">"認証情報ストレージのパスワードを設定します（8文字以上）。"</string>
+    <string name="credentials_wrong_password" msgid="7525192410790152041">"正しいパスワードを入力してください。"</string>
+    <string name="credentials_reset_warning" msgid="6392481296673345268">"正しいパスワードを入力してください。パスワードの入力にもう1回失敗すると、認証情報ストレージが消去されます。"</string>
+    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"正しいパスワードを入力してください。パスワードの入力にあと<xliff:g id="NUMBER">%1$d</xliff:g>回失敗すると、認証情報ストレージが消去されます。"</string>
+    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"パスワードが一致しません。"</string>
+    <string name="credentials_passwords_empty" msgid="8647631321684363549">"パスワードを入力して確認する必要があります。"</string>
+    <string name="credentials_password_empty" msgid="8292138152983330473">"パスワードを入力してください。"</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"パスワードを8文字以上で入力してください。"</string>
+    <string name="credentials_erased" msgid="7700309135582200849">"認証情報ストレージが消去されました。"</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"認証情報ストレージが有効になりました。"</string>
+    <string name="credentials_disabled" msgid="7453188089059045380">"認証情報ストレージが無効になりました。"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"緊急時の音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"緊急通報時の動作を設定します"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"プライバシー"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"プライバシーの設定"</string>
+    <string name="location_section_title" msgid="6072558684044939786">"位置情報"</string>
+    <string name="settings_section_title" msgid="7413252428447723032">"設定"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"個人データ"</string>
+    <string name="backup_settings_title" msgid="2968262658155327829">"設定のバックアップ"</string>
+    <string name="backup_erase_dialog_title" msgid="6028429904055779443">"バックアップの設定"</string>
+    <string name="backup_erase_dialog_message" msgid="9096433810456900531">"設定のバックアップを停止し、Googleサーバー上のすべてのコピーを消去してもよろしいですか？"</string>
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index b376d77225b..645d8d53671 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -24,38 +24,59 @@
     <item msgid="5345178126174698955">"태평양"</item>
     <item msgid="8392017019801393511">"모두"</item>
   </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"애니메이션 없음"</item>
+    <item msgid="6291186755504776720">"일부 애니메이션"</item>
+    <item msgid="3856065399819979491">"전체 애니메이션"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"창 애니메이션이 표시되지 않습니다."</item>
+    <item msgid="4460915688877708508">"일부 창 애니메이션이 표시됩니다."</item>
+    <item msgid="488968798204105119">"모든 창 애니메이션이 표시됩니다."</item>
+  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15초"</item>
     <item msgid="8881760709354815449">"30초"</item>
     <item msgid="7589406073232279088">"1분"</item>
     <item msgid="7001195990902244174">"2분"</item>
     <item msgid="5721688686241190620">"10분"</item>
-    <item msgid="1781492122915870416">"시간제한 없음"</item>
+    <item msgid="7156442995039264948">"30분"</item>
+  </string-array>
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"매우 느림"</item>
+    <item msgid="2361722960903353554">"느림"</item>
+    <item msgid="1145554631248513562">"보통"</item>
+    <item msgid="7553665153391107454">"빠름"</item>
+    <item msgid="2538100882620724753">"매우 빠름"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item msgid="7526050907652687351">"매우 낮음"</item>
+    <item msgid="2692137425242433765">"낮음"</item>
+    <item msgid="3332408460740717754">"보통"</item>
+    <item msgid="4907380534957572531">"높음"</item>
+    <item msgid="4699640516390840297">"매우 높음"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item msgid="478030717868306353">"미국식 영어"</item>
+    <item msgid="5192284521396794598">"영국 영어"</item>
+    <item msgid="3000262452051711991">"프랑스어"</item>
+    <item msgid="9214080387341763401">"독일어"</item>
+    <item msgid="5972100016440094433">"이탈리아어"</item>
+    <item msgid="5811378076054402537">"스페인어"</item>
+  </string-array>
+  <string-array name="wifi_security_entries">
+    <item msgid="2923732046112398627">"자동"</item>
+    <item msgid="5434666299123318296">"없음"</item>
+    <item msgid="3159594845889645948">"WEP"</item>
+    <item msgid="1687348101566181433">"WPA/WPA2 PSK"</item>
+    <item msgid="329777238762866787">"802.1x 엔터프라이즈"</item>
+  </string-array>
+  <string-array name="wifi_security_without_auto_entries">
+    <item msgid="4402120432904877907">"없음"</item>
+    <item msgid="2329148995431627488">"WEP"</item>
+    <item msgid="6903317668294332381">"WPA/WPA2 PSK"</item>
+    <item msgid="7280821339307729710">"802.1x 엔터프라이즈"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
-    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
-    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
-    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
-    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
-    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
-    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
-    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
-    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
-    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
-    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
-    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
-    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
-    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
-    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
-    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
-    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
-    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
-    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
-    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
-    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
-    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
-    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
-    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
   <string-array name="wifi_wep_type">
     <item msgid="1497433962958697183">"자동"</item>
     <item msgid="7182335713815377158">"WEP ASCII"</item>
@@ -64,14 +85,14 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3804733751095821976">"화면이 꺼질 때"</item>
     <item msgid="1549288661423279207">"전원에 연결되었을 때는 절전 모드로 전환되지 않음"</item>
-    <item msgid="1986753720941888596">"안함"</item>
+    <item msgid="1986753720941888596">"절전 모드로 전환 안함"</item>
   </string-array>
   <string-array name="battery_history_type_spinner">
     <item msgid="2193799199027871385">"CPU 사용량"</item>
     <item msgid="6401018715947316517">"네트워크 사용량"</item>
     <item msgid="188092590354892392">"GPS 사용량"</item>
     <item msgid="8414109131222049141">"센서 사용량"</item>
-    <item msgid="1327904325081257093">"부분적 가동 사용량"</item>
+    <item msgid="1327904325081257093">"부분 가동 사용량"</item>
     <item msgid="4832254146664706277">"기타 사용량"</item>
   </string-array>
   <string-array name="battery_history_which_spinner">
@@ -84,15 +105,27 @@
     <item msgid="1908750532762193304">"계수 시작"</item>
     <item msgid="1213951670006606353">"응용프로그램 이름"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
-    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
-    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
-    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
-    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
-    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
-    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
-    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
-    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
-    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
-    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="1818786254010764570">"없음"</item>
+    <item msgid="6189918678874123056">"PAP"</item>
+    <item msgid="1524112260493662517">"MSCHAP"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
+    <item msgid="8651992560135239389">"GTC"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"사용 안함"</item>
+    <item msgid="3165868966179561687">"알리미"</item>
+    <item msgid="6038758039030476855">"진동"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"없음"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP 또는 CHAP"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 5bb4269bf67..d0553e0671b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -15,6 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"예"</string>
+    <string name="no" msgid="6731231425810196216">"아니요"</string>
     <string name="device_info_default" msgid="7847265875578739287">"알 수 없음"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"무선 켜기"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"무선 끄기"</string>
@@ -56,6 +58,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"확인"</string>
     <string name="sdcard_setting" msgid="5922637503871474866">"SD 카드"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"배터리 상태:"</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"전원 플러그:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"배터리 충전 상태:"</string>
     <string name="battery_info_level_label" msgid="8706526709307788737">"배터리 수준:"</string>
     <string name="battery_info_health_label" msgid="6416051542741886958">"배터리 상태:"</string>
@@ -75,6 +78,11 @@
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"방전 중"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"충전 안함"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"충전 완료"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"전원연결되지 않음"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"알 수 없음"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"알 수 없음"</string>
     <string name="battery_info_health_good" msgid="8070356565806711806">"좋음"</string>
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"과열"</string>
@@ -104,14 +112,19 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth 페어링 요청"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"페어링 요청"</string>
     <string name="bluetooth_notif_message" msgid="5381418499788668724">"페어링하려면 선택합니다. "</string>
+    <string name="device_picker" msgid="8721012448931226323">"Bluetooth 장치 선택기"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"블루투스 권한 요청"</string>
+    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"휴대전화의 응용프로그램에서 블루투스 사용 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
+    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"휴대전화의 응용프로그램에서 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 블루투스 장치에서 사용자의 휴대전화를 찾을 수 있는 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"휴대전화의 응용프로그램에서 블루투스 사용 및 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 장치에서 사용자의 휴대전화를 찾을 수 있는 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"블루투스 켜는 중..."</string>
     <string name="date_and_time" msgid="4114084177056654663">"날짜 및 시간 설정"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 PM"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
     <string name="date_time_changeTime_text" msgid="7037437020000867740">"시간 변경"</string>
     <string name="date_time_changeDate_text" msgid="5259762626498028057">"날짜"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"표준시간대 선택"</string>
-    <!-- no translation found for normal_date_format (1982904221918374153) -->
-    <skip />
+    <string name="normal_date_format" msgid="1982904221918374153">"보통(<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"미리보기:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"글꼴 크기:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -192,33 +205,23 @@
     <string name="proxy_settings_label" msgid="3271174136184391743">"프록시 설정"</string>
     <string name="cancel" msgid="6859253417269739139">"취소"</string>
     <string name="settings_label" msgid="1626402585530130914">"설정"</string>
-    <!-- no translation found for settings_shortcut (3672145147925639262) -->
-    <skip />
+    <string name="settings_shortcut" msgid="3672145147925639262">"설정"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"비행 모드"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"모든 무선 연결 사용 안함"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"무선 연결을 끊는 중..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"무선 연결 사용 중..."</string>
-    <string name="radio_controls_title" msgid="8356991079873437337">"무선 제어"</string>
-    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
-    <skip />
-    <!-- no translation found for roaming (3596055926335478572) -->
-    <skip />
-    <!-- no translation found for roaming_enable (3737380951525303961) -->
-    <skip />
-    <!-- no translation found for roaming_disable (1295279574370898378) -->
-    <skip />
-    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
-    <skip />
-    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
-    <skip />
-    <!-- no translation found for roaming_warning (1269870211689178511) -->
-    <skip />
-    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
-    <skip />
-    <!-- no translation found for networks (6333316876545927039) -->
-    <skip />
-    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
-    <skip />
+    <string name="radio_controls_title" msgid="5868688473587168882">"무선 및 네트워크"</string>
+    <string name="wireless_networks_settings_title" msgid="149274247949769551">"무선 및 네트워크 설정"</string>
+    <string name="radio_controls_summary" msgid="2998818677094465517">"Wi-Fi, 블루투스, 비행 모드, 모바일 네트워크 및 VPN 관리"</string>
+    <string name="roaming" msgid="3596055926335478572">"데이터 로밍"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"로밍 시 데이터 서비스에 연결"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"로밍 시 데이터 서비스에 연결"</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"데이터 로밍을 사용 중지한 상태에서 홈 네트워크를 벗어났으므로 데이터 연결이 끊어졌습니다."</string>
+    <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"사용"</string>
+    <string name="roaming_warning" msgid="1269870211689178511">"데이터 로밍을 허용하시겠습니까? 높은 로밍 요금이 부과될 수 있습니다."</string>
+    <string name="roaming_reenable_title" msgid="7626425894611573131">"주의"</string>
+    <string name="networks" msgid="6333316876545927039">"운영자 선택"</string>
+    <string name="sum_carrier_select" msgid="6648929373316748020">"네트워크 운영자 선택"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"날짜 및 시간"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"날짜, 시간, 표준시간대 및 형식 설정"</string>
     <string name="date_time_auto" msgid="3086083265745944725">"자동"</string>
@@ -231,25 +234,31 @@
     <string name="date_time_date_format" msgid="436706100255870967">"날짜형식 선택"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"사전순으로 정렬"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"시간대별 정렬"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"보안 및 위치"</string>
-    <!-- no translation found for security_settings_summary (967393342537986570) -->
-    <skip />
+    <string name="security_settings_title" msgid="5168491784222013179">"장소 및 보안"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"장소 및 보안 설정"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"내 위치, 화면 잠금해제, SIM 카드 잠금, 자격증명 저장소 잠금 설정"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"내 위치, 화면 잠금해제, 자격증명 저장소 잠금 설정"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"비밀번호"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth 켜기"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth 설정"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth 설정"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"연결 관리, 장치이름 및 검색가능 여부 설정"</string>
-    <string name="bluetooth_pin_entry" msgid="5627349871303455279">"Bluetooth 페어링 요청"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth 페어링 요청"</string>
     <string name="bluetooth_device_info" msgid="6644515376523965073">"Bluetooth 장치 정보"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="7551139612735632370">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"페어링을 위해 PIN 입력"\n"(0000 또는 1234를 입력하세요.)"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"\'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'와(과) 페어링하기 위해 PIN을 입력(0000 또는 1234)하세요."</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"\'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'와(과) 페어링하려면 패스키를 입력하세요."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"\'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'와(과) 페어링하려면 다음 패스키가 표시 중인지 확인합니다. <xliff:g id="PASSKEY">%2$s</xliff:g>"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"에서 페어링하고자 합니다."</string>
+    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"페어링하려면 \'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'에서 <xliff:g id="PASSKEY">%2$s</xliff:g>을(를) 입력합니다."</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"페어링"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"페어링 안함"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"블루투스 장치"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"주의"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 페어링하는 동안 문제가 발생했습니다."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="6938408362011024289">"입력한 PIN이 올바르지 않기 때문에 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 페어링하는 동안 문제가 발생했습니다."</string>
-    <!-- no translation found for bluetooth_pairing_device_down_error_message (6688215193824686741) -->
-    <skip />
-    <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
-    <skip />
+    <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"PIN 또는 패스키가 올바르지 않기 때문에 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 페어링하는 동안 문제가 발생했습니다."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 통화할 수 없습니다."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>에서 페어링을 거부했습니다."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>에 연결하는 동안 문제가 발생했습니다."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"장치 검색"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"연결"</string>
@@ -261,6 +270,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"연결..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"미디어"</string>
     <string name="bluetooth_profile_headset" msgid="1874975688666658946">"휴대폰"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"전송"</string>
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"미디어 오디오에 연결됨"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"휴대폰 오디오에 연결됨"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"휴대폰 및 미디어 오디오에 연결됨"</string>
@@ -270,8 +280,11 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"프로필"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"미디어 오디오에 연결됨"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"휴대폰 오디오에 연결됨"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"파일 전송 서버에 연결됨"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"파일 전송 서버에 연결되지 않았습니다."</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"미디어 오디오에 사용"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"휴대폰 오디오에 사용"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"파일 전송에 사용"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Wi-Fi 켜기"</string>
@@ -288,25 +301,13 @@
     <string name="security" msgid="1040691896987225267">"보안"</string>
     <string name="wifi_security_open" msgid="3513305614048816607">"열기"</string>
     <string name="wifi_security_wep" msgid="7082604129842065776">"WEP"</string>
-    <string name="wifi_security_wpa" msgid="8980169410565477162">"WPA"</string>
-    <string name="wifi_security_wpa2" msgid="5780665935088930524">"WPA2"</string>
-    <!-- no translation found for wifi_security_wpa_eap (7485687331651751101) -->
-    <skip />
-    <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
-    <skip />
+    <string name="wifi_security_psk" msgid="3392399380570381452">"WPA/WPA2 PSK"</string>
+    <string name="wifi_security_eap" msgid="8309434150934969132">"엔터프라이즈(802.1x)"</string>
     <string name="wifi_security_unknown" msgid="4564208312073060668">"알 수 없음"</string>
-    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
-    <skip />
+    <string name="wifi_security_verbose_open" msgid="8117878112088901945">"개방형 네트워크"</string>
+    <string name="wifi_security_verbose_wep" msgid="9220757688700421508">"WEP로 보안"</string>
+    <string name="wifi_security_verbose_psk" msgid="1110130025330416225">"WPA/WPA2 PSK로 보안됨"</string>
+    <string name="wifi_security_verbose_eap" msgid="586632662086063">"802.1x EAP로 보안"</string>
     <string name="ip_address" msgid="850672263358989449">"IP 주소"</string>
     <string name="signal" msgid="1947969631626413228">"신호 강도"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"켜는 중..."</string>
@@ -319,28 +320,19 @@
     <string name="error_saving" msgid="8294279443961615302">"네트워크를 저장할 수 없음"</string>
     <string name="connect" msgid="3079076576295839400">"연결"</string>
     <string name="connect_to_blank" msgid="6950910074058025378">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에 연결"</string>
-    <!-- no translation found for please_select_eap (4488240331626456338) -->
-    <skip />
-    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
-    <skip />
-    <!-- no translation found for please_type_identity (7061261155499513089) -->
-    <skip />
-    <!-- no translation found for please_type_anonymous_identity (835061562079965048) -->
-    <skip />
-    <!-- no translation found for please_select_client_certificate (2137906961594663234) -->
-    <skip />
-    <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
-    <skip />
-    <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
-    <skip />
+    <string name="please_select_eap" msgid="4488240331626456338">"EAP 방식"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"단계 2 인증"</string>
+    <string name="please_type_identity" msgid="7061261155499513089">"ID"</string>
+    <string name="please_type_anonymous_identity" msgid="835061562079965048">"익명 ID"</string>
+    <string name="please_select_client_certificate" msgid="2137906961594663234">"클라이언트 인증서"</string>
+    <string name="please_select_ca_certificate" msgid="5010815181914420677">"CA 인증서"</string>
     <string name="please_type_passphrase" msgid="8256017704131522462">"무선 비밀번호"</string>
     <string name="please_type_hex_key" msgid="8751224390407867551">"WEP 16진수 키(0-9, A-F)"</string>
     <string name="wifi_show_password" msgid="4235237470701732009">"비밀번호를 표시합니다."</string>
     <string name="scan_wifi" msgid="2459901725350542606">"검색"</string>
     <string name="summary_not_in_range" msgid="3926674700733548684">"범위 내에 없음"</string>
-    <!-- no translation found for summary_remembered (6079941090549401742) -->
-    <skip />
-    <string name="summary_connection_failed" msgid="7610394657613410489">"연결하지 못했습니다. 다시 시도하세요."</string>
+    <string name="summary_remembered" msgid="6079941090549401742">"저장됨"</string>
+    <string name="summary_connection_failed" msgid="2351885658101671413">"연결하지 못했습니다. 다시 시도하려면 터치하세요."</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi 네트워크"</string>
     <string name="wifi_type_ssid" msgid="1326839657083292017">"네트워크 SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"보안"</string>
@@ -391,10 +383,11 @@
     <string name="status_disconnected" msgid="7561688569905126046">"연결 끊김"</string>
     <string name="status_failed" msgid="610462050405904601">"실패"</string>
     <string name="sound_and_display_settings" msgid="349770582993029003">"소리 및 디스플레이"</string>
+    <string name="sound_and_display_settings_title" msgid="5036144539683697330">"소리 및 디스플레이 설정"</string>
     <string name="sound_settings" msgid="5007659014828162881">"소리 설정"</string>
     <string name="sound_and_display_settings_summary" msgid="1433943789593286064">"벨소리, 알림, 화면 밝기 설정"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"무음 모드"</string>
-    <string name="silent_mode_summary" msgid="9081534746589616108">"미디어 및 알람을 제외하고 모두 무음 모드로 전환됩니다."</string>
+    <string name="silent_mode_summary" msgid="9081534746589616108">"미디어 및 알람을 제외하고 모두 무음 모드로 전환"</string>
     <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"미디어를 제외하고 모두 무음 모드로 전환됩니다."</string>
     <string name="ringtone_title" msgid="5379026328015343686">"전화 벨소리"</string>
     <string name="ringtone_summary" msgid="3856990752494160139">"수신전화 기본 벨소리 설정"</string>
@@ -416,17 +409,16 @@
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"선택항목 듣기"</string>
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"화면 선택 시 소리 재생"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"화면 선택 시 소리 재생"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"햅틱 반응"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"소프트키를 누르거나 특정 UI 사용 시 진동"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"소프트키를 누르거나 특정 UI 사용 시 진동"</string>
     <string name="play_media_notification_sounds_enable_title" msgid="1008791464029179529">"SD 카드 알림"</string>
-    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
-    <skip />
-    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
-    <skip />
-    <string name="sync_settings" msgid="2212736205476453234">"데이터 동기화"</string>
-    <string name="sync_settings_summary" msgid="6480534906375217074">"동기화할 응용프로그램 선택"</string>
-    <!-- no translation found for search_settings (1910951467596035063) -->
-    <skip />
-    <!-- no translation found for search_settings_summary (9205656546570654169) -->
-    <skip />
+    <string name="play_media_notification_sounds_enable_summary_on" msgid="7675466959375667370">"SD 카드 알림 시 사운드 재생"</string>
+    <string name="play_media_notification_sounds_enable_summary_off" msgid="8672617597028744693">"SD 카드 알림 시 사운드 재생"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"계정 및 동기화"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"계정 추가 또는 삭제 및 계정 설정 변경"</string>
+    <string name="search_settings" msgid="1910951467596035063">"검색"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"검색 설정 및 기록 관리"</string>
     <string name="display_settings" msgid="3912042046350078328">"디스플레이 설정"</string>
     <string name="animations_title" msgid="1062189037402346023">"애니메이션"</string>
     <string name="animations_summary_on" msgid="8843613112130484436">"창을 열고 닫을 때 애니메이션 표시"</string>
@@ -438,6 +430,7 @@
     <string name="brightness_summary" msgid="838917350127550703">"화면 밝기 조정"</string>
     <string name="screen_timeout" msgid="4882669461447531301">"화면 시간제한"</string>
     <string name="screen_timeout_summary" msgid="2905757633140605334">"화면 자동 꺼짐 시간 간격 조정"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"자동 밝기"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 카드 잠금 설정"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM 카드 잠금 설정"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM 카드 잠금"</string>
@@ -470,18 +463,14 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"표시할 수 없음"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"상태"</string>
     <string name="device_status" msgid="607405385799807324">"상태"</string>
-    <!-- no translation found for device_status_summary (2599162787451519618) -->
-    <skip />
-    <string name="storage_settings_title" msgid="8461515684514801302">"SD 카드 및 휴대폰 저장공간"</string>
+    <string name="device_status_summary" msgid="2599162787451519618">"전화번호, 신호 등"</string>
+    <string name="storage_settings" msgid="6681164315506788024">"SD 카드 및 휴대전화 저장공간"</string>
+    <string name="storage_settings_title" msgid="5379463509034022773">"SD 카드 및 휴대전화 저장공간 설정"</string>
     <string name="storage_settings_summary" msgid="9176693537325988610">"SD 카드 마운트 해제, 사용가능한 저장공간 보기"</string>
-    <!-- no translation found for status_number (5123197324870153205) -->
-    <skip />
-    <!-- no translation found for status_min_number (3519504522179420597) -->
-    <skip />
-    <!-- no translation found for status_prl_version (8499039751817386529) -->
-    <skip />
-    <!-- no translation found for status_meid_number (1751442889111731088) -->
-    <skip />
+    <string name="status_number" msgid="5123197324870153205">"내 휴대전화 번호"</string>
+    <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_prl_version" msgid="8499039751817386529">"PRL 버전"</string>
+    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"모바일 네트워크 유형"</string>
     <string name="status_data_state" msgid="5503181397066522950">"모바일 네트워크 상태"</string>
     <string name="status_service_state" msgid="2323931627519429503">"서비스 상태"</string>
@@ -520,6 +509,11 @@
     <string name="apn_mms_port" msgid="4074188088199243040">"MMS 포트"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"인증 유형"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"없음"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP 또는 CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN 유형"</string>
     <string name="menu_delete" msgid="6981294422841124659">"APN 삭제"</string>
     <string name="menu_new" msgid="3014205883303921729">"새 APN"</string>
@@ -535,11 +529,9 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"기본 APN 설정을 재설정했습니다."</string>
     <string name="master_clear_title" msgid="5907939616087039756">"기본값 데이터 재설정"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"휴대폰의 모든 데이터 지우기"</string>
-    <!-- no translation found for master_clear_desc (7823268823499739178) -->
-    <skip />
+    <string name="master_clear_desc" msgid="7823268823499739178">"휴대전화에서 다음 모든 데이터가 지워집니다."\n<li>"Google 계정"</li>\n<li>"시스템과 응용프로그램 데이터 및 설정"</li>\n<li>"다운로드한 응용프로그램"</li>\n"삭제되지 않는 항목은 다음과 같습니다. "\n<li>"현재 시스템 소프트웨어 및 번들 응용프로그램"</li>\n<li>"음악 또는 사진 등의 SD 카드 파일"</li></string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"휴대폰 재설정"</string>
-    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
-    <skip />
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"모든 개인 정보와 다운로드한 응용프로그램을 삭제하시겠습니까? 수행한 작업은 취소할 수 없습니다."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"모두 지우기"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"잠금해제 패턴을 그리세요."</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"휴대폰 재설정을 확인하려면 잠금해제 패턴을 그려야 합니다."</string>
@@ -556,22 +548,21 @@
     <string name="call_settings_summary" msgid="7291195704801002886">"음성메일, 착신전환, 통화중 대기, 발신자 번호 설정"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"모바일 네트워크"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"로밍, 네트워크, APN에 대한 옵션 설정"</string>
-    <!-- no translation found for location_title (1029961368397484576) -->
-    <skip />
+    <string name="location_title" msgid="1029961368397484576">"내 위치"</string>
     <string name="location_network_based" msgid="8815705866861993344">"무선 네트워크 사용"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"무선 네트워크를 사용하는 응용프로그램(예: 지도)에서 위치 보기"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Wi-Fi 및/또는 모바일 네트워크에서 측정된 위치"</string>
-    <string name="location_gps" msgid="375912731641377120">"GPS 위성 사용"</string>
-    <string name="location_street_level" msgid="5899941752252356344">"도로 수준으로 정확하게 탐색(배터리를 절약하려면 선택 취소)"</string>
+    <string name="location_gps" msgid="6296125378829097831">"GPS 위성 사용"</string>
+    <string name="location_street_level" msgid="6460740847018275745">"도로 수준으로 정확하게 탐색(배터리를 절약하려면 선택 취소)"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"도로 수준으로 탐색(항공사진이 더해져 배터리 추가로 필요)"</string>
-    <!-- no translation found for use_location_title (7585990952633568732) -->
-    <skip />
-    <!-- no translation found for use_location_summary (4411467143899877395) -->
-    <skip />
-    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
-    <skip />
+    <string name="assisted_gps" msgid="4649317129586736885">"GPS 도우미 사용"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"서버를 사용하여 GPS 보조(네트워크 사용량을 줄이려면 선택 취소)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"서버를 사용하여 GPS 보조(GPS 성능을 개선하려면 선택 취소)"</string>
+    <string name="use_location_title" msgid="5447030582538504247">"내 위치 사용"</string>
+    <string name="use_location_summary" msgid="1816849484040070431">"Google 검색결과 및 다른 Google 서비스에 내 위치 사용"</string>
+    <string name="use_location_warning_message" msgid="1420184860518262439">"검색결과 및 기타 서비스 향상을 위해 Google에 위치 정보를 제공하시겠습니까?"</string>
     <string name="agree" msgid="6288718671527758326">"동의함"</string>
-    <string name="disagree" msgid="6221069272309799230">"동의하지 않음"</string>
+    <string name="disagree" msgid="6221069272309799230">"동의 안함"</string>
     <string name="about_settings" msgid="1743378368185371685">"휴대폰 정보"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"법률 정보, 휴대폰 상태, 소프트웨어 버전 보기"</string>
     <string name="legal_information" msgid="5769301644270604095">"법률정보"</string>
@@ -579,12 +570,15 @@
     <string name="copyright_title" msgid="865906688917260647">"저작권"</string>
     <string name="license_title" msgid="1990487604356037871">"라이센스"</string>
     <string name="terms_title" msgid="7697580845616764642">"약관"</string>
-    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
-    <skip />
+    <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"시스템 안내서"</string>
     <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"휴대전화 사용법 알아보기"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"오픈소스 라이센스"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"라이센스를 로드하는 동안 문제가 발생했습니다."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"로드 중..."</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"안전 정보"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"안전 정보"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"휴대전화가 데이터 서비스에 연결되어 있지 않습니다. 지금 정보를 보려면 인터넷에 연결된 컴퓨터에서 %s(으)로 이동하세요."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"로드 중..."</string>
     <string name="lock_settings_title" msgid="5828348303971852121">"화면 잠금해제 패턴"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"잠금해제 패턴 변경"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"저장된 패턴 확인"</string>
@@ -613,9 +607,9 @@
     <string name="skip_button_label" msgid="8680422740354436943">"취소"</string>
     <string name="next_button_label" msgid="8890792540116568321">"다음"</string>
     <string name="lock_title" msgid="4059246467204273930">"휴대폰 보안 설정"</string>
-    <string name="lock_intro_message" msgid="5352897389718432077"><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_intro_message" msgid="9100785646737118042"><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" msgid="8052305554017485410">"패턴 예"</string>
-    <string name="lock_example_message" msgid="7431982730914254881">"4개 이상의 점을 연결합니다. "\n" "\n"고유한 패턴을 그릴 준비가 되면 \'다음\'을 선택합니다."</string>
+    <string name="lock_example_message" msgid="1838650097090632706">"4개 이상의 점을 연결합니다. "\n" "\n"나만의 패턴을 그릴 준비가 되면 \'다음\'을 터치합니다."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"응용프로그램 관리"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"설치된 응용프로그램 관리 및 제거"</string>
     <string name="applications_settings" msgid="3736173521008476946">"응용프로그램"</string>
@@ -638,8 +632,7 @@
     <string name="data_size_label" msgid="8679376373625710107">"데이터"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"제거"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"데이터 지우기"</string>
-    <!-- no translation found for app_factory_reset (6635744722502563022) -->
-    <skip />
+    <string name="app_factory_reset" msgid="6635744722502563022">"업데이트 제거"</string>
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"이 응용프로그램을 해당 작업에 대한 기본 프로그램으로 실행하도록 선택했습니다."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"기본값이 설정되지 않았습니다."</string>
     <string name="clear_activities" msgid="7408923511535174430">"기본 작업 지우기"</string>
@@ -650,32 +643,41 @@
     <string name="filter" msgid="2018011724373033887">"필터"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"필터 옵션 선택"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"모두"</string>
-    <string name="filter_apps_third_party" msgid="1096017647285183437">"제3자"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"다운로드됨"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"실행 중"</string>
     <string name="loading" msgid="3200408047793887917">"로드 중..."</string>
     <string name="recompute_size" msgid="7722567982831691718">"크기 다시 계산 중..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"삭제"</string>
-    <string name="clear_data_dlg_text" msgid="8796694785488630642">"응용프로그램에 저장한 모든 정보가 영구적으로 삭제됩니다."</string>
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"응용프로그램의 전체 데이터가 영구적으로 삭제됩니다. 여기에는 모든 파일, 설정, 계정, 데이터베이스 등이 포함됩니다."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"확인"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"취소"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"응용프로그램을 찾지 못했습니다."</string>
     <string name="app_not_found_dlg_text" msgid="2980271680333341554">"응용프로그램이 설치된 응용프로그램 목록에 없습니다."</string>
     <string name="clear_data_failed" msgid="581956197586913865">"응용프로그램 데이터를 지울 수 없습니다."</string>
-    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
-    <skip />
-    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
-    <skip />
-    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
-    <skip />
-    <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
-    <skip />
+    <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"업데이트 제거"</string>
+    <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Android 시스템 응용프로그램에 대한 모든 업데이트를 제거하시겠습니까?"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"데이터 지우기"</string>
+    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"응용프로그램 데이터를 삭제하지 못했습니다."</string>
     <string name="security_settings_desc" msgid="3116027624526915561">"이 응용프로그램은 휴대폰의 다음 항목에 액세스할 수 있습니다."</string>
     <string name="computing_size" msgid="1599186977475211186">"계산 중..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"패키지 크기를 계산할 수 없습니다."</string>
-    <string name="empty_list_msg" msgid="1883660401486953588">"타사 응용프로그램이 설치되지 않습니다."</string>
-    <!-- no translation found for version_text (9189073826278676425) -->
-    <skip />
-    <string name="language_settings" msgid="2939555761536357092">"로케일 및 텍스트"</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"타사 응용프로그램을 설치하지 않았습니다."</string>
+    <string name="version_text" msgid="9189073826278676425">"버전 <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"실행 중인 서비스"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"현재 실행 중인 서비스 보기 및 제어"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"다시 시작하는 중"</string>
+    <string name="no_running_services" msgid="6981216347270280598">"실행 중인 서비스 없음"</string>
+    <string name="confirm_stop_service" msgid="5700448757318301681">"서비스를 중지할까요?"</string>
+    <string name="confirm_stop_service_msg" msgid="1202118456282395730">"다시 시작할 때까지 서비스가 더 이상 실행되지 않습니다. 이로 인해 <xliff:g id="APPLICATION">%1$s</xliff:g> 응용프로그램에서 원하지 않는 결과가 초래될 수 있습니다."</string>
+    <string name="confirm_stop_stop" msgid="7382363913280993331">"중지"</string>
+    <string name="confirm_stop_cancel" msgid="206495326622692381">"취소"</string>
+    <string name="service_started_by_app" msgid="8432097226392386802">"응용프로그램에서 시작: 중지하려면 터치"</string>
+    <string name="service_client_name" msgid="2337664610975074717">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: 관리하려면 터치"</string>
+    <string name="service_background_processes" msgid="5158600475629177758">"사용: <xliff:g id="FREE">%2$s</xliff:g>+<xliff:g id="MEMORY">%3$s</xliff:g>(<xliff:g id="COUNT">%1$d</xliff:g>개 프로세스)"</string>
+    <string name="service_foreground_processes" msgid="4013890350284680796">"기타: <xliff:g id="MEMORY">%2$s</xliff:g>(<xliff:g id="COUNT">%1$d</xliff:g>개 프로세스)"</string>
+    <string name="service_process_name" msgid="8630408984456958400">"프로세스: <xliff:g id="PROCESS">%1$s</xliff:g>"</string>
+    <string name="language_settings" msgid="502219872342167227">"언어 및 키보드"</string>
+    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"언어 및 키보드 설정"</string>
     <string name="language_settings_summary" msgid="595647729475399987">"로케일(언어 및 지역), 텍스트 입력 및 자동 수정 옵션 설정"</string>
     <string name="language_category" msgid="3391756582724541530">"로케일 설정"</string>
     <string name="text_category" msgid="6342540511465136739">"텍스트 설정"</string>
@@ -690,7 +692,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"스페이스바를 두 번 눌러 \'.\' 삽입"</string>
     <string name="show_password" msgid="2198798062604049206">"비밀번호 표시"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"입력 시 비밀번호 표시"</string>
-    <string name="ime_security_warning" msgid="3458652708716006477">"<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> 응용프로그램에서 지원하는 이 입력 방법을 사용하면 비밀번호 및 신용카드 번호와 같은 개인 정보를 비롯하여 입력한 모든 텍스트가 수집될 수 있습니다. 사용하시겠습니까?"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> 응용프로그램에서 지원하는 이 입력 방법을 사용하면 비밀번호 및 신용카드 번호와 같은 개인 정보를 비롯하여 입력한 모든 텍스트가 수집될 수 있습니다. 사용하시겠습니까?"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"사용자 사전"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"사용자 사전"</string>
     <string name="user_dict_settings_summary" msgid="2460427065601355471">"사용자 사전에서 단어 추가 및 삭제"</string>
@@ -718,7 +720,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"텍스트 입력"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"텍스트 입력 옵션 관리"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> 설정"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="4919680715154885028">"화면 키보드 설정"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"화면 키보드 설정"</string>
     <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"기기 키보드"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"내장 키보드 설정"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"개발"</string>
@@ -729,13 +731,11 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"충전하는 동안 화면이 꺼지지 않음"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"모의 위치 허용"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"모의 위치 허용"</string>
-    <!-- no translation found for adb_warning_title (1756027479229533250) -->
-    <skip />
-    <!-- no translation found for adb_warning_message (5352555112049663033) -->
-    <skip />
+    <string name="adb_warning_title" msgid="6234463310896563253">"USB 디버깅을 허용하시겠습니까?"</string>
+    <string name="adb_warning_message" msgid="5352555112049663033">"USB 디버깅은 개발용으로만 설계되었습니다. 이 기능을 사용하면 컴퓨터와 장치 간에 데이터를 복사하고 알림 없이 장치에 응용프로그램을 설치하며 로그 데이터를 읽을 수 있습니다."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"가젯 선택"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"위젯 선택"</string>
-    <string name="battery_history_details_for" msgid="5189636461798594740">"UID %d의 세부정보"</string>
+    <string name="battery_history_details_for" msgid="5924639922153109669">"UID <xliff:g id="NUMBER">%d</xliff:g>의 세부정보"</string>
     <string name="battery_history_uid" msgid="1016606150528436298">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage" msgid="8010852371665217020">"<xliff:g id="APP_NAME">%1$s</xliff:g>의 네트워크 사용 세부정보"</string>
     <string name="battery_history_bytes_received" msgid="980307569180518302">"받은 바이트 수: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
@@ -746,14 +746,10 @@
     <string name="battery_history_system_time" msgid="2015862072724507547">"시스템 시간:"</string>
     <string name="battery_history_total_time" msgid="3618703970098556104">"시간 합계:"</string>
     <string name="battery_history_starts" msgid="9137453931978571696">"시작: <xliff:g id="STARTS">%1$d</xliff:g>번"</string>
-    <!-- no translation found for battery_history_days (7110262897769622564) -->
-    <skip />
-    <!-- no translation found for battery_history_hours (7525170329826274999) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
-    <skip />
-    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
-    <skip />
+    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>일 <xliff:g id="HOURS">%2$d</xliff:g>시간 <xliff:g id="MINUTES">%3$d</xliff:g>분 <xliff:g id="SECONDS">%4$d</xliff:g>초"</string>
+    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>시간 <xliff:g id="MINUTES">%2$d</xliff:g>분 <xliff:g id="SECONDS">%3$d</xliff:g>초"</string>
+    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>분 <xliff:g id="SECONDS">%2$d</xliff:g>초"</string>
+    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>초"</string>
     <string name="battery_history_packages_sharing_this_uid" msgid="4101596071379250050">"이 UID를 공유하는 패키지"</string>
     <string name="battery_history_no_data" msgid="1177238743237067617">"배터리 사용 데이터가 없습니다."</string>
     <string name="battery_history_sensor" msgid="2333488996028993982">"센서:"</string>
@@ -775,400 +771,209 @@
     <string name="app_name_label" msgid="2000949925256858308">"응용프로그램"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"계수"</string>
     <string name="usage_time_label" msgid="295954901452833058">"사용 시간"</string>
-    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
-    <skip />
-    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
-    <skip />
-    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
-    <skip />
-    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
-    <skip />
-    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
-    <skip />
-    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
-    <skip />
-    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
-    <skip />
-    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
-    <skip />
-    <!-- no translation found for power_usage_summary (7237084831082848168) -->
-    <skip />
-    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
-    <skip />
-    <!-- no translation found for battery_since_reset (7464546661121187045) -->
-    <skip />
-    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
-    <skip />
+    <string name="accessibility_settings" msgid="3975902491934816215">"접근성"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"접근성 설정"</string>
+    <string name="accessibility_settings_summary" msgid="8185181964847149507">"접근성 옵션 관리"</string>
+    <string name="toggle_accessibility_title" msgid="650839277066574497">"접근성"</string>
+    <string name="accessibility_services_category" msgid="8127851026323672607">"접근성 서비스"</string>
+    <string name="no_accessibility_services_summary" msgid="694578333333808159">"설치한 접근성 서비스가 없습니다."</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"접근성 서비스는 비밀번호를 제외한 개인 데이터 신용카드 번호 등과 같이 사용자가 입력한 모든 텍스트를 수집할 수 있습니다. 또한 사용자 인터페이스 상호 작용을 기록할 수도 있습니다. 이 서비스는 <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> 응용프로그램에서 제공합니다. 접근성 서비스를 사용하시겠습니까?"</string>
+    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"접근성 서비스를 사용 중지하시겠습니까?"</string>
+    <string name="power_usage_summary_title" msgid="5180282911164282324">"배터리 사용"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"배터리를 사용한 항목"</string>
+    <string name="battery_since_unplugged" msgid="338073389740738437">"플러그를 뽑은 이후 배터리 전원 사용"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"재설정 이후 배터리 사용"</string>
+    <string name="battery_stats_duration" msgid="7464501326709469282">"플러그를 뽑은 후 <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <!-- no translation found for awake (387122265874485088) -->
-    <skip />
-    <!-- no translation found for wifi_on_time (4630925382578609056) -->
-    <skip />
-    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
-    <skip />
-    <!-- no translation found for usage_name_percent (1899151069711662289) -->
-    <skip />
-    <!-- no translation found for details_title (7564809986329021063) -->
-    <skip />
-    <!-- no translation found for details_subtitle (32593908269911734) -->
-    <skip />
-    <!-- no translation found for controls_subtitle (390468421138288702) -->
-    <skip />
-    <!-- no translation found for packages_subtitle (4736416171658062768) -->
-    <skip />
-    <!-- no translation found for power_screen (2353149143338929583) -->
-    <skip />
-    <!-- no translation found for power_wifi (2382791137776486974) -->
-    <skip />
-    <!-- no translation found for power_bluetooth (4373329044379008289) -->
-    <skip />
-    <!-- no translation found for power_cell (6596471490976003056) -->
-    <skip />
-    <!-- no translation found for power_phone (5392641106474567277) -->
-    <skip />
-    <!-- no translation found for power_idle (9055659695602194990) -->
-    <skip />
-    <!-- no translation found for usage_type_cpu (715162150698338714) -->
-    <skip />
-    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
-    <skip />
-    <!-- no translation found for usage_type_gps (7989688715128160790) -->
-    <skip />
-    <!-- no translation found for usage_type_phone (9108247984998041853) -->
-    <skip />
-    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
-    <skip />
-    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
-    <skip />
-    <!-- no translation found for usage_type_audio (6957269406840886290) -->
-    <skip />
-    <!-- no translation found for usage_type_video (4295357792078579944) -->
-    <skip />
-    <!-- no translation found for usage_type_on_time (3351200096173733159) -->
-    <skip />
-    <!-- no translation found for usage_type_no_coverage (3797004252954385053) -->
-    <skip />
-    <!-- no translation found for battery_action_stop (649958863744041872) -->
-    <skip />
-    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
-    <skip />
-    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
-    <skip />
-    <!-- no translation found for battery_action_display (5302763261448580102) -->
-    <skip />
-    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
-    <skip />
-    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
-    <skip />
-    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
-    <skip />
-    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
-    <skip />
-    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
-    <skip />
-    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
-    <skip />
-    <!-- no translation found for battery_desc_display (5432795282958076557) -->
-    <skip />
-    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
-    <skip />
-    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
-    <skip />
-    <!-- no translation found for battery_sugg_wifi (7542345142282261691) -->
-    <skip />
-    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
-    <skip />
-    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
-    <skip />
-    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
-    <skip />
-    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_gps (4145005297393800223) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
-    <skip />
-    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
-    <skip />
-    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
-    <skip />
-    <!-- no translation found for menu_stats_total (8973377864854807854) -->
-    <skip />
-    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
-    <skip />
-    <!-- no translation found for process_kernel_label (3916858646836739323) -->
-    <skip />
-    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
-    <skip />
-    <!-- no translation found for tts_settings (6454363854545277027) -->
-    <skip />
-    <!-- no translation found for tts_settings_summary (2627715231944602766) -->
-    <skip />
-    <!-- no translation found for tts_settings_title (5064947197040356736) -->
-    <skip />
-    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
-    <skip />
-    <!-- no translation found for use_default_tts_settings_summary (4253502106159206276) -->
-    <skip />
-    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
-    <skip />
-    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
-    <skip />
-    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
-    <skip />
-    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
-    <skip />
-    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
-    <skip />
-    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
-    <skip />
-    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
-    <skip />
-    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
-    <skip />
-    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
-    <skip />
-    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
-    <skip />
-    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
-    <skip />
-    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
-    <skip />
-    <!-- no translation found for tts_demo (405357591189935876) -->
-    <skip />
-    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
-    <skip />
-    <!-- no translation found for gadget_title (7455548605888590466) -->
-    <skip />
-    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
-    <skip />
-    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
-    <skip />
-    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
-    <skip />
-    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
-    <skip />
-    <!-- no translation found for vpn_a_username (6664733641993968692) -->
-    <skip />
-    <!-- no translation found for vpn_a_password (1537213632501483753) -->
-    <skip />
-    <!-- no translation found for vpn_save_username (1408415289165970790) -->
-    <skip />
-    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
-    <skip />
-    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
-    <skip />
-    <!-- no translation found for vpn_no_button (7620339571187119107) -->
-    <skip />
-    <!-- no translation found for vpn_back_button (192036339792734970) -->
-    <skip />
-    <!-- no translation found for vpn_mistake_button (1683383660912491270) -->
-    <skip />
-    <!-- no translation found for vpn_menu_done (93528279226907926) -->
-    <skip />
-    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
-    <skip />
-    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
-    <skip />
-    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
-    <skip />
-    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
-    <skip />
-    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
-    <skip />
-    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
-    <skip />
-    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
-    <skip />
-    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
-    <skip />
-    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
-    <skip />
-    <!-- no translation found for vpn_reconnect_from_lost (2442844155623372118) -->
-    <skip />
-    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
-    <skip />
-    <!-- no translation found for vpn_challenge_error_dialog_msg (6174901754230038601) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set_dialog_msg (8013052814131532765) -->
-    <skip />
-    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
-    <skip />
-    <!-- no translation found for vpn_remote_hung_up_error_dialog_msg (1566946015052633150) -->
-    <skip />
-    <!-- no translation found for vpn_type_title (6392933604218676224) -->
-    <skip />
-    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
-    <skip />
-    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
-    <skip />
-    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
-    <skip />
-    <!-- no translation found for vpns (3148141862835492816) -->
-    <skip />
-    <!-- no translation found for vpn_connecting (8039521381692090116) -->
-    <skip />
-    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
-    <skip />
-    <!-- no translation found for vpn_connected (7641723116362845781) -->
-    <skip />
-    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
-    <skip />
-    <!-- no translation found for vpn_name (1550918148476193076) -->
-    <skip />
-    <!-- no translation found for vpn_a_name (8445736942405283509) -->
-    <skip />
-    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
-    <skip />
-    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
-    <skip />
-    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
-    <skip />
-    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
-    <skip />
-    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
-    <skip />
-    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
-    <skip />
-    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
-    <skip />
-    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
-    <skip />
-    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
-    <skip />
-    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
-    <skip />
-    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
-    <skip />
-    <!-- no translation found for vpn_pptp_encryption_title (2236795167467896499) -->
-    <skip />
-    <!-- no translation found for vpn_pptp_encryption (2602329949737259686) -->
-    <skip />
-    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
-    <skip />
-    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
-    <skip />
-    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
-    <skip />
-    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
-    <skip />
-    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
-    <skip />
-    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
-    <skip />
-    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
-    <skip />
-    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
-    <skip />
-    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
-    <skip />
-    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
-    <skip />
-    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
-    <skip />
-    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
-    <skip />
-    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
-    <skip />
-    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
-    <skip />
-    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
-    <skip />
-    <!-- no translation found for vpn_secret_unchanged (8700613973594154529) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set (1037792636371641845) -->
-    <skip />
-    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
-    <skip />
-    <!-- no translation found for cstor_access_title (1739505390736236717) -->
-    <skip />
-    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
-    <skip />
-    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
-    <skip />
-    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
-    <skip />
-    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
-    <skip />
-    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
-    <skip />
-    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
-    <skip />
-    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
-    <skip />
-    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
-    <skip />
-    <!-- no translation found for cstor_credential_password (7187440553141199409) -->
-    <skip />
-    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
-    <skip />
-    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
-    <skip />
-    <!-- no translation found for cstor_old_password (979282118063084561) -->
-    <skip />
-    <!-- no translation found for cstor_new_password (6218562692435670047) -->
-    <skip />
-    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
-    <skip />
-    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
-    <skip />
-    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
-    <skip />
-    <!-- no translation found for cstor_password_error (2917326097260402464) -->
-    <skip />
-    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
-    <skip />
-    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
-    <skip />
-    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
-    <skip />
-    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
-    <skip />
-    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
-    <skip />
-    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
-    <skip />
-    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
-    <skip />
-    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
-    <skip />
-    <!-- no translation found for cstor_storage_error (7140697503172458161) -->
-    <skip />
-    <!-- no translation found for cstor_unable_to_save_cert (1631402544447196406) -->
-    <skip />
-    <!-- no translation found for cstor_cert_not_saved (6318149789449538491) -->
-    <skip />
-    <!-- no translation found for cstor_is_reset (449870501126790589) -->
-    <skip />
-    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
-    <skip />
-    <!-- no translation found for cstor_is_added (794788474010251572) -->
-    <skip />
-    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
-    <skip />
-    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <string name="awake" msgid="387122265874485088">"장치 무중단 가동 시간"</string>
+    <string name="wifi_on_time" msgid="4630925382578609056">"WiFi 사용 시간"</string>
+    <string name="bluetooth_on_time" msgid="4478515071957280711">"WiFi 사용 시간"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
+    <string name="details_title" msgid="7564809986329021063">"배터리 사용 세부정보"</string>
+    <string name="details_subtitle" msgid="32593908269911734">"사용 세부정보"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"전원 사용 조절"</string>
+    <string name="packages_subtitle" msgid="4736416171658062768">"포함된 패키지"</string>
+    <string name="power_screen" msgid="2353149143338929583">"디스플레이"</string>
+    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
+    <string name="power_cell" msgid="6596471490976003056">"대기 소모 전력"</string>
+    <string name="power_phone" msgid="5392641106474567277">"음성 통화"</string>
+    <string name="power_idle" msgid="9055659695602194990">"휴대전화 유휴 상태"</string>
+    <string name="usage_type_cpu" msgid="715162150698338714">"총 CPU"</string>
+    <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 포그라운드"</string>
+    <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
+    <string name="usage_type_phone" msgid="9108247984998041853">"휴대전화"</string>
+    <string name="usage_type_data_send" msgid="2857401966985425427">"보낸 데이터"</string>
+    <string name="usage_type_data_recv" msgid="7251090882025234185">"수신된 데이터"</string>
+    <string name="usage_type_audio" msgid="6957269406840886290">"오디오"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"동영상"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"사용 시간"</string>
+    <string name="usage_type_no_coverage" msgid="3797004252954385053">"통화 불가능 시간"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"강제 종료"</string>
+    <string name="battery_action_app_details" msgid="3275013531871113681">"응용프로그램 정보"</string>
+    <string name="battery_action_app_settings" msgid="350562653472577250">"응용프로그램 설정"</string>
+    <string name="battery_action_display" msgid="5302763261448580102">"디스플레이 설정"</string>
+    <string name="battery_action_wifi" msgid="5452076674659927993">"WiFi 설정"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth 설정"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"음성 통화에서 배터리 사용"</string>
+    <string name="battery_desc_standby" msgid="3009080001948091424">"휴대전화가 유휴 상태일 때 배터리 사용"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"무선 라디오에서 배터리 사용"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"통화 불가능 지역에서는 전원을 절약하도록 비행 모드로 전환"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"디스플레이 및 백라이트에서 배터리 사용"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"화면 밝기 및/또는 화면 시간제한 줄이기"</string>
+    <string name="battery_desc_wifi" msgid="1702486494565080431">"Wi-Fi에서 배터리 사용"</string>
+    <string name="battery_sugg_wifi" msgid="7542345142282261691">"사용 중이 아니거나 사용할 수 없을 때 Wi-Fi 사용 안함"</string>
+    <string name="battery_desc_bluetooth" msgid="7535520658674621902">"블루투스에서 배터리 사용"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"사용 중이 아닐 때에는 Bluetooth 끄기"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"다른 블루투스 장치로 연결 시도"</string>
+    <string name="battery_desc_apps" msgid="8123202939321333639">"실행 중에 응용프로그램에서 배터리 사용"</string>
+    <string name="battery_sugg_apps_info" msgid="6065882899391322442">"응용프로그램 중지 또는 제거"</string>
+    <string name="battery_sugg_apps_gps" msgid="4145005297393800223">"사용 중이 아닌 경우 GPS 사용 안함"</string>
+    <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"응용프로그램에서 배터리 사용을 줄일 수 있는 설정을 제공할 수 있습니다."</string>
+    <string name="menu_stats_unplugged" msgid="8296577130840261624">"플러그를 뽑은 후 <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"마지막으로 플러그를 뽑은 이후 <xliff:g id="UNPLUGGED">%1$s</xliff:g> 동안"</string>
+    <string name="menu_stats_total" msgid="8973377864854807854">"총 사용량"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"새로고침"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
+    <string name="process_mediaserver_label" msgid="6500382062945689285">"미디어 서버"</string>
+    <string name="tts_settings" msgid="3348626948015962987">"텍스트를 음성으로 변환"</string>
+    <string name="tts_settings_summary" msgid="2627715231944602766">"TTS(text-to-speech) 옵션 설정"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"TTS(text-to-speech) 설정"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"항상 내 설정 사용"</string>
+    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"아래 기본 설정으로 응용프로그램 설정 덮어쓰기"</string>
+    <string name="tts_default_settings_section" msgid="5787915620218907443">"기본 설정"</string>
+    <string name="tts_default_rate_title" msgid="6030550998379310088">"말하는 속도"</string>
+    <string name="tts_default_rate_summary" msgid="4061815292287182801">"텍스트를 발음하는 속도"</string>
+    <string name="tts_default_pitch_title" msgid="6135942113172488671">"피치"</string>
+    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"발음된 텍스트의 톤에 적용"</string>
+    <string name="tts_default_lang_title" msgid="8018087612299820556">"언어"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"발음된 텍스트에 대해 언어별로 음성을 설정합니다."</string>
+    <string name="tts_play_example_title" msgid="7094780383253097230">"예제 듣기"</string>
+    <string name="tts_play_example_summary" msgid="8029071615047894486">"음성 합성 데모 짧게 재생"</string>
+    <string name="tts_install_data_title" msgid="4264378440508149986">"음성 데이터 설치"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"음성 합성을 사용하려면 음성 데이터를 설치해야 합니다."</string>
+    <string name="tts_data_installed_summary" msgid="9162111552859972809">"음성 합성에 필요한 음성이 이미 설치되어 있습니다."</string>
+    <string name="tts_demo" msgid="405357591189935876">"음성 합성의 예입니다."</string>
+    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"설정이 변경되었습니다. 다음은 소리나는 방식에 대한 예입니다."</string>
+    <string name="gadget_title" msgid="7455548605888590466">"전원 컨트롤"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Wi-Fi 설정 업데이트"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"블루투스 설정 업데이트"</string>
+    <string name="credential_installer_activity_title" msgid="7600661521831762521">"자격증명 설치 프로그램"</string>
+    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN 설정"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"<xliff:g id="NAME">%s</xliff:g>에 연결"</string>
+    <string name="vpn_username_colon" msgid="7854930370861306247">"사용자 이름:"</string>
+    <string name="vpn_password_colon" msgid="5716278710848606626">"비밀번호:"</string>
+    <string name="vpn_a_username" msgid="6664733641993968692">"사용자 이름"</string>
+    <string name="vpn_a_password" msgid="1537213632501483753">"비밀번호"</string>
+    <string name="vpn_save_username" msgid="1408415289165970790">"사용자 이름 저장"</string>
+    <string name="vpn_connect_button" msgid="1699007212602470655">"연결"</string>
+    <string name="vpn_yes_button" msgid="8034531001149843119">"예"</string>
+    <string name="vpn_no_button" msgid="7620339571187119107">"아니요"</string>
+    <string name="vpn_back_button" msgid="192036339792734970">"뒤로"</string>
+    <string name="vpn_mistake_button" msgid="1683383660912491270">"아니요"</string>
+    <string name="vpn_menu_done" msgid="93528279226907926">"저장"</string>
+    <string name="vpn_menu_cancel" msgid="7234451214611202868">"취소"</string>
+    <string name="vpn_menu_revert" msgid="4407762442281467659">"되돌리기"</string>
+    <string name="vpn_menu_connect" msgid="1089399414463784218">"네트워크 연결"</string>
+    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"네트워크에서 연결 해제"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"네트워크 수정"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"네트워크 삭제"</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"<xliff:g id="CODE">%s</xliff:g>을(를) 입력해야 합니다."</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"<xliff:g id="OPTION">%s</xliff:g>을(를) 선택해야 합니다."</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"VPN 이름(\'<xliff:g id="NAME">%s</xliff:g>\')이 이미 있습니다. 다른 이름을 찾아보세요."</string>
+    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"VPN을 삭제하시겠습니까?"</string>
+    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"프로필을 만들지 않으시겠습니까?"</string>
+    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"프로필에 대한 변경을 취소하시겠습니까?"</string>
+    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"네트워크에 연결할 수 없습니다. 다시 시도하시겠습니까?"</string>
+    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"연결이 끊겼습니다. 다시 연결하시겠습니까?"</string>
+    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"서버 이름을 확인할 수 없습니다. 서버 이름 설정을 확인하시겠습니까?"</string>
+    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"자격 확인 오류입니다. 보안 설정을 확인하시겠습니까?"</string>
+    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"VPN 구성에서 하나 이상의 보안이 누락되었습니다. 보안 설정을 확인하시겠습니까?"</string>
+    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"입력한 사용자 이름 및 비밀번호가 올바르지 않습니다. 다시 시도하시겠습니까?"</string>
+    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"서버가 중단되었습니다. 입력한 사용자 이름 또는 비밀번호가 올바르지 않을 수 있습니다. 다시 시도하시겠습니까?"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"서버와의 연결이 끊겼습니다. 서버에 연결하지 못하게 하는 방화벽에 막혔을 수 있습니다. 다시 시도하시겠습니까?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"서버 교섭에 실패했습니다. 서버가 암호화 옵션에 동의하지 않기 때문인 것 같습니다. 암호화 설정을 확인하시겠습니까?"</string>
+    <string name="vpn_type_title" msgid="6392933604218676224">"VPN 추가"</string>
+    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"VPN 추가"</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"<xliff:g id="NAME">%s</xliff:g> VPN 추가"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"<xliff:g id="NAME">%s</xliff:g> 세부정보"</string>
+    <string name="vpns" msgid="3148141862835492816">"VPN"</string>
+    <string name="vpn_connecting" msgid="8039521381692090116">"연결 중..."</string>
+    <string name="vpn_disconnecting" msgid="7748050200708257066">"연결을 끊는 중..."</string>
+    <string name="vpn_connected" msgid="7641723116362845781">"연결됨"</string>
+    <string name="vpn_connect_hint" msgid="7442898962925875181">"네트워크 연결"</string>
+    <string name="vpn_name" msgid="1550918148476193076">"VPN 이름"</string>
+    <string name="vpn_a_name" msgid="8445736942405283509">"VPN 이름"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"\'<xliff:g id="NAME">%s</xliff:g>\'님이 추가되었습니다."</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"\'<xliff:g id="NAME">%s</xliff:g>\'을(를) 변경했습니다."</string>
+    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"사용자 인증서 설정"</string>
+    <string name="vpn_user_certificate" msgid="949322691686938888">"사용자 인증서"</string>
+    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"사용자 인증서"</string>
+    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"CA 인증서 설정"</string>
+    <string name="vpn_ca_certificate" msgid="465085144064264742">"인증기관(CA) 인증서"</string>
+    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"CA 인증서"</string>
+    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"L2TP 보안 설정"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP 보안"</string>
+    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"L2TP 보안"</string>
+    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"암호화"</string>
+    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"PPTP 암호화"</string>
+    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"IPSec 사전 공유 키 설정"</string>
+    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"IPSec 사전 공유 키"</string>
+    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"IPSec 사전 공유 키"</string>
+    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"VPN 서버 설정"</string>
+    <string name="vpn_vpn_server" msgid="1141754908824209260">"VPN 서버"</string>
+    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"VPN 서버"</string>
+    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"VPN 서버 이름"</string>
+    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS 검색 도메인"</string>
+    <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS 검색 도메인"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> 설정됨"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> 설정 안함"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> 설정되지 않음(선택 사항)"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"<xliff:g id="OPTION">%s</xliff:g> 사용"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"<xliff:g id="OPTION">%s</xliff:g> 사용 안함"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> 사용"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> 사용 중지됨"</string>
+    <string name="vpn_settings_title" msgid="7327468307909556719">"VPN 설정"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"VPN 설정 및 관리"</string>
+    <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(변경 안함)"</string>
+    <string name="vpn_secret_not_set" msgid="1037792636371641845">"(설정 안함)"</string>
+    <string name="credentials_category" msgid="8536992056377271234">"자격증명 저장소"</string>
+    <string name="credentials_access" msgid="4843187230913860492">"보안 자격증명 사용"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"응용프로그램이 보안 인증서 및 다른 자격증명에 액세스할 수 있도록 합니다."</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"비밀번호 입력"</string>
+    <string name="credentials_unlock_hint" msgid="594679530407918031">"자격증명 저장소 비밀번호를 입력하세요."</string>
+    <string name="credentials_install_certificates" msgid="177337517568022236">"SD 카드에서 설치"</string>
+    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"SD 카드에서 암호화된 인증서 설치"</string>
+    <string name="credentials_set_password" msgid="9104473585811899989">"비밀번호 설정"</string>
+    <string name="credentials_set_password_summary" msgid="8287876917562085701">"자격증명 저장소 비밀번호를 설정하거나 변경"</string>
+    <string name="credentials_reset" msgid="9170150870552453457">"저장소 삭제"</string>
+    <string name="credentials_reset_summary" msgid="1530388094693731636">"모든 콘텐츠의 자격증명 저장소 삭제 및 비밀번호 재설정"</string>
+    <string name="credentials_reset_hint" msgid="819990295796804516">"모든 자격증명을 삭제하고 자격증명 저장소 비밀번호를 재설정하시겠습니까?"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"현재 비밀번호:"</string>
+    <string name="credentials_new_password" msgid="267487774686796938">"새 비밀번호:"</string>
+    <string name="credentials_confirm_password" msgid="4732250000633424345">"새 비밀번호 확인:"</string>
+    <string name="credentials_first_time_hint" msgid="1567821077545346039">"자격증명 저장소를 위한 비밀번호(8자 이상)를 설정합니다."</string>
+    <string name="credentials_wrong_password" msgid="7525192410790152041">"정확한 비밀번호를 입력하세요."</string>
+    <string name="credentials_reset_warning" msgid="6392481296673345268">"정확한 비밀번호를 입력하세요. 한 번 더 비밀번호를 잘못 입력하면 자격증명 저장 내용이 삭제됩니다"</string>
+    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"정확한 비밀번호를 입력하세요. 앞으로 <xliff:g id="NUMBER">%1$d</xliff:g>회 이상 비밀번호를 잘못 입력하면 자격증명 저장 내용이 삭제됩니다."</string>
+    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"비밀번호가 일치하지 않습니다."</string>
+    <string name="credentials_passwords_empty" msgid="8647631321684363549">"비밀번호를 입력하고 확인해야 합니다."</string>
+    <string name="credentials_password_empty" msgid="8292138152983330473">"비밀번호를 입력하세요."</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"비밀번호는 8자 이상이어야 합니다."</string>
+    <string name="credentials_erased" msgid="7700309135582200849">"자격증명 저장소가 삭제되었습니다."</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"자격증명 저장소를 사용합니다."</string>
+    <string name="credentials_disabled" msgid="7453188089059045380">"자격증명 저장소를 사용 중지했습니다."</string>
+    <string name="emergency_tone_title" msgid="1055954530111587114">"긴급 신호음"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"긴급 통화 중 동작 설정"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"개인정보 보호"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"개인정보 설정"</string>
+    <string name="location_section_title" msgid="6072558684044939786">"위치"</string>
+    <string name="settings_section_title" msgid="7413252428447723032">"설정"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"개인 데이터"</string>
+    <string name="backup_settings_title" msgid="2968262658155327829">"내 설정 백업"</string>
+    <string name="backup_erase_dialog_title" msgid="6028429904055779443">"설정 백업"</string>
+    <string name="backup_erase_dialog_message" msgid="9096433810456900531">"설정 백업을 중지하고 Google 서버에 있는 사본을 모두 삭제하시겠습니까?"</string>
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
     <skip />
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 0d59474a2be..e759d4bf4e4 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -24,67 +24,108 @@
     <item msgid="5345178126174698955">"Stillehavet"</item>
     <item msgid="8392017019801393511">"Alle"</item>
   </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"Ingen animasjoner"</item>
+    <item msgid="6291186755504776720">"Enkelte animasjoner"</item>
+    <item msgid="3856065399819979491">"Alle animasjoner"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"Ingen vindusanimasjoner vises"</item>
+    <item msgid="4460915688877708508">"Noen vindusanimasjoner vises"</item>
+    <item msgid="488968798204105119">"Alle vindusanimasjoner vises"</item>
+  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 sekunder"</item>
     <item msgid="8881760709354815449">"30 sekunder"</item>
     <item msgid="7589406073232279088">"1 minutt"</item>
     <item msgid="7001195990902244174">"2 minutter"</item>
     <item msgid="5721688686241190620">"10 minutter"</item>
-    <item msgid="1781492122915870416">"Aldri slå av"</item>
+    <item msgid="7156442995039264948">"30 minutter"</item>
+  </string-array>
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Svært langsom"</item>
+    <item msgid="2361722960903353554">"Langsom"</item>
+    <item msgid="1145554631248513562">"Vanlig"</item>
+    <item msgid="7553665153391107454">"Rask"</item>
+    <item msgid="2538100882620724753">"Svært raskt"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item msgid="7526050907652687351">"Svært lav"</item>
+    <item msgid="2692137425242433765">"Lav"</item>
+    <item msgid="3332408460740717754">"Vanlig"</item>
+    <item msgid="4907380534957572531">"Høy"</item>
+    <item msgid="4699640516390840297">"Svært høy"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item msgid="478030717868306353">"Engelsk (Amerika)"</item>
+    <item msgid="5192284521396794598">"Engelsk (Storbritannia)"</item>
+    <item msgid="3000262452051711991">"Fransk"</item>
+    <item msgid="9214080387341763401">"Tysk"</item>
+    <item msgid="5972100016440094433">"Italiensk"</item>
+    <item msgid="5811378076054402537">"Spansk"</item>
+  </string-array>
+  <string-array name="wifi_security_entries">
+    <item msgid="2923732046112398627">"Automatisk"</item>
+    <item msgid="5434666299123318296">"Ingen"</item>
+    <item msgid="3159594845889645948">"WEP"</item>
+    <item msgid="1687348101566181433">"WPA/WPA2 PSK"</item>
+    <item msgid="329777238762866787">"802.1x Enterprise"</item>
+  </string-array>
+  <string-array name="wifi_security_without_auto_entries">
+    <item msgid="4402120432904877907">"Ingen"</item>
+    <item msgid="2329148995431627488">"WEP"</item>
+    <item msgid="6903317668294332381">"WPA/WPA2 PSK"</item>
+    <item msgid="7280821339307729710">"802.1x Enterprise"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
-    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
-    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
-    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
-    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
-    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
-    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
-    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
-    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
-    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
-    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
-    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
-    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
-    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
-    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
-    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
-    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
-    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
-    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
-    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
-    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
-    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
-    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
-    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
   <string-array name="wifi_wep_type">
     <item msgid="1497433962958697183">"Automatisk"</item>
     <item msgid="7182335713815377158">"WEP ASCII"</item>
     <item msgid="8270524878761069817">"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 (2193799199027871385) -->
-    <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
-    <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
-    <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
-    <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
-    <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
-    <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
-    <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
-    <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
-    <!-- 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) -->
-    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
-    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
-    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
-    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
-    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
-    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
-    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
-    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
-    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
-    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
-    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
+  <string-array name="wifi_sleep_policy_entries">
+    <item msgid="3804733751095821976">"Når skjermen slås av"</item>
+    <item msgid="1549288661423279207">"Aldri når tilkoblet"</item>
+    <item msgid="1986753720941888596">"Aldri"</item>
+  </string-array>
+  <string-array name="battery_history_type_spinner">
+    <item msgid="2193799199027871385">"CPU-bruk"</item>
+    <item msgid="6401018715947316517">"Nettverksbruk"</item>
+    <item msgid="188092590354892392">"GPS-bruk"</item>
+    <item msgid="8414109131222049141">"Sensorbruk"</item>
+    <item msgid="1327904325081257093">"Delvis våken bruk"</item>
+    <item msgid="4832254146664706277">"Annen bruk"</item>
+  </string-array>
+  <string-array name="battery_history_which_spinner">
+    <item msgid="3451981114763440074">"Siden sist uten strøm"</item>
+    <item msgid="166936313535197598">"Totalt siden oppstart"</item>
+    <item msgid="4793941382744963893">"Totalt hele tiden"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="9077371706468756228">"Brukstid"</item>
+    <item msgid="1908750532762193304">"Start telling"</item>
+    <item msgid="1213951670006606353">"Navn på program"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="1818786254010764570">"Ingen"</item>
+    <item msgid="6189918678874123056">"PAP"</item>
+    <item msgid="1524112260493662517">"MSCHAP"</item>
+    <item msgid="5923246669412752932">"MSCHAP2"</item>
+    <item msgid="8651992560135239389">"GTC"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Av"</item>
+    <item msgid="3165868966179561687">"Varsel"</item>
+    <item msgid="6038758039030476855">"Vibrering"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"Ingen"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP eller CHAP"</item>
+  </string-array>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 57bd4de1e94..d86f069199e 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -15,15 +15,17 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"Ja"</string>
+    <string name="no" msgid="6731231425810196216">"Nei"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Ukjent"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Slå på radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Slå av radio"</string>
     <string name="turn_on_qxdm" msgid="634471960429852506">"Slå på QXDM-minnekortlogg"</string>
     <string name="turn_off_qxdm" msgid="5719931520533431085">"Slå av QXDM-minnekortlogg"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Se SIM-adressebok"</string>
-    <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"View Fixed Dialing Numbers"</string>
-    <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"View Service Dialing Numbers"</string>
-    <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Get PDP list"</string>
+    <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Vis faste nummer"</string>
+    <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Vis tjenestenummer"</string>
+    <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Hent PDP-liste"</string>
     <string name="radioInfo_menu_enableData" msgid="5452877756028654595">"Slå på datatilkobling"</string>
     <string name="radioInfo_menu_disableData" msgid="7645419447977636497">"Slå av datatilkobling"</string>
     <string name="radioInfo_menu_enableDataOnBoot" msgid="1438925440424627675">"Slå på data ved oppstart"</string>
@@ -31,7 +33,7 @@
     <string name="radioInfo_service_in" msgid="1915416319177520020">"I serviceperiode"</string>
     <string name="radioInfo_service_out" msgid="5238736759641916278">"Ute av serviceperiode"</string>
     <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Kun nødsamtaler"</string>
-    <string name="radioInfo_service_off" msgid="1434084741785525415">"Radio off"</string>
+    <string name="radioInfo_service_off" msgid="1434084741785525415">"Radio av"</string>
     <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Roamer"</string>
     <string name="radioInfo_roaming_not" msgid="2851853244069662307">"Roamer ikke"</string>
     <string name="radioInfo_phone_idle" msgid="7489244938838742820">"Ledig"</string>
@@ -56,6 +58,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
     <string name="sdcard_setting" msgid="5922637503871474866">"Minnekort"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Batteristatus:"</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"Strømplugg:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Batteriskala:"</string>
     <string name="battery_info_level_label" msgid="8706526709307788737">"Batterinivå:"</string>
     <string name="battery_info_health_label" msgid="6416051542741886958">"Batterihelse:"</string>
@@ -75,6 +78,11 @@
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"Lader ut"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Lader ikke"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Full"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Ikke plugget i"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"Nettstrøm"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"Nettstrøm+USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"Ukjent"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Ukjent"</string>
     <string name="battery_info_health_good" msgid="8070356565806711806">"OK"</string>
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"For varmt"</string>
@@ -104,8 +112,14 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Paringsforespørsel for Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Paringsforespørsel"</string>
     <string name="bluetooth_notif_message" msgid="5381418499788668724">"Velg å pare med "</string>
+    <string name="device_picker" msgid="8721012448931226323">"Bluetooths enhetsvelger"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-tillatelse"</string>
+    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"En applikasjon på telefonen spør om tillatelse til å slå på Bluetooth. Ønsker du å gjøre dette?"</string>
+    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"En applikasjon på telefonen spør om tillatelse for å gjøre telefonen synlig for andre Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du å gjøre dette?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"En applikasjon på telefonen spør om tillatelse til å slå på Bluetooth og gjøre telefonen synlig for andre enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du å gjøre dette?"</string>
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Aktiverer Bluetooth…"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Innstillinger for dato og tid"</string>
-    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 pm"</string>
+    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 ettermiddag"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
     <string name="date_time_changeTime_text" msgid="7037437020000867740">"Endre tid"</string>
     <string name="date_time_changeDate_text" msgid="5259762626498028057">"Endre dato"</string>
@@ -119,7 +133,7 @@
     <string name="intent_sender_action_label" msgid="616458370005452389">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Start <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
-    <string name="intent_sender_account_label" msgid="465210404475603404">"Account:"</string>
+    <string name="intent_sender_account_label" msgid="465210404475603404">"Konto:"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Tøm"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Gjenopprett standardinnstillinger"</string>
@@ -131,37 +145,37 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Du må skrive inn et portnummer."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Feltet for portnummer må være tomt om feltet for vertsnavn er tomt."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Portnummeret er ikke gyldig."</string>
-    <string name="radio_info_signal_location_label" msgid="16475158265551708">"Location:"</string>
-    <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Neighboring CID:"</string>
-    <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Data attempts:"</string>
-    <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS service:"</string>
+    <string name="radio_info_signal_location_label" msgid="16475158265551708">"Plassering:"</string>
+    <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Nabo-CID:"</string>
+    <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Dataforsøk:"</string>
+    <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-tjeneste:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
-    <string name="radio_info_call_redirect_label" msgid="1654674226961476872">"Call redirect:"</string>
-    <string name="radio_info_ppp_resets_label" msgid="3241667824729310546">"Number of PPP reset since boot:"</string>
-    <string name="radio_info_gsm_disconnects_label" msgid="1683069665736339820">"GSM disconnects:"</string>
+    <string name="radio_info_call_redirect_label" msgid="1654674226961476872">"Samtaleomdirigering:"</string>
+    <string name="radio_info_ppp_resets_label" msgid="3241667824729310546">"Antall PPP-nullstillinger siden boot:"</string>
+    <string name="radio_info_gsm_disconnects_label" msgid="1683069665736339820">"GSM-frakoblinger:"</string>
     <string name="radio_info_current_network_label" msgid="3256402602440102610">"Gjeldende nettverk:"</string>
-    <string name="radio_info_data_successes_label" msgid="4417894113689054945">"Data successes:"</string>
-    <string name="radio_info_ppp_received_label" msgid="3345184342444878849">"PPP received:"</string>
-    <string name="radio_info_gsm_service_label" msgid="2082332114596916985">"GSM service:"</string>
-    <string name="radio_info_signal_strength_label" msgid="1931937920896925766">"Signal strength:"</string>
-    <string name="radio_info_call_status_label" msgid="4896238900685510883">"Call status:"</string>
-    <string name="radio_info_ppp_sent_label" msgid="5009102250704375687">"PPP sent:"</string>
-    <string name="radio_info_radio_resets_label" msgid="9211343458143291617">"Radio resets:"</string>
-    <string name="radio_info_message_waiting_label" msgid="6981842420058672207">"Message waiting:"</string>
-    <string name="radio_info_phone_number_label" msgid="7192944627907412169">"Phone number:"</string>
-    <string name="radio_info_band_mode_label" msgid="441469694142042022">"Select radio band"</string>
-    <string name="radio_info_network_type_label" msgid="3706382548257257987">"Network type:"</string>
-    <string name="radio_info_set_perferred_label" msgid="9039200405863503267">"Set preferred network type:"</string>
-    <string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Ping IpAddr:"</string>
-    <string name="radio_info_ping_hostname" msgid="3054888474808217853">"Ping Hostname(www.google.com):"</string>
-    <string name="radio_info_http_client_test" msgid="5733604021077701555">"HTTP Client test:"</string>
-    <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"Toggle ciphering"</string>
-    <string name="ping_test_label" msgid="7255376471490860631">"Run ping test"</string>
+    <string name="radio_info_data_successes_label" msgid="4417894113689054945">"Vellykket data:"</string>
+    <string name="radio_info_ppp_received_label" msgid="3345184342444878849">"PPP mottatt:"</string>
+    <string name="radio_info_gsm_service_label" msgid="2082332114596916985">"GSM-tjeneste:"</string>
+    <string name="radio_info_signal_strength_label" msgid="1931937920896925766">"Signalstyrke:"</string>
+    <string name="radio_info_call_status_label" msgid="4896238900685510883">"Samtalestatus:"</string>
+    <string name="radio_info_ppp_sent_label" msgid="5009102250704375687">"PPP sendt:"</string>
+    <string name="radio_info_radio_resets_label" msgid="9211343458143291617">"Radio-nullstillinger:"</string>
+    <string name="radio_info_message_waiting_label" msgid="6981842420058672207">"Melding venter:"</string>
+    <string name="radio_info_phone_number_label" msgid="7192944627907412169">"Telefonnummer:"</string>
+    <string name="radio_info_band_mode_label" msgid="441469694142042022">"Velg radiobånd"</string>
+    <string name="radio_info_network_type_label" msgid="3706382548257257987">"Nettverkstype:"</string>
+    <string name="radio_info_set_perferred_label" msgid="9039200405863503267">"Velg foretrukket nettverkstype:"</string>
+    <string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Ping IP-adresse:"</string>
+    <string name="radio_info_ping_hostname" msgid="3054888474808217853">"Ping vertsnavn(www.google.com):"</string>
+    <string name="radio_info_http_client_test" msgid="5733604021077701555">"HTTP-klienttest:"</string>
+    <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"Sål av/på kryptering"</string>
+    <string name="ping_test_label" msgid="7255376471490860631">"Kjør ping-test"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
-    <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Update"</string>
-    <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"Refresh"</string>
-    <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"Toggle DNS check"</string>
+    <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Oppdater"</string>
+    <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"Last på nytt"</string>
+    <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"Slå av/på DNS-sjekk"</string>
     <string name="band_mode_title" msgid="954174198903776205">"Velg GSM/UMTS-bånd"</string>
     <string name="band_mode_loading" msgid="548764766363847336">"Henter båndliste…"</string>
     <string name="band_mode_set" msgid="5730560180249458484">"Velg"</string>
@@ -196,7 +210,8 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Slå av alle trådløse tilkoblinger"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Slår av trådløse tilkoblinger…"</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Slår på trådløse tilkoblinger…"</string>
-    <string name="radio_controls_title" msgid="8356991079873437337">"Trådløse nett"</string>
+    <string name="radio_controls_title" msgid="5868688473587168882">"Trådløst og nettverk"</string>
+    <string name="wireless_networks_settings_title" msgid="149274247949769551">"Innstillinger for trådløst og nettverk"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Trådløse nett, Bluetooth, flymodus, mobile nettverk, VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Dataroaming"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Koble til datatjenester ved roaming"</string>
@@ -219,20 +234,29 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Datoformat"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sorter alfabetisk"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sorter etter tidssone"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"Sikkerhet og plassering"</string>
+    <string name="security_settings_title" msgid="5168491784222013179">"Plassering og sikkerhet"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"Plassering og sikkerhet"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Plassering, skjermlås, SIM-kort-lås"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angi Min posisjon, lås opp skjerm, lås påloggingsopplysninger"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passord"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Slå på Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth-innstillinger"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth-innstillinger"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Tilkoblinger, enhetsnavn og synlighet"</string>
-    <string name="bluetooth_pin_entry" msgid="5627349871303455279">"Forespørsel om Bluetooth-paring"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth-paringsforespørsel"</string>
     <string name="bluetooth_device_info" msgid="6644515376523965073">"Bluetooth-enhetsinformasjon"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="7551139612735632370">"<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_enter_pin_msg" msgid="856962526754150334">\n"Skriv PIN-kode for å pare med «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>». (Prøv 0000 eller 1234.)"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Skriv inn passordet for å pare med «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>»."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Hvis du vil pare med «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>», må du kontrollere at enheten viser passordet: <xliff:g id="PASSKEY">%2$s</xliff:g>"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"ønsker å pare."</string>
+    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Skriv inn <xliff:g id="PASSKEY">%2$s</xliff:g> på «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>» for å pare."</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Paring"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Ikke par"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"Bluetooth-enhet"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"NB"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Det oppsto et problem under paring med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="6938408362011024289">"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_pairing_pin_error_message" msgid="6065697229258906937">"Det oppsto et problem under paring med <xliff:g id="DEVICE_NAME">%1$s</xliff:g> fordi PIN-koden eller passordet er feil."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"Fikk ikke kontakt med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> avslo paring."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Kunne ikke koble til <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
@@ -246,6 +270,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Koble til…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Media"</string>
     <string name="bluetooth_profile_headset" msgid="1874975688666658946">"Telefon"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Overfør"</string>
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Koblet til medielyd"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Koblet til telefonlyd"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Koblet til medie- og telefonlyd"</string>
@@ -255,8 +280,11 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profiler"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Koblet til medielyd"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Koblet til telefonlyd"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Koblet til tjener for filoverføring"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ikke koblet til tjener for filoverføring"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Bruk for medielyd"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Bruk for telefonlyd"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Bruk til filoverføring"</string>
     <string name="wifi" msgid="1081550856200013637">"Trådløst nett"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Trådløst nett"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Slå på trådløst nett"</string>
@@ -273,17 +301,13 @@
     <string name="security" msgid="1040691896987225267">"Sikkerhet"</string>
     <string name="wifi_security_open" msgid="3513305614048816607">"Åpen"</string>
     <string name="wifi_security_wep" msgid="7082604129842065776">"WEP"</string>
-    <string name="wifi_security_wpa" msgid="8980169410565477162">"WPA"</string>
-    <string name="wifi_security_wpa2" msgid="5780665935088930524">"WPA2"</string>
-    <string name="wifi_security_wpa_eap" msgid="7485687331651751101">"WPA-EAP"</string>
-    <string name="wifi_security_ieee8021x" msgid="8538687609878109005">"IEEE8021X"</string>
+    <string name="wifi_security_psk" msgid="3392399380570381452">"WPA/WPA2 PSK"</string>
+    <string name="wifi_security_eap" msgid="8309434150934969132">"Enterprise (802.1x)"</string>
     <string name="wifi_security_unknown" msgid="4564208312073060668">"Ukjent"</string>
     <string name="wifi_security_verbose_open" msgid="8117878112088901945">"åpent nett"</string>
     <string name="wifi_security_verbose_wep" msgid="9220757688700421508">"sikret med WEP"</string>
-    <string name="wifi_security_verbose_wpa" msgid="598697674252714455">"sikret med WPA"</string>
-    <string name="wifi_security_verbose_wpa2" msgid="4116236883347875722">"sikret med WPA2"</string>
-    <string name="wifi_security_verbose_wpa_eap" msgid="1984821646949066624">"sikret med WPA-EAP"</string>
-    <string name="wifi_security_verbose_ieee8021x" msgid="5552995793910186310">"sikret med IEEE 802.1x"</string>
+    <string name="wifi_security_verbose_psk" msgid="1110130025330416225">"sikret med WPA/WPA2 PSK"</string>
+    <string name="wifi_security_verbose_eap" msgid="586632662086063">"sikret med 802.1x EAP"</string>
     <string name="ip_address" msgid="850672263358989449">"IP-adresse"</string>
     <string name="signal" msgid="1947969631626413228">"Signalstyrke"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"Slår på…"</string>
@@ -302,14 +326,13 @@
     <string name="please_type_anonymous_identity" msgid="835061562079965048">"Anonym identitet"</string>
     <string name="please_select_client_certificate" msgid="2137906961594663234">"Klientsertifikat"</string>
     <string name="please_select_ca_certificate" msgid="5010815181914420677">"CA-sertifikat"</string>
-    <string name="please_type_private_key_passwd" msgid="4077744679722504443">"Passord for privat nøkkel"</string>
     <string name="please_type_passphrase" msgid="8256017704131522462">"Passord for trådløst nettverk"</string>
     <string name="please_type_hex_key" msgid="8751224390407867551">"WEP-nøkkel i hex (0-9, A-F)"</string>
     <string name="wifi_show_password" msgid="4235237470701732009">"Vis passord."</string>
     <string name="scan_wifi" msgid="2459901725350542606">"Søk"</string>
     <string name="summary_not_in_range" msgid="3926674700733548684">"Utenfor rekkevidde"</string>
     <string name="summary_remembered" msgid="6079941090549401742">"husket"</string>
-    <string name="summary_connection_failed" msgid="7610394657613410489">"Tilkoblingen mislyktes, velg for å prøve på nytt"</string>
+    <string name="summary_connection_failed" msgid="2351885658101671413">"Tilkoblingen mislyktes, velg for å prøve på nytt"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Trådløse nettverk"</string>
     <string name="wifi_type_ssid" msgid="1326839657083292017">"Nettverks-SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sikkerhet"</string>
@@ -360,6 +383,7 @@
     <string name="status_disconnected" msgid="7561688569905126046">"Frakoblet"</string>
     <string name="status_failed" msgid="610462050405904601">"Mislykket"</string>
     <string name="sound_and_display_settings" msgid="349770582993029003">"Lyd og skjerm"</string>
+    <string name="sound_and_display_settings_title" msgid="5036144539683697330">"Lyd og bilde"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Lydinnstillinger"</string>
     <string name="sound_and_display_settings_summary" msgid="1433943789593286064">"Ringetoner, varsling, lysstyrke"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Stillemodus"</string>
@@ -385,13 +409,16 @@
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"Hørbart valg"</string>
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Lag lyd under skjermvalg"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Lag lyd under skjermvalg"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Vibrasjonsfeedback"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrer ved bruk av skjermtaster og enkelte UI-interaksjoner"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrer ved bruk av skjermtaster og enkelte UI-interaksjoner"</string>
     <string name="play_media_notification_sounds_enable_title" msgid="1008791464029179529">"Varsling for minnekort"</string>
     <string name="play_media_notification_sounds_enable_summary_on" msgid="7675466959375667370">"Spill lyd for minnekortvarsler"</string>
     <string name="play_media_notification_sounds_enable_summary_off" msgid="8672617597028744693">"Spill lyd for minnekortvarsler"</string>
-    <string name="sync_settings" msgid="2212736205476453234">"Datasynkronisering"</string>
-    <string name="sync_settings_summary" msgid="6480534906375217074">"Applikasjoner som skal synkroniseres"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Kontoer/synkronisering"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"Legge til eller fjerne kontoer og endre kontoinnstillinger"</string>
     <string name="search_settings" msgid="1910951467596035063">"Søk"</string>
-    <string name="search_settings_summary" msgid="9205656546570654169">"Søkeinnstillinger og -historie"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Søkeinnstillinger og -logg"</string>
     <string name="display_settings" msgid="3912042046350078328">"Skjerminnstillinger"</string>
     <string name="animations_title" msgid="1062189037402346023">"Animasjon"</string>
     <string name="animations_summary_on" msgid="8843613112130484436">"Vis animasjoner når vinduer åpnes og lukkes"</string>
@@ -403,6 +430,7 @@
     <string name="brightness_summary" msgid="838917350127550703">"Juster skjermens lysstyrke"</string>
     <string name="screen_timeout" msgid="4882669461447531301">"Skjermsparer"</string>
     <string name="screen_timeout_summary" msgid="2905757633140605334">"Juster hvor lang tid som skal gå før skjermen slås av automatisk"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Innstillinger for SIM-kort-lås"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Sett opp SIM-kort-lås"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kort-lås"</string>
@@ -436,7 +464,8 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Telefonnummer, signalstyrke, osv."</string>
-    <string name="storage_settings_title" msgid="8461515684514801302">"Minnekort og lagring"</string>
+    <string name="storage_settings" msgid="6681164315506788024">"Minnekort og telefonlager"</string>
+    <string name="storage_settings_title" msgid="5379463509034022773">"Minnekort og telefonlager"</string>
     <string name="storage_settings_summary" msgid="9176693537325988610">"Avmonter minnekort, vis ledig plass"</string>
     <string name="status_number" msgid="5123197324870153205">"Telefonnummer"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
@@ -480,6 +509,11 @@
     <string name="apn_mms_port" msgid="4074188088199243040">"MMS-port"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"Autentiseringstype"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Ingen"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN-type"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Slett APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nytt APN"</string>
@@ -495,14 +529,13 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Ferdig med å gjenopprette standardvalg for APN"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrikkinnstillinger"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Fjern alle data fra telefonen"</string>
-    <!-- no translation found for master_clear_desc (7823268823499739178) -->
-    <skip />
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Nullstill telefonen"</string>
+    <string name="master_clear_desc" msgid="7823268823499739178">"Dette vil fjerne alle data fra telefonen, herunder:"\n<li>"Google-kontoen din"</li>\n<li>"System- og programdata og -innstillinger"</li>\n<li>"Nedlastede programmer"</li>\n"Det vil ikke slette:"\n<li>"Gjeldende systemprogramvare og medfølgende programmer"</li>\n<li>"Filer på minnekortet, eksempelvis musikk eller bilder"</li></string>
+    <string name="master_clear_button_text" msgid="7550632653343157971">"Tilbakestill telefonen"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Fjern all personlig informasjon og nedlastede applikasjoner? Dette kan ikke gjøres om!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Fjern alt"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Tegn opplåsingsmønsteret"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Du må tegne opplåsingsmønsteret for å bekrefte nullstilling av telefonen."</string>
-    <string name="master_clear_failed" msgid="8655202125010189406">"Telefonen ble ikke nullstilt fordi nullstillingstjenesten ikke er tilgjengelig."</string>
+    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Du må tegne opplåsingsmønsteret for å bekrefte tilbakestilling av telefonen."</string>
+    <string name="master_clear_failed" msgid="8655202125010189406">"Telefonen ble ikke tilbakestilt fordi tilbakestillingstjenesten ikke er tilgjengelig."</string>
     <string name="media_format_title" msgid="4671276096695789895">"Formater minnekort"</string>
     <string name="media_format_summary" msgid="3805714639375830120">"Sletter alle data fra minnekortet"</string>
     <string name="media_format_desc" msgid="1142563222357820834">"Dette valget vil slette alle data fra minnekortet i telefonen. Du vil miste ALLE data på kortet!"</string>
@@ -519,12 +552,15 @@
     <string name="location_network_based" msgid="8815705866861993344">"Bruk trådløse nettverk"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Se plassering i applikasjoner (som kart) ved hjelp av trådløse nettverk"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Plassering bestemmes ved hjelp av trådløse og/eller mobile nettverk"</string>
-    <string name="location_gps" msgid="375912731641377120">"Bruk GPS-satellitter"</string>
-    <string name="location_street_level" msgid="5899941752252356344">"Nøyaktig til gatenivå (slå av for å spare batteri)"</string>
+    <string name="location_gps" msgid="6296125378829097831">"Bruk GPS-satellitter"</string>
+    <string name="location_street_level" msgid="6460740847018275745">"Nøyaktig til gatenivå (slå av for å spare batteri)"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Finn plassering på gatenivå (bruker mer batteri, og trenger fri sikt til himmelen)"</string>
-    <string name="use_location_title" msgid="7585990952633568732">"Del med Google"</string>
-    <string name="use_location_summary" msgid="4411467143899877395">"La Google bruke plasseringen til bedre søk og andre tjenester"</string>
-    <string name="use_location_warning_message" msgid="5696732842038416151">"La Google bruke plasseringen til bedre søk og andre tjenester"</string>
+    <string name="assisted_gps" msgid="4649317129586736885">"Aktiver GPS med hjelp"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Bruk tjener til å hjelpe GPS (opphev for å redusere nettverksbruken)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Bruk tjeneren til å hjelpe GPS (velg for å forbedre GPS-ytelsen)"</string>
+    <string name="use_location_title" msgid="5447030582538504247">"Del med Google"</string>
+    <string name="use_location_summary" msgid="1816849484040070431">"La Google bruke plasseringen til bedre søk og andre tjenester"</string>
+    <string name="use_location_warning_message" msgid="1420184860518262439">"Vil du tillate Google å bruke din posisjon til å forbedre søkeresultatene og andre tjenester?"</string>
     <string name="agree" msgid="6288718671527758326">"Godta"</string>
     <string name="disagree" msgid="6221069272309799230">"Avslå"</string>
     <string name="about_settings" msgid="1743378368185371685">"Om telefonen"</string>
@@ -539,6 +575,10 @@
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Åpen kildekode-lisenser"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Kunne ikke hente lisensene."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"henter…"</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Sikkerhetsinformasjon"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Sikkerhetsinformasjon"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Telefonen er ikke koblet til en datatjeneste. For å se informasjonen nå, gå til %s fra en datamaskin koblet til internett."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Henter…"</string>
     <string name="lock_settings_title" msgid="5828348303971852121">"Opplåsingsmønster for skjerm"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Opplåsingsmønster"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bekreft lagret mønster"</string>
@@ -553,7 +593,7 @@
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Bekreft"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Tegn på nytt"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Prøv igjen"</string>
-    <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"Continue"</string>
+    <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"Fortsett"</string>
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Opplåsingsmønster"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Krev mønster"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Krev mønster for å låse opp skjermen"</string>
@@ -567,9 +607,9 @@
     <string name="skip_button_label" msgid="8680422740354436943">"Avbryt"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Neste"</string>
     <string name="lock_title" msgid="4059246467204273930">"Sikring av telefonen"</string>
-    <string name="lock_intro_message" msgid="5352897389718432077"><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_intro_message" msgid="9100785646737118042"><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" msgid="8052305554017485410">"Eksempelmønster"</string>
-    <string name="lock_example_message" msgid="7431982730914254881">"Tegn over minst fire prikker."\n" "\n"Velg «Neste» når du er klar til å tegne ditt eget mønster."</string>
+    <string name="lock_example_message" msgid="1838650097090632706">"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" msgid="5712405848153426706">"Installerte applikasjoner"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Hold orden på og fjern installerte applikasjoner"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Applikasjoner"</string>
@@ -603,12 +643,12 @@
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Velg filtreringsinnstillinger"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Alle"</string>
-    <string name="filter_apps_third_party" msgid="1096017647285183437">"Tredjeparts"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Tredjeparts"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Kjører"</string>
     <string name="loading" msgid="3200408047793887917">"Laster…"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Beregner størrelse på nytt…"</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Slett"</string>
-    <string name="clear_data_dlg_text" msgid="8796694785488630642">"All informasjon du har lagret i denne applikasjonen vil bli fjernet permanent."</string>
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"All informasjon du har lagret i denne applikasjonen vil bli fjernet permanent."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Avbryt"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"Fant ikke applikasjonen"</string>
@@ -616,14 +656,28 @@
     <string name="clear_data_failed" msgid="581956197586913865">"Kunne ikke fjerne applikasjonsdata."</string>
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Avinstaller oppdateringer"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Vil du avinstallere alle oppdateringer til denne Android-systemapplikasjonen?"</string>
-    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Nullstill data"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Kunne ikke nullstille data for applikasjonen"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Tilbakestill data"</string>
+    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Kunne ikke tilbakestille data for applikasjonen"</string>
     <string name="security_settings_desc" msgid="3116027624526915561">"Applikasjonen har disse rettighetene på telefonen:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Beregner fortsatt…"</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Kunne ikke beregne pakkestørrelse"</string>
-    <string name="empty_list_msg" msgid="1883660401486953588">"Ingen tredjepartsapplikasjoner er installert."</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"Du har ingen tredjepartsprogrammer installert."</string>
     <string name="version_text" msgid="9189073826278676425">"versjon <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
-    <string name="language_settings" msgid="2939555761536357092">"Språk og tekst"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"Kjørende tjenester"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Vis og kontroller tjenester som kjører for øyeblikket"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"Starter på nytt"</string>
+    <string name="no_running_services" msgid="6981216347270280598">"Ingen kjørende tjenester"</string>
+    <string name="confirm_stop_service" msgid="5700448757318301681">"Stoppe tjenesten?"</string>
+    <string name="confirm_stop_service_msg" msgid="1202118456282395730">"Tjenesten kjører ikke før den startes på nytt. Dette kan påvirke programmet <xliff:g id="APPLICATION">%1$s</xliff:g> på en negativ måte."</string>
+    <string name="confirm_stop_stop" msgid="7382363913280993331">"Stopp"</string>
+    <string name="confirm_stop_cancel" msgid="206495326622692381">"Avbryt"</string>
+    <string name="service_started_by_app" msgid="8432097226392386802">"Startet av applikasjon: trykk for å avslutte"</string>
+    <string name="service_client_name" msgid="2337664610975074717">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: Velg for å administrere"</string>
+    <string name="service_background_processes" msgid="5158600475629177758">"Tilgj.:<xliff:g id="FREE">%2$s</xliff:g> + <xliff:g id="MEMORY">%3$s</xliff:g> i <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_foreground_processes" msgid="4013890350284680796">"Andre: <xliff:g id="MEMORY">%2$s</xliff:g> (<xliff:g id="COUNT">%1$d</xliff:g> pros.)"</string>
+    <string name="service_process_name" msgid="8630408984456958400">"Prosess: <xliff:g id="PROCESS">%1$s</xliff:g>"</string>
+    <string name="language_settings" msgid="502219872342167227">"Språk og tastatur"</string>
+    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Språk og tastatur"</string>
     <string name="language_settings_summary" msgid="595647729475399987">"Innstillinger for språk, region, skriving av tekst og feilretting"</string>
     <string name="language_category" msgid="3391756582724541530">"Innstillinger for språk"</string>
     <string name="text_category" msgid="6342540511465136739">"Tekstinnstillinger"</string>
@@ -638,7 +692,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Trykk mellomromstasten to ganger for å skrive punktum"</string>
     <string name="show_password" msgid="2198798062604049206">"Synlige passord"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Vis passord mens de skrives inn"</string>
-    <string name="ime_security_warning" msgid="3458652708716006477">"Inndatametoden har mulighet til å samle inn all tekst du skriver, inkludert personlige data som passord og kredittkortnummer. Den kommer fra applikasjonen <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Aktiver inndatametoden?"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"Inndatametoden har mulighet til å samle inn all tekst du skriver, inkludert personlige data som passord og kredittkortnummer. Den kommer fra applikasjonen <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Aktiver inndatametoden?"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Ordliste"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"Ordliste"</string>
     <string name="user_dict_settings_summary" msgid="2460427065601355471">"Legg til og fjern ord fra ordlisten"</string>
@@ -666,7 +720,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Skriving av tekst"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Innstillinger for skriving av tekst"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Innstillinger for <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="4919680715154885028">"Innstillinger for skjermtastatur"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Innstillinger for skjermtastatur"</string>
     <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Fysisk tastatur"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Innstillinger for innebygget tastatur"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Utvikling"</string>
@@ -675,13 +729,13 @@
     <string name="enable_adb_summary" msgid="4881186971746056635">"Debug-modus når USB er koblet til"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Forbli våken"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skjermen vil aldri blankes under lading"</string>
-    <string name="allow_mock_location" msgid="2787962564578664888">"Tillat manuell plassering"</string>
-    <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillat manuell plassering"</string>
-    <string name="adb_warning_title" msgid="1756027479229533250">"Aktiver USB-debugging?"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Tillat simulert plassering"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillat bruk av simulerte GPS-koordinater"</string>
+    <string name="adb_warning_title" msgid="6234463310896563253">"Aktiver USB-debugging?"</string>
     <string name="adb_warning_message" msgid="5352555112049663033">"USB-debugging er kun ment for utviklere. Det kan brukes for å kopiere data mellom datamaskinen og telefonen, installere applikasjoner på telefonen i det stille, og lese loggdata."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Velg gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Velg skrivebordselement"</string>
-    <string name="battery_history_details_for" msgid="5189636461798594740">"Detaljer for UID %d"</string>
+    <string name="battery_history_details_for" msgid="5924639922153109669">"Detaljer for UID <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="battery_history_uid" msgid="1016606150528436298">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage" msgid="8010852371665217020">"Nettbruk av <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
     <string name="battery_history_bytes_received" msgid="980307569180518302">"Byte mottatt: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
@@ -717,26 +771,25 @@
     <string name="app_name_label" msgid="2000949925256858308">"Applikasjon"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"Antall"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Brukstid"</string>
-    <string name="accessibility_settings_title" msgid="4239640930601071058">"Tilgjengelighet"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"Tilgjengelighet"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Tilgjengelighetsinnstillinger"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Tilgjengelighetsvalg"</string>
     <string name="toggle_accessibility_title" msgid="650839277066574497">"Tilgjengelighet"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Tjenester for tilgjengelighet"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Ingen tilgjengelighetstjenester er installert."</string>
-    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
-    <skip />
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>Denne tilgjengelighetstjenesten har tilgang til all tekst du skriver, inkludert personlig data som passord og kredittkortnummer. Den kan også loggføre alt som skjer i brukergrensesnittet. Det kommer fra programmet. Aktivere tilgjengelighetstjenesten?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Slå av tilgjengelighetsstøtten?"</string>
     <string name="power_usage_summary_title" msgid="5180282911164282324">"Batteribruk"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Hva som har brukt batteri"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteribruk siden strømmen ble trukket ut"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Batteribruk siden omstart"</string>
-    <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> siden strømmen ble trukket ut"</string>
+    <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> siden strømmen ble frakoblet"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Tid enheten har vært våken"</string>
     <string name="wifi_on_time" msgid="4630925382578609056">"Tid trådløsnettet har vært aktivt"</string>
     <string name="bluetooth_on_time" msgid="4478515071957280711">"Tid Bluetooth har vært aktivt"</string>
-    <!-- no translation found for usage_name_percent (1899151069711662289) -->
-    <skip />
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Detaljert batteribrukinformasjon"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Bruksdetaljer"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Juster strømforbruk"</string>
@@ -755,9 +808,8 @@
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Data mottatt"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Lyd"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
-    <string name="usage_type_on_time" msgid="3351200096173733159">"TId på"</string>
-    <!-- no translation found for usage_type_no_coverage (3797004252954385053) -->
-    <skip />
+    <string name="usage_type_on_time" msgid="3351200096173733159">"Tid på"</string>
+    <string name="usage_type_no_coverage" msgid="3797004252954385053">"Tid uten signal"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Tving avslutning"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Info om applikasjon"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Innstillinger for applikasjon"</string>
@@ -771,24 +823,23 @@
     <string name="battery_desc_display" msgid="5432795282958076557">"Batteri brukt av skjermen og baklyset"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Skru ned lysstyrken og/eller tidsavbruddet for skjerm"</string>
     <string name="battery_desc_wifi" msgid="1702486494565080431">"Batteri brukt av trådløsnettet"</string>
-    <!-- no translation found for battery_sugg_wifi (7542345142282261691) -->
-    <skip />
+    <string name="battery_sugg_wifi" msgid="7542345142282261691">"Skru av trådløst nett når du ikke bruker det, eller det ikke er tilgjengelig"</string>
     <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Batteri brukt av Bluetooth"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="144393178427277439">"Skru av Bluetooth når det ikke er i bruk"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Slå av Bluetooth når det ikke er i bruk"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Prøv å koble til en annen Bluetooth-enhet"</string>
     <string name="battery_desc_apps" msgid="8123202939321333639">"Batteri brukt av applikasjoner som ikke kjøres"</string>
     <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Stopp eller avinstaller applikasjonen"</string>
     <string name="battery_sugg_apps_gps" msgid="4145005297393800223">"Skru av GPS når den ikke er i bruk"</string>
     <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"Applikasjonen har muligens innstillinger som kan redusere batteribruken"</string>
-    <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> siden strømmen ble trukket ut"</string>
+    <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> siden strømmen ble frakoblet"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Siste gang uten strøm i <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total bruk"</string>
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Oppdater"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android-operativsystem"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Medietjener"</string>
-    <string name="tts_settings" msgid="6454363854545277027">"Talesyntese"</string>
+    <string name="tts_settings" msgid="3348626948015962987">"Tekst til tale"</string>
     <string name="tts_settings_summary" msgid="2627715231944602766">"Endre valg for talesyntese"</string>
-    <string name="tts_settings_title" msgid="5064947197040356736">"Talesyntese-kontroller"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Talesyntese-kontroller"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Overstyr innstillinger"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Standardvalgene under overstyrer applikasjonsinnstillinger"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Standardvalg"</string>
@@ -806,8 +857,11 @@
     <string name="tts_demo" msgid="405357591189935876">"Dette er et eksempel på stemmesyntese."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Du har endret innstillingene dine. Dette er et eksempel på hvordan de høres ut."</string>
     <string name="gadget_title" msgid="7455548605888590466">"Strømkontroll"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Oppdaterer innstilling for Wi-Fi"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Oppdatere Bluetooth-innstilling"</string>
+    <string name="credential_installer_activity_title" msgid="7600661521831762521">"Akkreditivinstallasjon"</string>
     <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN-innstillinger"</string>
-    <string name="vpn_connect_to" msgid="9040615733700098831">"Koble til %s"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"Koble til <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="vpn_username_colon" msgid="7854930370861306247">"Brukernavn:"</string>
     <string name="vpn_password_colon" msgid="5716278710848606626">"Passord:"</string>
     <string name="vpn_a_username" msgid="6664733641993968692">"et brukernavn"</string>
@@ -817,8 +871,7 @@
     <string name="vpn_yes_button" msgid="8034531001149843119">"Ja"</string>
     <string name="vpn_no_button" msgid="7620339571187119107">"Nei"</string>
     <string name="vpn_back_button" msgid="192036339792734970">"Tilbake"</string>
-    <!-- no translation found for vpn_mistake_button (1683383660912491270) -->
-    <skip />
+    <string name="vpn_mistake_button" msgid="1683383660912491270">"Nei"</string>
     <string name="vpn_menu_done" msgid="93528279226907926">"Lagre"</string>
     <string name="vpn_menu_cancel" msgid="7234451214611202868">"Avbryt"</string>
     <string name="vpn_menu_revert" msgid="4407762442281467659">"Tilbakestill"</string>
@@ -826,38 +879,34 @@
     <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Koble fra nettverk"</string>
     <string name="vpn_menu_edit" msgid="4526245173583195618">"Rediger nettverk"</string>
     <string name="vpn_menu_delete" msgid="3326527392609513129">"Slett nettverk"</string>
-    <string name="vpn_error_miss_entering" msgid="1467455143582547499">"Du må skrive inn %s."</string>
-    <string name="vpn_error_miss_selecting" msgid="953436717902387192">"Du må velge %s."</string>
-    <string name="vpn_error_duplicate_name" msgid="2786397299628471911">"VPN-navnet \'%s\' finnes allerede. Velg et annet navn."</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Du må skrive inn <xliff:g id="CODE">%s</xliff:g>."</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Du må velge <xliff:g id="OPTION">%s</xliff:g>."</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"VPN-navnet «<xliff:g id="NAME">%s</xliff:g>»·finnes allerede. Velg et annet navn."</string>
     <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Er du sikker på at du ønsker å slette dette VPN-et?"</string>
     <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Er du sikker på at du ikke ønsker å opprette denne profilen?"</string>
     <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Er du sikker på at du vil forkaste endringene for denne profilen?"</string>
     <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Kunne ikke koble til nettverket. Prøv igjen?"</string>
-    <!-- no translation found for vpn_reconnect_from_lost (2442844155623372118) -->
-    <skip />
-    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
-    <skip />
-    <!-- no translation found for vpn_challenge_error_dialog_msg (6174901754230038601) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set_dialog_msg (8013052814131532765) -->
-    <skip />
-    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
-    <skip />
-    <!-- no translation found for vpn_remote_hung_up_error_dialog_msg (1566946015052633150) -->
-    <skip />
+    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Mistet tilkoblingen. Koble til på nytt?"</string>
+    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Kunne ikke slå opp tjenernavnet. Ønsker du å sjekke innstillingen for tjenernavn?"</string>
+    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Autentiseringsfeil. Ønsker du å sjekke passordinnstillingene?"</string>
+    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Et eller flere passord mangler i denne VPN-innstillingen. Ønsker du å sjekke passordinnstillingene?"</string>
+    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Brukernavnet eller passordet er feil. Prøv igjen?"</string>
+    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Tjeneren la på. Brukernavnet eller passordet kan være feil. Prøv igjen?"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Tjeneren brøt forbindelsen. Det kan hende du befinner deg bak en brannmur som hindrer deg i å koble til tjeneren. Vil du prøve igjen?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Tjenerforhandling mislyktes. Det kan hende at tjeneren ikke er enig i krypteringsalternativet ditt. Vil du kontrollere krypteringsinnstillingene?"</string>
     <string name="vpn_type_title" msgid="6392933604218676224">"Legg til VPN"</string>
     <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Legg til VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2550661826320709266">"Legg til %s-VPN"</string>
-    <string name="vpn_edit_title_edit" msgid="1769999313158207723">"Detaljer for %s"</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Legg til <xliff:g id="NAME">%s</xliff:g>-VPN"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Detaljer om <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="vpns" msgid="3148141862835492816">"VPN"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Kobler til..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Kobler fra..."</string>
+    <string name="vpn_connecting" msgid="8039521381692090116">"Kobler til ..."</string>
+    <string name="vpn_disconnecting" msgid="7748050200708257066">"Kobler fra ..."</string>
     <string name="vpn_connected" msgid="7641723116362845781">"Tilkoblet"</string>
     <string name="vpn_connect_hint" msgid="7442898962925875181">"Koblet til nettverket"</string>
     <string name="vpn_name" msgid="1550918148476193076">"VPN-navn"</string>
     <string name="vpn_a_name" msgid="8445736942405283509">"et VPN-navn"</string>
-    <string name="vpn_profile_added" msgid="2157095890825215726">"«%s» ble lagt til"</string>
-    <string name="vpn_profile_replaced" msgid="384234123486734768">"«%s» ble redigert"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"«<xliff:g id="NAME">%s</xliff:g>» ble lagt til"</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"«<xliff:g id="NAME">%s</xliff:g>» ble endret"</string>
     <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Velg klientsertifikat"</string>
     <string name="vpn_user_certificate" msgid="949322691686938888">"Klientsertifikat"</string>
     <string name="vpn_a_user_certificate" msgid="8943983437956898649">"et klientsertifikat"</string>
@@ -867,10 +916,8 @@
     <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Velg L2TP-passord"</string>
     <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP-passord"</string>
     <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"et L2TP-passord"</string>
-    <!-- no translation found for vpn_pptp_encryption_title (2236795167467896499) -->
-    <skip />
-    <!-- no translation found for vpn_pptp_encryption (2602329949737259686) -->
-    <skip />
+    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"kryptering"</string>
+    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"PPTP-kryptering"</string>
     <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Velg forhåndsdelt nøkkel for IPSec"</string>
     <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Forhåndsdelt nøkkel for IPSec"</string>
     <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"en forhåndsdelt nøkkel for IPSec"</string>
@@ -880,60 +927,53 @@
     <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"VPN-tjenernavn"</string>
     <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS-søkesti"</string>
     <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS-søkesti"</string>
-    <string name="vpn_field_is_set" msgid="1880980734721258127">"%s er valgt"</string>
-    <string name="vpn_field_not_set" msgid="6827205815004809490">"%s er ikke valgt"</string>
-    <string name="vpn_field_not_set_optional" msgid="8665901697706781015">"%s er ikke valgt (frivillig)"</string>
-    <string name="vpn_enable_field" msgid="3348948489989523325">"Aktiver %s"</string>
-    <string name="vpn_disable_field" msgid="2286966253789266389">"Deaktiver %s"</string>
-    <string name="vpn_is_enabled" msgid="5128973727115662815">"%s er aktivert"</string>
-    <string name="vpn_is_disabled" msgid="8028085699769751756">"%s er deaktivert"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> er angitt"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> ikke angitt"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> er ikke angitt (valgfritt)"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"Aktiver <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"Deaktiver <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> er aktivert"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> er deaktivert"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"VPN-innstillinger"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Sett opp og vedlikehold virtuelle private nettverk (VPN)"</string>
-    <!-- no translation found for vpn_secret_unchanged (8700613973594154529) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set (1037792636371641845) -->
-    <skip />
-    <string name="cstor_settings_category" msgid="2284299080682591107">"Akkreditivlager"</string>
-    <string name="cstor_access_title" msgid="1739505390736236717">"Bruk sikre akkreditiver"</string>
-    <string name="cstor_access_summary" msgid="4512681868217546677">"Gir applikasjoner tilgang til sikre sertifikater og andre akkreditiver"</string>
-    <string name="cstor_access_dialog_title" msgid="3024256293191879190">"Skriv inn passord"</string>
-    <string name="cstor_access_dialog_hint_from_action" msgid="679746865623760961">"Skriv inn passordet for akkreditivlager."</string>
-    <string name="cstor_set_passwd_title" msgid="6156763762703061470">"Velg passord"</string>
-    <string name="cstor_set_passwd_summary" msgid="5248560429856597398">"Velg eller endre passordet for akkreditivlageret"</string>
-    <string name="cstor_set_passwd_dialog_title" msgid="4071157542842979977">"Velg passord"</string>
-    <string name="cstor_reset_title" msgid="6001600882136794382">"Tøm lager"</string>
-    <string name="cstor_reset_summary" msgid="7509525030771504833">"Tøm akkreditivlageret for alt innhold, og nullstill passordet"</string>
-    <string name="cstor_reset_hint" msgid="5331632794451859788">"Er du sikker på at du ønsker å slette alle akkreditiver og nullstille passordet for akkreditivlageret?"</string>
-    <string name="cstor_name_credential_dialog_title" msgid="1723509156126180662">"Gi sertifikatet et navn"</string>
-    <string name="cstor_credential_name" msgid="2958936431813760259">"Sertifikatnavn:"</string>
-    <!-- no translation found for cstor_credential_password (7187440553141199409) -->
-    <skip />
-    <string name="cstor_credential_info" msgid="6097346149400207440">"Detaljer for sertifikat:"</string>
-    <string name="cstor_name_credential_hint" msgid="6889198058976515785">"Navnet kan kun inneholde bokstaver og tall."</string>
-    <string name="cstor_old_password" msgid="979282118063084561">"Nåværende passord:"</string>
-    <string name="cstor_new_password" msgid="6218562692435670047">"Nytt passord:"</string>
-    <string name="cstor_confirm_password" msgid="8996028123356342466">"Bekreft nytt passord:"</string>
-    <string name="cstor_first_time_hint" msgid="1831593416099224962">"Velg et passord for akkreditivlageret."</string>
-    <string name="cstor_first_time_hint_from_action" msgid="4690937025845780557">"Velg et passord for akkreditivlageret."</string>
-    <string name="cstor_password_error" msgid="2917326097260402464">"Skriv inn det riktige passordet."</string>
-    <string name="cstor_password_error_reset_warning" msgid="3336370539045905953">"Skriv inn det riktige passordet. Du har ett forsøk igjen før akkreditivlageret blir slettet."</string>
-    <string name="cstor_password_error_reset_warning_plural" msgid="6209069679269017200">"Skriv inn det riktige passordet. Du har %d forsøk igjen før akkreditivlageret blir slettet."</string>
-    <string name="cstor_passwords_error" msgid="956773958408751155">"Passordene stemmer ikke overens."</string>
-    <string name="cstor_passwords_empty_error" msgid="6062539742626760734">"Du må skrive inn og bekrefte et passord."</string>
-    <string name="cstor_password_empty_error" msgid="7249632576906961482">"Skriv inn et passord."</string>
-    <string name="cstor_password_verification_error" msgid="8553930704493511389">"Skriv inn passordet på nytt. Passordet må ha minst åtte tegn, og kan ikke inneholde mellomrom."</string>
-    <string name="cstor_name_empty_error" msgid="7499971191993770322">"Skriv inn et navn."</string>
-    <string name="cstor_name_char_error" msgid="8048089317968192516">"Skriv inn et navn som kun inneholder bokstaver og tall."</string>
-    <!-- no translation found for cstor_storage_error (7140697503172458161) -->
-    <skip />
-    <!-- no translation found for cstor_unable_to_save_cert (1631402544447196406) -->
-    <skip />
-    <!-- no translation found for cstor_cert_not_saved (6318149789449538491) -->
-    <skip />
-    <!-- no translation found for cstor_is_reset (449870501126790589) -->
-    <skip />
-    <string name="cstor_is_enabled" msgid="4054049098081482785">"Akkreditivlagring er aktivert."</string>
-    <string name="cstor_is_added" msgid="794788474010251572">"%s ble lagt til."</string>
+    <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(uendret)"</string>
+    <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ikke satt)"</string>
+    <string name="credentials_category" msgid="8536992056377271234">"Akkreditivlager"</string>
+    <string name="credentials_access" msgid="4843187230913860492">"Bruk sikre akkreditiver"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"Gir applikasjoner tilgang til sikre sertifikater og andre akkreditiver"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"Velg passord"</string>
+    <string name="credentials_unlock_hint" msgid="594679530407918031">"Skriv inn passordet for akkreditivlageret"</string>
+    <string name="credentials_install_certificates" msgid="177337517568022236">"Installer fra minnekort"</string>
+    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Installer krypterte sertifikater fra minnekort"</string>
+    <string name="credentials_set_password" msgid="9104473585811899989">"Velg passord"</string>
+    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Velg eller endre passord for akkreditivlageret"</string>
+    <string name="credentials_reset" msgid="9170150870552453457">"Tøm lager"</string>
+    <string name="credentials_reset_summary" msgid="1530388094693731636">"Tøm akkreditivlageret for alt innhold, og tilbakestill passordet"</string>
+    <string name="credentials_reset_hint" msgid="819990295796804516">"Er du sikker på at du ønsker å slette alle akkreditiver og tilbakestille passordet for akkreditivlageret?"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"Nåværende passord:"</string>
+    <string name="credentials_new_password" msgid="267487774686796938">"Nytt passord:"</string>
+    <string name="credentials_confirm_password" msgid="4732250000633424345">"Bekreft nytt passord:"</string>
+    <string name="credentials_first_time_hint" msgid="1567821077545346039">"Velg et passord for akkreditivlageret (minst åtte tegn)"</string>
+    <string name="credentials_wrong_password" msgid="7525192410790152041">"Galt passord. Prøv igjen."</string>
+    <string name="credentials_reset_warning" msgid="6392481296673345268">"Skriv inn passordet. Du har ett forsøk igjen før akkreditivlageret blir tømt."</string>
+    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Skriv inn passordet. Du har <xliff:g id="NUMBER">%1$d</xliff:g> forsøk igjen før akkreditivlageret blir tømt."</string>
+    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Passordene stemmer ikke overens."</string>
+    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Du må skrive inn og bekrefte et passord."</string>
+    <string name="credentials_password_empty" msgid="8292138152983330473">"Skriv inn passordet."</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"Passordet må bestå av minst åtte tegn."</string>
+    <string name="credentials_erased" msgid="7700309135582200849">"Akkreditivlageret ble tømt."</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"Akkreditivlageret er aktivert."</string>
+    <string name="credentials_disabled" msgid="7453188089059045380">"Akkreditivlageret er deaktivert."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nødtone"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Velg oppførsel når en nødsamtale opprettes"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Personvern"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Personverninnstillinger"</string>
+    <string name="location_section_title" msgid="6072558684044939786">"Plassering"</string>
+    <string name="settings_section_title" msgid="7413252428447723032">"Innstillinger"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Personlige data"</string>
+    <string name="backup_settings_title" msgid="2968262658155327829">"Innstillingsbackup"</string>
+    <string name="backup_erase_dialog_title" msgid="6028429904055779443">"Backup av innstillinger"</string>
+    <string name="backup_erase_dialog_message" msgid="9096433810456900531">"Er du sikker på at du ønsker å slutte med backup av innstillingene og fjerne alle kopier på Googles tjenere?"</string>
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
+    <skip />
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index a96b716cfc7..377357d25d4 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -24,14 +24,17 @@
     <item msgid="5345178126174698955">"Stille Oceaan"</item>
     <item msgid="8392017019801393511">"Alles"</item>
   </string-array>
-  <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"15 seconden"</item>
-    <item msgid="8881760709354815449">"30 seconden"</item>
-    <item msgid="7589406073232279088">"1 minuut"</item>
-    <item msgid="7001195990902244174">"2 minuten"</item>
-    <item msgid="5721688686241190620">"10 minuten"</item>
-    <item msgid="1781492122915870416">"Nooit time-out"</item>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"Geen animaties"</item>
+    <item msgid="6291186755504776720">"Enkele animaties"</item>
+    <item msgid="3856065399819979491">"Alle animaties"</item>
   </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"Er worden geen vensteranimaties weergegeven"</item>
+    <item msgid="4460915688877708508">"Er worden een paar vensteranimaties weergegeven"</item>
+    <item msgid="488968798204105119">"Alle vensteranimaties worden weergegeven"</item>
+  </string-array>
+    <!-- no translation found for screen_timeout_entries:5 (7156442995039264948) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Zeer langzaam"</item>
     <item msgid="2361722960903353554">"Langzaam"</item>
@@ -58,18 +61,14 @@
     <item msgid="2923732046112398627">"Automatisch"</item>
     <item msgid="5434666299123318296">"Geen"</item>
     <item msgid="3159594845889645948">"WEP"</item>
-    <item msgid="6303607119537134095">"WPA Personal"</item>
-    <item msgid="1977424472734732392">"WPA2 Personal"</item>
-    <item msgid="5185669984217684689">"WPA-EAP"</item>
-    <item msgid="8643206823103498303">"IEEE 802.1x"</item>
+    <item msgid="1687348101566181433">"WPA/WPA2 PSK"</item>
+    <item msgid="329777238762866787">"802.1x Enterprise"</item>
   </string-array>
   <string-array name="wifi_security_without_auto_entries">
     <item msgid="4402120432904877907">"Geen"</item>
     <item msgid="2329148995431627488">"WEP"</item>
-    <item msgid="2296204649410509235">"WPA Personal"</item>
-    <item msgid="8928468573279595315">"WPA2 Personal"</item>
-    <item msgid="8319241197948974314">"WPA-EAP"</item>
-    <item msgid="2222409752754955757">"IEEE 802.1x"</item>
+    <item msgid="6903317668294332381">"WPA/WPA2 PSK"</item>
+    <item msgid="7280821339307729710">"802.1x Enterprise"</item>
   </string-array>
   <string-array name="wifi_wep_type">
     <item msgid="1497433962958697183">"Automatisch"</item>
@@ -108,7 +107,7 @@
     <item msgid="1818786254010764570">"Geen"</item>
     <item msgid="6189918678874123056">"PAP"</item>
     <item msgid="1524112260493662517">"MSCHAP"</item>
-    <item msgid="1586767102985419413">"MSCHAP2"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
@@ -116,4 +115,8 @@
     <item msgid="3165868966179561687">"Melding"</item>
     <item msgid="6038758039030476855">"Trillen"</item>
   </string-array>
+    <!-- no translation found for apn_auth_entries:0 (3856896061242872146) -->
+    <!-- no translation found for apn_auth_entries:1 (5756844015743664882) -->
+    <!-- no translation found for apn_auth_entries:2 (535934025797984365) -->
+    <!-- no translation found for apn_auth_entries:3 (8383098660619805783) -->
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index fb0091019a4..6329a16fc4f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -15,6 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"Ja"</string>
+    <string name="no" msgid="6731231425810196216">"Nee"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Onbekend"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Radio inschakelen"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Radio uitschakelen"</string>
@@ -56,6 +58,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
     <string name="sdcard_setting" msgid="5922637503871474866">"SD-kaart"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Accustatus:"</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"Voedingsstekker:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Accuschaal:"</string>
     <string name="battery_info_level_label" msgid="8706526709307788737">"Accuniveau:"</string>
     <string name="battery_info_health_label" msgid="6416051542741886958">"Accustaat:"</string>
@@ -75,6 +78,11 @@
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"Ontladen"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Wordt niet opgeladen"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Volledig"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Niet aangesloten"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"Onbekend"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Onbekend"</string>
     <string name="battery_info_health_good" msgid="8070356565806711806">"Goed"</string>
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"Oververhitting"</string>
@@ -104,6 +112,12 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth-koppelingsverzoek"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Koppelingsverzoek"</string>
     <string name="bluetooth_notif_message" msgid="5381418499788668724">"Selecteer dit om te koppelen met "</string>
+    <string name="device_picker" msgid="8721012448931226323">"Apparaatkiezer van Bluetooth"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Machtigingsverzoek voor Bluetooth"</string>
+    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Een toepassing probeert Bluetooth in te schakelen. Wilt u dit toestaan?"</string>
+    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Een toepassing probeert uw telefoon <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar te maken voor andere Bluetooth-apparaten. Wilt u dit toestaan?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Een toepassing probeert Bluetooth in te schakelen en uw telefoon <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar te maken voor andere apparaten. Wilt u dit toestaan?"</string>
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Bluetooth inschakelen…"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Datum- en tijdinstellingen"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13:00 uur"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"01:00:00 PM"</string>
@@ -196,7 +210,8 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Alle draadloze verbindingen uitschakelen"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Draadloze verbindingen uitschakelen..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Draadloze verbindingen inschakelen..."</string>
-    <string name="radio_controls_title" msgid="8356991079873437337">"Draadloze bedieningselementen"</string>
+    <string name="radio_controls_title" msgid="5868688473587168882">"Draadloos en netwerken"</string>
+    <string name="wireless_networks_settings_title" msgid="149274247949769551">"Draadloze en netwerkinstellingen"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Wi-Fi, Bluetooth, vliegmodus, mobiele netwerken en VPN\'s beheren"</string>
     <string name="roaming" msgid="3596055926335478572">"Gegevensroaming"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Verbinding maken met gegevensservices tijdens roaming"</string>
@@ -219,20 +234,29 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Datumnotatie selecteren"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Alfabetisch sorteren"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sorteren op tijdzone"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"Beveiliging en locatie"</string>
+    <string name="security_settings_title" msgid="5168491784222013179">"Locatie en beveiliging"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"Locatie- en beveiligingsinstellingen"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Mijn locatie\', schermontgrendeling, SIM- en referentieopslagvergrendeling instellen"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"\'Mijn locatie\' instellen, scherm ontgrendelen, opslag van referenties vergrendelen"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Wachtwoorden"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth inschakelen"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth-instellingen"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth-instellingen"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Verbindingen beheren, apparaatnaam en vindbaarheid instellen"</string>
-    <string name="bluetooth_pin_entry" msgid="5627349871303455279">"Bluetooth-koppelingsverzoek"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth-koppelingsverzoek"</string>
     <string name="bluetooth_device_info" msgid="6644515376523965073">"Bluetooth-apparaatinfo"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="7551139612735632370">"<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_enter_pin_msg" msgid="856962526754150334">\n"Typ de PIN-code om te koppelen met \'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'. (Probeer 0000 of 1234.)"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Geef de toegangscode op om te koppelen met \'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Als u wilt koppelen met \'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\', moet u bevestigen dat deze toegangscode wordt weergegeven: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"wil koppelen."</string>
+    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Voer <xliff:g id="PASSKEY">%2$s</xliff:g> in op \'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\' om te koppelen."</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Koppelen"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Niet koppelen"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"Bluetooth-apparaat"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Let op"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Er is een probleem opgetreden bij het koppelen met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="6938408362011024289">"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_pairing_pin_error_message" msgid="6065697229258906937">"Er is een probleem opgetreden bij het koppelen met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, omdat de opgegeven PIN-code of toegangscode onjuist is."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"Kan niet communiceren met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Koppeling geweigerd door <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Er is een probleem opgetreden bij het verbinden met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
@@ -246,6 +270,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Verbinding maken met…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Media"</string>
     <string name="bluetooth_profile_headset" msgid="1874975688666658946">"Telefoon"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Overdracht"</string>
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Verbonden met audio van medium"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Verbonden met audio van telefoon"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Verbonden met audio van telefoon en medium"</string>
@@ -255,8 +280,11 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profielen"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Verbonden met audio van medium"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Verbonden met audio van telefoon"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Verbonden met server voor bestandsoverdracht"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Niet verbonden met server voor bestandsoverdracht"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Gebruiken voor audio van medium"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Gebruiken voor audio van telefoon"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Gebruiken voor bestandsoverdracht"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Wi-Fi inschakelen"</string>
@@ -273,17 +301,13 @@
     <string name="security" msgid="1040691896987225267">"Beveiliging"</string>
     <string name="wifi_security_open" msgid="3513305614048816607">"Open"</string>
     <string name="wifi_security_wep" msgid="7082604129842065776">"WEP"</string>
-    <string name="wifi_security_wpa" msgid="8980169410565477162">"WPA"</string>
-    <string name="wifi_security_wpa2" msgid="5780665935088930524">"WPA2"</string>
-    <string name="wifi_security_wpa_eap" msgid="7485687331651751101">"WPA-EAP"</string>
-    <string name="wifi_security_ieee8021x" msgid="8538687609878109005">"IEEE8021X"</string>
+    <string name="wifi_security_psk" msgid="3392399380570381452">"WPA/WPA2 PSK"</string>
+    <string name="wifi_security_eap" msgid="8309434150934969132">"Enterprise(802.1x)"</string>
     <string name="wifi_security_unknown" msgid="4564208312073060668">"Onbekend"</string>
     <string name="wifi_security_verbose_open" msgid="8117878112088901945">"open netwerk"</string>
     <string name="wifi_security_verbose_wep" msgid="9220757688700421508">"beveiligd met WEP"</string>
-    <string name="wifi_security_verbose_wpa" msgid="598697674252714455">"beveiligd met WPA"</string>
-    <string name="wifi_security_verbose_wpa2" msgid="4116236883347875722">"beveiligd met WPA2"</string>
-    <string name="wifi_security_verbose_wpa_eap" msgid="1984821646949066624">"beveiligd met WPA-EAP"</string>
-    <string name="wifi_security_verbose_ieee8021x" msgid="5552995793910186310">"beveiligd met IEEE 802.1x"</string>
+    <string name="wifi_security_verbose_psk" msgid="1110130025330416225">"beveiligd met WPA/WPA2 PSK"</string>
+    <string name="wifi_security_verbose_eap" msgid="586632662086063">"beveiligd met 802.1x EAP"</string>
     <string name="ip_address" msgid="850672263358989449">"IP-adres"</string>
     <string name="signal" msgid="1947969631626413228">"Signaalsterkte"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"Inschakelen..."</string>
@@ -302,14 +326,13 @@
     <string name="please_type_anonymous_identity" msgid="835061562079965048">"Anonieme identiteit"</string>
     <string name="please_select_client_certificate" msgid="2137906961594663234">"Klantcertificaat"</string>
     <string name="please_select_ca_certificate" msgid="5010815181914420677">"CA-certificaat"</string>
-    <string name="please_type_private_key_passwd" msgid="4077744679722504443">"Wachtwoord voor privésleutel"</string>
     <string name="please_type_passphrase" msgid="8256017704131522462">"Draadloos wachtwoord"</string>
     <string name="please_type_hex_key" msgid="8751224390407867551">"Hexadecimale WEP-sleutel (0-9, A-F)"</string>
     <string name="wifi_show_password" msgid="4235237470701732009">"Wachtwoord weergeven."</string>
     <string name="scan_wifi" msgid="2459901725350542606">"Scannen"</string>
     <string name="summary_not_in_range" msgid="3926674700733548684">"Niet binnen bereik"</string>
     <string name="summary_remembered" msgid="6079941090549401742">"onthouden"</string>
-    <string name="summary_connection_failed" msgid="7610394657613410489">"Verbinding mislukt. Selecteer dit om opnieuw te proberen."</string>
+    <string name="summary_connection_failed" msgid="2351885658101671413">"Verbinding mislukt. Raak aan om opnieuw te proberen"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-netwerken"</string>
     <string name="wifi_type_ssid" msgid="1326839657083292017">"SSID van netwerk"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Beveiliging"</string>
@@ -360,6 +383,7 @@
     <string name="status_disconnected" msgid="7561688569905126046">"Verbinding verbroken"</string>
     <string name="status_failed" msgid="610462050405904601">"Mislukt"</string>
     <string name="sound_and_display_settings" msgid="349770582993029003">"Geluid en weergave"</string>
+    <string name="sound_and_display_settings_title" msgid="5036144539683697330">"Geluid- en weergaveinstellingen"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Geluidsinstellingen"</string>
     <string name="sound_and_display_settings_summary" msgid="1433943789593286064">"Beltonen, meldingen, schermhelderheid instellen"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Stille modus"</string>
@@ -385,11 +409,14 @@
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"Hoorbare selectie"</string>
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Geluid afspelen bij schermselectie"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Geluid afspelen bij schermselectie"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Haptische feedback"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Trillen bij indrukken van functietoetsen en bij bepaalde UI-interactie"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Trillen bij indrukken van functietoetsen en bij bepaalde UI-interactie"</string>
     <string name="play_media_notification_sounds_enable_title" msgid="1008791464029179529">"SD-kaartmeldingen"</string>
     <string name="play_media_notification_sounds_enable_summary_on" msgid="7675466959375667370">"Geluid afspelen voor SD-kaartmeldingen"</string>
     <string name="play_media_notification_sounds_enable_summary_off" msgid="8672617597028744693">"Geluid afspelen voor SD-kaartmeldingen"</string>
-    <string name="sync_settings" msgid="2212736205476453234">"Gegevenssynchronisatie"</string>
-    <string name="sync_settings_summary" msgid="6480534906375217074">"Selecteren welke toepassingen worden gesynchroniseerd"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Accounts en synchronisatie"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"Accounts toevoegen of verwijderen en accountinstellingen wijzigen"</string>
     <string name="search_settings" msgid="1910951467596035063">"Zoeken"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Instellingen voor zoeken en zoekgeschiedenis beheren"</string>
     <string name="display_settings" msgid="3912042046350078328">"Instellingen weergeven"</string>
@@ -403,6 +430,7 @@
     <string name="brightness_summary" msgid="838917350127550703">"Helderheid van het scherm aanpassen"</string>
     <string name="screen_timeout" msgid="4882669461447531301">"Time-out scherm"</string>
     <string name="screen_timeout_summary" msgid="2905757633140605334">"De vertraging voor het automatisch uitschakelen van het scherm aanpassen"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"Automatische helderheid"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Instellingen SIM-kaartvergrendeling"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM-kaartvergrendeling instellen"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kaartvergrendeling"</string>
@@ -436,7 +464,8 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Telefoonnummer, signaal, enzovoort"</string>
-    <string name="storage_settings_title" msgid="8461515684514801302">"SD-kaart en telefoongeheugen"</string>
+    <string name="storage_settings" msgid="6681164315506788024">"SD-kaart en telefoongeheugen"</string>
+    <string name="storage_settings_title" msgid="5379463509034022773">"Instellingen voor SD-kaart en telefoongeheugen"</string>
     <string name="storage_settings_summary" msgid="9176693537325988610">"SD-kaart ontkoppelen, beschikbare opslagruimte weergeven"</string>
     <string name="status_number" msgid="5123197324870153205">"Mijn telefoonnummer"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
@@ -480,6 +509,16 @@
     <string name="apn_mms_port" msgid="4074188088199243040">"MMS-poort"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <!-- no translation found for apn_auth_type (6167205395676037015) -->
+    <skip />
+    <!-- no translation found for apn_auth_type_none (5069592676845549926) -->
+    <skip />
+    <!-- no translation found for apn_auth_type_pap (1666934536996033383) -->
+    <skip />
+    <!-- no translation found for apn_auth_type_chap (3369626283789068360) -->
+    <skip />
+    <!-- no translation found for apn_auth_type_pap_chap (9102343063036134541) -->
+    <skip />
     <string name="apn_type" msgid="469613123902220544">"APN-type"</string>
     <string name="menu_delete" msgid="6981294422841124659">"APN verwijderen"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nieuwe APN"</string>
@@ -518,12 +557,15 @@
     <string name="location_network_based" msgid="8815705866861993344">"Draadloze netwerken gebruiken"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Locatie in toepassingen (zoals Maps) bekijken via draadloze netwerken"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Locatie bepaald door Wi-Fi en/of mobiele netwerken"</string>
-    <string name="location_gps" msgid="375912731641377120">"GPS-satellieten inschakelen"</string>
-    <string name="location_street_level" msgid="5899941752252356344">"Locatie tot op straatniveau (uit om acculading te sparen)"</string>
+    <string name="location_gps" msgid="6296125378829097831">"GPS-satellieten gebruiken"</string>
+    <string name="location_street_level" msgid="6460740847018275745">"Locatie tot op straatniveau (uitschakelen om acculading te sparen)"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Locatie bepalen tot op straatniveau (meer stroom nodig en luchtweergave)"</string>
-    <string name="use_location_title" msgid="7585990952633568732">"Delen met Google"</string>
-    <string name="use_location_summary" msgid="4411467143899877395">"Toestaan dat Google locatie gebruikt voor verbeterde zoekfunctie en andere services"</string>
-    <string name="use_location_warning_message" msgid="5696732842038416151">"Toestaan dat Google locatie gebruikt voor verbeterde zoekresultaten en andere services"</string>
+    <string name="assisted_gps" msgid="4649317129586736885">"Ondersteunde GPS gebruiken"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Server gebruiken ter ondersteuning van GPS (uitschakelen om het netwerkgebruik te beperken)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Server gebruiken ter ondersteuning van GPS (uitschakelen om GPS-prestaties te verbeteren)"</string>
+    <string name="use_location_title" msgid="5447030582538504247">"\'Mijn locatie\' gebruiken"</string>
+    <string name="use_location_summary" msgid="1816849484040070431">"\'Mijn locatie\' gebruiken voor zoekresultaten en andere services van Google"</string>
+    <string name="use_location_warning_message" msgid="1420184860518262439">"Wilt u Google toestaan uw locatie te gebruiken voor verbeterde zoekresultaten en andere services?"</string>
     <string name="agree" msgid="6288718671527758326">"Akkoord"</string>
     <string name="disagree" msgid="6221069272309799230">"Niet akkoord"</string>
     <string name="about_settings" msgid="1743378368185371685">"Over de telefoon"</string>
@@ -538,6 +580,10 @@
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open-sourcelicenties"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Er is een probleem bij het laden van de licenties."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Laden..."</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Veiligheidsinformatie"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Veiligheidsinformatie"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Uw telefoon heeft geen verbinding met een gegevensservice. Als u deze informatie nu wilt weergeven, gaat u op een computer met internetverbinding naar %s."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Laden..."</string>
     <string name="lock_settings_title" msgid="5828348303971852121">"Ontgrendelingspatroon scherm"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Ontgrendelingspatroon wijzigen"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Opgeslagen patroon bevestigen"</string>
@@ -566,9 +612,9 @@
     <string name="skip_button_label" msgid="8680422740354436943">"Annuleren"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Volgende"</string>
     <string name="lock_title" msgid="4059246467204273930">"Uw telefoon beveiligen"</string>
-    <string name="lock_intro_message" msgid="5352897389718432077"><font size="17">"Beveilig uw telefoon tegen ongeoorloofd gebruik door het instellen van een persoonlijk schermontgrendelingspatroon. "\n<font height="17">\n</font><b>"1"</b>" Op het volgende scherm ziet u hoe een voorbeeldpatroon wordt getekend. "\n<font height="17">\n</font><b>"2"</b>" Teken uw eigen persoonlijke ontgrendelingspatroon als het voorbeeld is voltooid. U kunt verschillende patronen uitproberen, maar u moet minimaal vier punten met elkaar verbinden. "\n<font height="17">\n</font><b>"3"</b>" Teken uw patroon nogmaals ter bevestiging. "\n<font height="17">\n</font><b>"Bent u er klaar voor? Selecteer \'Volgende\'"</b>". "\n<font height="3">\n</font>"Als u uw telefoon niet wilt beveiligen, selecteert u \'Annuleren\'."</font></string>
+    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Beveilig uw telefoon tegen ongeoorloofd gebruik door het instellen van een persoonlijk schermdeblokkeringspatroon. "\n<font height="17">\n</font><b>"1"</b>" Op het volgende scherm ziet u hoe een voorbeeldpatroon wordt getekend. "\n<font height="17">\n</font><b>"2"</b>" Teken uw eigen persoonlijke deblokkeringspatroon als het voorbeeld is voltooid. U kunt verschillende patronen uitproberen, maar u moet minimaal vier punten met elkaar verbinden. "\n<font height="17">\n</font><b>"3"</b>" Teken uw patroon nogmaals ter bevestiging. "\n<font height="17">\n</font><b>"Bent u er klaar voor? Selecteer \'Volgende\'"</b>". "\n<font height="3">\n</font>"Als u uw telefoon niet wilt beveiligen, selecteert u \'Annuleren\'."</font></string>
     <string name="lock_example_title" msgid="8052305554017485410">"Voorbeeldpatroon"</string>
-    <string name="lock_example_message" msgid="7431982730914254881">"Verbind minimaal vier punten. "\n" "\n"Selecteer \'Volgende\' als u klaar bent om uw eigen patroon te tekenen."</string>
+    <string name="lock_example_message" msgid="1838650097090632706">"Verbind minimaal vier punten. "\n" "\n"Selecteer \'Volgende\' als u klaar bent om uw eigen patroon te tekenen."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Toepassingen beheren"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Geïnstalleerde toepassingen beheren en verwijderen"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Toepassingen"</string>
@@ -602,12 +648,12 @@
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Filteropties selecteren"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Alles"</string>
-    <string name="filter_apps_third_party" msgid="1096017647285183437">"Derden"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Gedownload"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Wordt uitgevoerd"</string>
     <string name="loading" msgid="3200408047793887917">"Laden..."</string>
     <string name="recompute_size" msgid="7722567982831691718">"Grootte opnieuw berekenen..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Verwijderen"</string>
-    <string name="clear_data_dlg_text" msgid="8796694785488630642">"Alle informatie die u in deze toepassing heeft opgeslagen, wordt definitief verwijderd."</string>
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"Alle gegevens van deze toepassing worden permanent verwijderd. Dit omvat alle bestanden, instellingen, accounts, databases, enzovoort."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Annuleren"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"Toepassing niet gevonden"</string>
@@ -620,9 +666,25 @@
     <string name="security_settings_desc" msgid="3116027624526915561">"Deze toepassing heeft toegang tot de volgende opties van uw telefoon:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Berekenen…"</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Kan grootte van pakket niet berekenen"</string>
-    <string name="empty_list_msg" msgid="1883660401486953588">"U heeft geen toepassingen van derden geïnstalleerd."</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"U heeft geen toepassingen van derden geïnstalleerd."</string>
     <string name="version_text" msgid="9189073826278676425">"versie <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
-    <string name="language_settings" msgid="2939555761536357092">"Landinstelling en tekst"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"Actieve services"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Services die momenteel actief zijn, weergeven en beheren"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"Opnieuw starten"</string>
+    <string name="no_running_services" msgid="6981216347270280598">"Er zijn geen actieve services"</string>
+    <string name="confirm_stop_service" msgid="5700448757318301681">"Service stopzetten?"</string>
+    <string name="confirm_stop_service_msg" msgid="1202118456282395730">"De service wordt niet langer uitgevoerd totdat deze opnieuw wordt gestart. Dit heeft mogelijk nadelige gevolgen voor de toepassing <xliff:g id="APPLICATION">%1$s</xliff:g>."</string>
+    <string name="confirm_stop_stop" msgid="7382363913280993331">"Stoppen"</string>
+    <string name="confirm_stop_cancel" msgid="206495326622692381">"Annuleren"</string>
+    <string name="service_started_by_app" msgid="8432097226392386802">"Gestart door toepassing: aanraken om te stoppen"</string>
+    <string name="service_client_name" msgid="2337664610975074717">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: aanraken om te beheren"</string>
+    <!-- no translation found for service_background_processes (5158600475629177758) -->
+    <skip />
+    <!-- no translation found for service_foreground_processes (4013890350284680796) -->
+    <skip />
+    <string name="service_process_name" msgid="8630408984456958400">"Proces: <xliff:g id="PROCESS">%1$s</xliff:g>"</string>
+    <string name="language_settings" msgid="502219872342167227">"Taal en toetsenbord"</string>
+    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Taal- en toetsenbordinstellingen"</string>
     <string name="language_settings_summary" msgid="595647729475399987">"Instellingen voor taal en regio, tekstinvoer en autocorrectieopties opgeven"</string>
     <string name="language_category" msgid="3391756582724541530">"Landinstelling"</string>
     <string name="text_category" msgid="6342540511465136739">"Tekstinstellingen"</string>
@@ -637,7 +699,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Druk twee keer op de spatiebalk om een punt (.) in te voegen"</string>
     <string name="show_password" msgid="2198798062604049206">"Zichtbare wachtwoorden"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Wachtwoord weergeven tijdens het typen"</string>
-    <string name="ime_security_warning" msgid="3458652708716006477">"Deze invoermethode verzamelt mogelijk alle tekst die u typt, inclusief persoonlijke gegevens zoals wachtwoorden en creditcardnummers. De methode is afkomstig uit de toepassing <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Deze invoermethode inschakelen?"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"Deze invoermethode verzamelt mogelijk alle tekst die u typt, inclusief persoonlijke gegevens zoals wachtwoorden en creditcardnummers. De methode is afkomstig uit de toepassing <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Deze invoermethode inschakelen?"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Gebruikerswoordenboek"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"Gebruikerswoordenboek"</string>
     <string name="user_dict_settings_summary" msgid="2460427065601355471">"Woorden toevoegen en verwijderen"</string>
@@ -665,7 +727,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Tekstinvoer"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Opties voor tekstinvoer beheren"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Instellingen voor <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="4919680715154885028">"Instellingen voor schermtoetsenbord"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Instellingen voor schermtoetsenbord"</string>
     <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Apparaattoetsenbord"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Instellingen voor ingebouwd toetsenbord"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Ontwikkeling"</string>
@@ -676,11 +738,11 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Scherm gaat nooit uit tijdens het opladen"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Neplocaties toestaan"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Neplocaties toestaan"</string>
-    <string name="adb_warning_title" msgid="1756027479229533250">"USB-foutopsporing inschakelen?"</string>
+    <string name="adb_warning_title" msgid="6234463310896563253">"USB-foutopsporing toestaan?"</string>
     <string name="adb_warning_message" msgid="5352555112049663033">"USB-foutopsporing is alleen bedoeld voor ontwikkelingsdoeleinden. Het kan worden gebruikt om gegevens te kopiëren tussen uw computer en uw apparaat, om toepassingen zonder melding op uw apparaat te installeren en om loggegevens te lezen."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Gadget kiezen"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Widget kiezen"</string>
-    <string name="battery_history_details_for" msgid="5189636461798594740">"Details voor UID %d"</string>
+    <string name="battery_history_details_for" msgid="5924639922153109669">"Details voor UID <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="battery_history_uid" msgid="1016606150528436298">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage" msgid="8010852371665217020">"Netwerkgebruiksdetails voor <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
     <string name="battery_history_bytes_received" msgid="980307569180518302">"Bytes ontvangen: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
@@ -716,12 +778,13 @@
     <string name="app_name_label" msgid="2000949925256858308">"Toepassing"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"Aantal"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Gebruikstijd"</string>
-    <string name="accessibility_settings_title" msgid="4239640930601071058">"Toegankelijkheid"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"Toegankelijkheid"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Instellingen voor toegankelijkheid"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Toegankelijkheidsopties beheren"</string>
     <string name="toggle_accessibility_title" msgid="650839277066574497">"Toegankelijkheid"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Toegankelijkheidsservices"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Geen geïnstalleerde toegankelijkheidsservices."</string>
-    <string name="accessibility_service_security_warning" msgid="8386156287296967181">"Deze toegankelijkheidsservice verzamelt mogelijk alle tekst die u typt, inclusief persoonlijke gegevens en creditcardnummers, maar geen wachtwoorden. De service kan ook uw interacties met de gebruikersinterface vastleggen. De service is afkomstig uit de toepassing <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Deze toegankelijkheidsservice inschakelen?"</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Deze toegankelijkheidsservice verzamelt mogelijk alle tekst die u typt, inclusief persoonlijke gegevens en creditcardnummers, maar geen wachtwoorden. De service kan ook uw interacties met de gebruikersinterface vastleggen. De service is afkomstig uit de toepassing <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Deze toegankelijkheidsservice inschakelen?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Toegankelijkheid uitschakelen?"</string>
     <string name="power_usage_summary_title" msgid="5180282911164282324">"Accugebruik"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Waarvoor de accu is gebruikt"</string>
@@ -733,7 +796,7 @@
     <string name="awake" msgid="387122265874485088">"Stand-bytijd apparaat"</string>
     <string name="wifi_on_time" msgid="4630925382578609056">"Tijd Wi-Fi aan"</string>
     <string name="bluetooth_on_time" msgid="4478515071957280711">"Tijd Wi-Fi aan"</string>
-    <string name="usage_name_percent" msgid="1899151069711662289">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="PERCENT">%2$s</xliff:g>%%"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Details over accugebruik"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Gebruiksdetails"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Energieverbruik aanpassen"</string>
@@ -769,7 +832,7 @@
     <string name="battery_desc_wifi" msgid="1702486494565080431">"Accu gebruikt door Wi-Fi"</string>
     <string name="battery_sugg_wifi" msgid="7542345142282261691">"Schakel Wi-Fi uit wanneer u dit niet gebruikt of waar dit niet beschikbaar is"</string>
     <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Accu gebruikt door Bluetooth"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="144393178427277439">"Schakel Bluetooth uit wanneer u dit niet gebruikt"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Schakel Bluetooth uit wanneer u deze functie niet gebruikt"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Probeer verbinding te maken met een ander Bluetooth-apparaat"</string>
     <string name="battery_desc_apps" msgid="8123202939321333639">"Accu gebruikt door actieve toepassingen"</string>
     <string name="battery_sugg_apps_info" msgid="6065882899391322442">"De toepassing stoppen of verwijderen"</string>
@@ -781,9 +844,9 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Vernieuwen"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android-besturingssysteem"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
-    <string name="tts_settings" msgid="6454363854545277027">"Spraaksynthese"</string>
+    <string name="tts_settings" msgid="3348626948015962987">"Tekst-naar-spraak"</string>
     <string name="tts_settings_summary" msgid="2627715231944602766">"Opties voor tekst-naar-spraak instellen"</string>
-    <string name="tts_settings_title" msgid="5064947197040356736">"Bedieningselementen voor spraaksynthesizer"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Instellingen voor tekst-naar-spraak"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Altijd mijn instellingen gebruiken"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Onderstaande standaardinstellingen overschrijven toepassingsinstellingen"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Standaardinstellingen"</string>
@@ -801,8 +864,11 @@
     <string name="tts_demo" msgid="405357591189935876">"Dit is een voorbeeld van spraaksynthese."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Uw instellingen zijn gewijzigd. Dit is een voorbeeld van hoe ze klinken."</string>
     <string name="gadget_title" msgid="7455548605888590466">"Energiebeheer"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Wi-Fi-instelling bijwerken"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth-instelling bijwerken"</string>
+    <string name="credential_installer_activity_title" msgid="7600661521831762521">"Installatieprogramma voor referenties"</string>
     <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN-instellingen"</string>
-    <string name="vpn_connect_to" msgid="9040615733700098831">"Verbinden met %s"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"Verbinding maken met <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="vpn_username_colon" msgid="7854930370861306247">"Gebruikersnaam:"</string>
     <string name="vpn_password_colon" msgid="5716278710848606626">"Wachtwoord:"</string>
     <string name="vpn_a_username" msgid="6664733641993968692">"een gebruikersnaam"</string>
@@ -820,9 +886,9 @@
     <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Verbinding met netwerk verbreken"</string>
     <string name="vpn_menu_edit" msgid="4526245173583195618">"Netwerk bewerken"</string>
     <string name="vpn_menu_delete" msgid="3326527392609513129">"Netwerk verwijderen"</string>
-    <string name="vpn_error_miss_entering" msgid="1467455143582547499">"U moet \'%s\' invoeren."</string>
-    <string name="vpn_error_miss_selecting" msgid="953436717902387192">"U moet \'%s\' selecteren."</string>
-    <string name="vpn_error_duplicate_name" msgid="2786397299628471911">"De VPN-naam \'%s\' bestaat al. Geef een andere naam op."</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"U moet \'<xliff:g id="CODE">%s</xliff:g>\' invoeren."</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"U moet \'<xliff:g id="OPTION">%s</xliff:g>\' selecteren."</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"De VPN-naam \'<xliff:g id="NAME">%s</xliff:g>\' bestaat al. Geef een andere naam op."</string>
     <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Weet u zeker dat u dit VPN wilt verwijderen?"</string>
     <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Weet u zeker dat u dit profiel niet wilt maken?"</string>
     <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Weet u zeker dat u de wijzigingen in dit profiel wilt annuleren?"</string>
@@ -833,10 +899,12 @@
     <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Een of meer geheimen ontbreken in deze VPN-configuratie. Wilt u uw geheime instelling controleren?"</string>
     <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"De door u ingevoerde gebruikersnaam of het door u ingevoerde wachtwoord is onjuist. Wilt u het opnieuw proberen?"</string>
     <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Serververbinding verbroken. De gebruikersnaam of het wachtwoord dat u heeft ingevoerd, is onjuist. Wilt u het opnieuw proberen?"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"De server is vastgelopen. Wellicht bevindt u zich achter een firewall die een verbinding met de server blokkeert. Wilt u het opnieuw proberen?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Het contact met de server is mislukt. De server gaat wellicht niet akkoord met uw optie voor codering. Wilt u de instelling voor de codering controleren?"</string>
     <string name="vpn_type_title" msgid="6392933604218676224">"VPN toevoegen"</string>
     <string name="vpn_add_new_vpn" msgid="5438260689052714550">"VPN toevoegen"</string>
-    <string name="vpn_edit_title_add" msgid="2550661826320709266">"VPN \'%s\' toevoegen"</string>
-    <string name="vpn_edit_title_edit" msgid="1769999313158207723">"Details voor %"</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"VPN \'<xliff:g id="NAME">%s</xliff:g>\' toevoegen"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Details voor <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="vpns" msgid="3148141862835492816">"VPN\'s"</string>
     <string name="vpn_connecting" msgid="8039521381692090116">"Verbinding maken..."</string>
     <string name="vpn_disconnecting" msgid="7748050200708257066">"Verbinding verbreken..."</string>
@@ -844,8 +912,8 @@
     <string name="vpn_connect_hint" msgid="7442898962925875181">"Verbinding maken met netwerk"</string>
     <string name="vpn_name" msgid="1550918148476193076">"VPN-naam"</string>
     <string name="vpn_a_name" msgid="8445736942405283509">"een VPN-naam"</string>
-    <string name="vpn_profile_added" msgid="2157095890825215726">"%s is toegevoegd"</string>
-    <string name="vpn_profile_replaced" msgid="384234123486734768">"Er zijn wijzigingen aangebracht in %s"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"\'<xliff:g id="NAME">%s</xliff:g>\' is toegevoegd"</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"Er zijn wijzigingen aangebracht in \'<xliff:g id="NAME">%s</xliff:g>\'"</string>
     <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Gebruikerscertificaat instellen"</string>
     <string name="vpn_user_certificate" msgid="949322691686938888">"Gebruikerscertificaat"</string>
     <string name="vpn_a_user_certificate" msgid="8943983437956898649">"een gebruikerscertificaat"</string>
@@ -866,53 +934,79 @@
     <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Naam VPN-server"</string>
     <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS-zoekdomeinen"</string>
     <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS-zoekdomeinen"</string>
-    <string name="vpn_field_is_set" msgid="1880980734721258127">"%s is ingesteld"</string>
-    <string name="vpn_field_not_set" msgid="6827205815004809490">"%s niet ingesteld"</string>
-    <string name="vpn_field_not_set_optional" msgid="8665901697706781015">"%s niet ingesteld (optioneel)"</string>
-    <string name="vpn_enable_field" msgid="3348948489989523325">"%s inschakelen"</string>
-    <string name="vpn_disable_field" msgid="2286966253789266389">"%s uitschakelen"</string>
-    <string name="vpn_is_enabled" msgid="5128973727115662815">"%s is ingeschakeld"</string>
-    <string name="vpn_is_disabled" msgid="8028085699769751756">"%s is uitgeschakeld"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> is ingesteld"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> is niet ingesteld"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> is niet ingesteld (optioneel)"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"<xliff:g id="OPTION">%s</xliff:g> inschakelen"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"\'<xliff:g id="OPTION">%s</xliff:g>\' uitschakelen"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"\'<xliff:g id="OPTION">%s</xliff:g>\' is ingeschakeld"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"\'<xliff:g id="OPTION">%s</xliff:g>\' is uitgeschakeld"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"VPN-instellingen"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"VPN\'s (Virtual Private Networks) instellen en beheren"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(ongewijzigd)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(niet ingesteld)"</string>
-    <string name="cstor_settings_category" msgid="2284299080682591107">"Opslag van referenties"</string>
-    <string name="cstor_access_title" msgid="1739505390736236717">"Beveiligingsreferenties gebruiken"</string>
-    <string name="cstor_access_summary" msgid="4512681868217546677">"Toepassingen mogen veilige certificaten en andere referenties openen"</string>
-    <string name="cstor_access_dialog_title" msgid="3024256293191879190">"Voer het wachtwoord in"</string>
-    <string name="cstor_access_dialog_hint_from_action" msgid="679746865623760961">"Geef het wachtwoord voor de opslag van referenties op."</string>
-    <string name="cstor_set_passwd_title" msgid="6156763762703061470">"Wachtwoord instellen"</string>
-    <string name="cstor_set_passwd_summary" msgid="5248560429856597398">"Het wachtwoord voor de opslag van referenties instellen"</string>
-    <string name="cstor_set_passwd_dialog_title" msgid="4071157542842979977">"Wachtwoord instellen"</string>
-    <string name="cstor_reset_title" msgid="6001600882136794382">"Opslag wissen"</string>
-    <string name="cstor_reset_summary" msgid="7509525030771504833">"Referentieopslag voor inhoud wissen en wachtwoord opnieuw instellen"</string>
-    <string name="cstor_reset_hint" msgid="5331632794451859788">"Weet u zeker dat u alle referenties wilt verwijderen en het wachtwoord voor de opslag van referenties opnieuw wilt instellen?"</string>
-    <string name="cstor_name_credential_dialog_title" msgid="1723509156126180662">"De naam voor het certificaat opgeven"</string>
-    <string name="cstor_credential_name" msgid="2958936431813760259">"Certificaatnaam:"</string>
-    <string name="cstor_credential_password" msgid="7187440553141199409">"Wachtwoord om het certificaat uit te pakken:"</string>
-    <string name="cstor_credential_info" msgid="6097346149400207440">"Certificaatgegevens:"</string>
-    <string name="cstor_name_credential_hint" msgid="6889198058976515785">"De naam mag alleen letters en cijfers bevatten."</string>
-    <string name="cstor_old_password" msgid="979282118063084561">"Huidig wachtwoord:"</string>
-    <string name="cstor_new_password" msgid="6218562692435670047">"Nieuw wachtwoord:"</string>
-    <string name="cstor_confirm_password" msgid="8996028123356342466">"Nieuw wachtwoord bevestigen:"</string>
-    <string name="cstor_first_time_hint" msgid="1831593416099224962">"Stel een wachtwoord in voor de opslag van referenties."</string>
-    <string name="cstor_first_time_hint_from_action" msgid="4690937025845780557">"Stel een wachtwoord in voor de opslag van referenties."</string>
-    <string name="cstor_password_error" msgid="2917326097260402464">"Voer het juiste wachtwoord in."</string>
-    <string name="cstor_password_error_reset_warning" msgid="3336370539045905953">"Voer het juiste wachtwoord in. U kunt nog één keer proberen het juiste wachtwoord in te voeren voordat de opgeslagen referenties worden verwijderd."</string>
-    <string name="cstor_password_error_reset_warning_plural" msgid="6209069679269017200">"Voer het juiste wachtwoord in. U kunt nog %d keer proberen om het juiste wachtwoord in te voeren voordat de opgeslagen referenties worden verwijderd."</string>
-    <string name="cstor_passwords_error" msgid="956773958408751155">"De wachtwoorden komen niet overeen."</string>
-    <string name="cstor_passwords_empty_error" msgid="6062539742626760734">"U moet een wachtwoord invoeren en bevestigen."</string>
-    <string name="cstor_password_empty_error" msgid="7249632576906961482">"Voer het wachtwoord in."</string>
-    <string name="cstor_password_verification_error" msgid="8553930704493511389">"Voer het wachtwoord opnieuw in. Het wachtwoord moet ten minste 8 tekens bevatten en mag geen spaties bevatten."</string>
-    <string name="cstor_name_empty_error" msgid="7499971191993770322">"Voer een naam in."</string>
-    <string name="cstor_name_char_error" msgid="8048089317968192516">"Voer een naam in die alleen uit letters en cijfers bestaat."</string>
-    <string name="cstor_storage_error" msgid="7140697503172458161">"Kan het certificaat niet opslaan. Klik op \'OK\' om het opnieuw te proberen."</string>
-    <string name="cstor_unable_to_save_cert" msgid="1631402544447196406">"Kan het certificaat niet opslaan. De opslag van referenties is niet ingeschakeld of niet correct geïnitialiseerd."</string>
-    <string name="cstor_cert_not_saved" msgid="6318149789449538491">"Het certificaat is niet opgeslagen."</string>
-    <string name="cstor_is_reset" msgid="449870501126790589">"De opslag van referenties is gewist."</string>
-    <string name="cstor_is_enabled" msgid="4054049098081482785">"De opslag van referenties is ingeschakeld."</string>
-    <string name="cstor_is_added" msgid="794788474010251572">"%s is toegevoegd."</string>
+    <!-- no translation found for credentials_category (8536992056377271234) -->
+    <skip />
+    <!-- no translation found for credentials_access (4843187230913860492) -->
+    <skip />
+    <!-- no translation found for credentials_access_summary (319662078718574168) -->
+    <skip />
+    <!-- no translation found for credentials_unlock (1463040326264133844) -->
+    <skip />
+    <!-- no translation found for credentials_unlock_hint (594679530407918031) -->
+    <skip />
+    <!-- no translation found for credentials_install_certificates (177337517568022236) -->
+    <skip />
+    <!-- no translation found for credentials_install_certificates_summary (7737001268684193093) -->
+    <skip />
+    <!-- no translation found for credentials_set_password (9104473585811899989) -->
+    <skip />
+    <!-- no translation found for credentials_set_password_summary (8287876917562085701) -->
+    <skip />
+    <!-- no translation found for credentials_reset (9170150870552453457) -->
+    <skip />
+    <!-- no translation found for credentials_reset_summary (1530388094693731636) -->
+    <skip />
+    <!-- no translation found for credentials_reset_hint (819990295796804516) -->
+    <skip />
+    <!-- no translation found for credentials_old_password (7553393815538684028) -->
+    <skip />
+    <!-- no translation found for credentials_new_password (267487774686796938) -->
+    <skip />
+    <!-- no translation found for credentials_confirm_password (4732250000633424345) -->
+    <skip />
+    <!-- no translation found for credentials_first_time_hint (1567821077545346039) -->
+    <skip />
+    <!-- no translation found for credentials_wrong_password (7525192410790152041) -->
+    <skip />
+    <!-- no translation found for credentials_reset_warning (6392481296673345268) -->
+    <skip />
+    <!-- no translation found for credentials_reset_warning_plural (454828369803055270) -->
+    <skip />
+    <!-- no translation found for credentials_passwords_mismatch (5288565139590031733) -->
+    <skip />
+    <!-- no translation found for credentials_passwords_empty (8647631321684363549) -->
+    <skip />
+    <!-- no translation found for credentials_password_empty (8292138152983330473) -->
+    <skip />
+    <!-- no translation found for credentials_password_too_short (7502749986405522663) -->
+    <skip />
+    <!-- no translation found for credentials_erased (7700309135582200849) -->
+    <skip />
+    <!-- no translation found for credentials_enabled (7588607413349978930) -->
+    <skip />
+    <!-- no translation found for credentials_disabled (7453188089059045380) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Toon voor noodoproep"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Gedrag bij noodoproepen instellen"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Privacy"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Privacyinstellingen"</string>
+    <string name="location_section_title" msgid="6072558684044939786">"Locatie"</string>
+    <string name="settings_section_title" msgid="7413252428447723032">"Instellingen"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Persoonlijke gegevens"</string>
+    <string name="backup_settings_title" msgid="2968262658155327829">"Back-up maken van mijn instellingen"</string>
+    <string name="backup_erase_dialog_title" msgid="6028429904055779443">"Back-up van instellingen"</string>
+    <string name="backup_erase_dialog_message" msgid="9096433810456900531">"Weet u zeker dat het maken van back-ups van uw instellingen wilt stoppen en alle kopieën op Google-servers wilt wissen?"</string>
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index f4c53439a9c..8b7c8d9a44a 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -24,13 +24,23 @@
     <item msgid="5345178126174698955">"Pacyfik"</item>
     <item msgid="8392017019801393511">"Wszystkie"</item>
   </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"Brak animacji"</item>
+    <item msgid="6291186755504776720">"Niektóre animacje"</item>
+    <item msgid="3856065399819979491">"Wszystkie animacje"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"Brak wyświetlanych animacji okien"</item>
+    <item msgid="4460915688877708508">"Niektóre animacje okien są wyświetlane"</item>
+    <item msgid="488968798204105119">"Wszystkie animacje okien są wyświetlane"</item>
+  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 sekund"</item>
     <item msgid="8881760709354815449">"30 sekund"</item>
     <item msgid="7589406073232279088">"1 minuta"</item>
     <item msgid="7001195990902244174">"2 minuty"</item>
     <item msgid="5721688686241190620">"10 minut"</item>
-    <item msgid="1781492122915870416">"Nigdy nie wygaszaj"</item>
+    <item msgid="7156442995039264948">"30 minut"</item>
   </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Bardzo wolno"</item>
@@ -58,18 +68,14 @@
     <item msgid="2923732046112398627">"Automatycznie"</item>
     <item msgid="5434666299123318296">"Brak"</item>
     <item msgid="3159594845889645948">"WEP"</item>
-    <item msgid="6303607119537134095">"WPA personal"</item>
-    <item msgid="1977424472734732392">"WPA2 personal"</item>
-    <item msgid="5185669984217684689">"WPA-EAP"</item>
-    <item msgid="8643206823103498303">"IEEE 802.1x"</item>
+    <item msgid="1687348101566181433">"WPA/WPA2 PSK"</item>
+    <item msgid="329777238762866787">"802.1x Enterprise"</item>
   </string-array>
   <string-array name="wifi_security_without_auto_entries">
     <item msgid="4402120432904877907">"Brak"</item>
     <item msgid="2329148995431627488">"WEP"</item>
-    <item msgid="2296204649410509235">"WPA personal"</item>
-    <item msgid="8928468573279595315">"WPA2 personal"</item>
-    <item msgid="8319241197948974314">"WPA-EAP"</item>
-    <item msgid="2222409752754955757">"IEEE 802.1x"</item>
+    <item msgid="6903317668294332381">"WPA/WPA2 PSK"</item>
+    <item msgid="7280821339307729710">"802.1x Enterprise"</item>
   </string-array>
   <string-array name="wifi_wep_type">
     <item msgid="1497433962958697183">"Automatycznie"</item>
@@ -108,7 +114,7 @@
     <item msgid="1818786254010764570">"Brak"</item>
     <item msgid="6189918678874123056">"PAP"</item>
     <item msgid="1524112260493662517">"MSCHAP"</item>
-    <item msgid="1586767102985419413">"MSCHAP2"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
@@ -116,4 +122,10 @@
     <item msgid="3165868966179561687">"Alert"</item>
     <item msgid="6038758039030476855">"Wibracje"</item>
   </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"Brak"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP lub CHAP"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 9624d6571f4..906ee611a38 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -15,6 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"Tak"</string>
+    <string name="no" msgid="6731231425810196216">"Nie"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nieznany"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Włącz radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Wyłącz radio"</string>
@@ -56,6 +58,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
     <string name="sdcard_setting" msgid="5922637503871474866">"Karta SD"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Stan baterii:"</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"Podłączone zasilanie:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Poziom baterii:"</string>
     <string name="battery_info_level_label" msgid="8706526709307788737">"Poziom naładowania baterii:"</string>
     <string name="battery_info_health_label" msgid="6416051542741886958">"Poziom baterii:"</string>
@@ -75,6 +78,11 @@
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"Rozładowywanie"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nie ładuje"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Pełna"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Odłączone"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"Zasilacz"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"Zasilacz i USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"Nieznane"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Nieznane"</string>
     <string name="battery_info_health_good" msgid="8070356565806711806">"Dobry"</string>
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"Przegrzanie"</string>
@@ -104,6 +112,12 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Żądanie parowania Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Żądanie parowania"</string>
     <string name="bluetooth_notif_message" msgid="5381418499788668724">"Zaznacz, aby sparować "</string>
+    <string name="device_picker" msgid="8721012448931226323">"Selektor urządzenia Bluetooth"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Prośba o pozwolenie na włączenie modułu Bluetooth"</string>
+    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Aplikacja w telefonie prosi o pozwolenie na włączenie modułu Bluetooth. Czy chcesz na to zezwolić?"</string>
+    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Aplikacja w telefonie prosi o pozwolenie na ustawienie telefonu jako wykrywalnego przez inne urządzenia Bluetooth na czas <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Czy chcesz na to zezwolić?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Aplikacja w telefonie prosi o pozwolenie na włączenie modułu Bluetooth i ustawienie telefonu jako wykrywalnego przez inne urządzenia na czas <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Czy chcesz na to zezwolić?"</string>
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Trwa włączanie modułu Bluetooth..."</string>
     <string name="date_and_time" msgid="4114084177056654663">"Ustawienia daty i godziny"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 (po południu)"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -196,7 +210,8 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Wyłącz wszystkie połączenia bezprzewodowe"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Wyłączanie połączeń bezprzewodowych..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Włączanie połączeń bezprzewodowych..."</string>
-    <string name="radio_controls_title" msgid="8356991079873437337">"Opcje bezprzewodowe"</string>
+    <string name="radio_controls_title" msgid="5868688473587168882">"Sieci zwykłe i bezprzewodowe"</string>
+    <string name="wireless_networks_settings_title" msgid="149274247949769551">"Ustawienia sieci zwykłej i bezprzewodowej"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Zarządzaj połączeniami Wi-Fi i Bluetooth, trybem samolotowym, sieciami komórkowymi i VPN."</string>
     <string name="roaming" msgid="3596055926335478572">"Dane w roamingu"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Połącz z usługami transmisji danych w roamingu"</string>
@@ -219,20 +234,29 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Wybierz format daty"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sortuj alfabetycznie"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sortuj według strefy czasowej"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"Lokalizacja i blokady"</string>
+    <string name="security_settings_title" msgid="5168491784222013179">"Lokalizacja i zabezpieczenia"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"Ustawienia lokalizacji i zabezpieczeń"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę karty SIM, blokadę magazynu danych logowania."</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę magazynu danych uwierzytelniania"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Hasła"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Włącz Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Ustawienia Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Ustawienia Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Zarządzaj połączeniami, ustaw nazwę urządzenia i możliwość wykrycia"</string>
-    <string name="bluetooth_pin_entry" msgid="5627349871303455279">"Żądanie parowania Bluetooth"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Prośba o utworzenie powiązania Bluetooth"</string>
     <string name="bluetooth_device_info" msgid="6644515376523965073">"Informacje o urządzeniu Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="7551139612735632370">"<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_enter_pin_msg" msgid="856962526754150334">\n"Wpisz kod PIN, aby utworzyć powiązanie z urządzeniem „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”. (Spróbuj użyć kodu 0000 lub 1234)."</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Wpisz klucz, aby utworzyć powiązanie z urządzeniem „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Aby powiązać z „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”, potwierdź, że przedstawiony został klucz: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"chce utworzyć powiązanie."</string>
+    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Wprowadź klucz <xliff:g id="PASSKEY">%2$s</xliff:g> w urządzeniu „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”, aby utworzyć powiązanie."</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Powiąż"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Nie wykonuj powiązania"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"urządzenie Bluetooth"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Uwaga"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Wystąpił problem podczas parowania z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="6938408362011024289">"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_pairing_pin_error_message" msgid="6065697229258906937">"Wystąpił problem podczas tworzenia powiązania z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, ponieważ kod PIN lub klucz jest niepoprawny."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"Nie można nawiązać połączenia z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Powiązanie odrzucone przez urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Wystąpił problem podczas łączenia z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -246,6 +270,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Połącz z siecią…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Multimedia"</string>
     <string name="bluetooth_profile_headset" msgid="1874975688666658946">"Telefon"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Transfer"</string>
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Połączono z funkcją audio multimediów"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Połączono z funkcją audio telefonu"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Połączono z funkcją audio telefonu i multimediów"</string>
@@ -255,8 +280,11 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profile"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Połączono z funkcją audio multimediów"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Połączono z funkcją audio telefonu"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Połączono z serwerem transferu plików"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Brak połączenia z serwerem transferu plików"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Użyj dla funkcji audio multimediów"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Użyj dla funkcji audio telefonu"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Użyj do transferu plików"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Włącz Wi-Fi"</string>
@@ -273,17 +301,13 @@
     <string name="security" msgid="1040691896987225267">"Zabezpieczenia"</string>
     <string name="wifi_security_open" msgid="3513305614048816607">"Otwarta"</string>
     <string name="wifi_security_wep" msgid="7082604129842065776">"WEP"</string>
-    <string name="wifi_security_wpa" msgid="8980169410565477162">"WPA"</string>
-    <string name="wifi_security_wpa2" msgid="5780665935088930524">"WPA2"</string>
-    <string name="wifi_security_wpa_eap" msgid="7485687331651751101">"WPA-EAP"</string>
-    <string name="wifi_security_ieee8021x" msgid="8538687609878109005">"IEEE8021X"</string>
+    <string name="wifi_security_psk" msgid="3392399380570381452">"WPA/WPA2 PSK"</string>
+    <string name="wifi_security_eap" msgid="8309434150934969132">"Enterprise (802.1x)"</string>
     <string name="wifi_security_unknown" msgid="4564208312073060668">"Nieznane"</string>
     <string name="wifi_security_verbose_open" msgid="8117878112088901945">"sieć otwarta"</string>
     <string name="wifi_security_verbose_wep" msgid="9220757688700421508">"zabezpieczona protokołem WEP"</string>
-    <string name="wifi_security_verbose_wpa" msgid="598697674252714455">"zabezpieczone protokołem WPA"</string>
-    <string name="wifi_security_verbose_wpa2" msgid="4116236883347875722">"zabezpieczone protokołem WPA2"</string>
-    <string name="wifi_security_verbose_wpa_eap" msgid="1984821646949066624">"zabezpieczone protokołem WPA-EAP"</string>
-    <string name="wifi_security_verbose_ieee8021x" msgid="5552995793910186310">"zabezpieczone protokołem IEEE 802.1x"</string>
+    <string name="wifi_security_verbose_psk" msgid="1110130025330416225">"zabezpieczona za pomocą protokołu WPA/WPA2 PSK"</string>
+    <string name="wifi_security_verbose_eap" msgid="586632662086063">"zabezpieczona za pomocą protokołu 802.1x EAP"</string>
     <string name="ip_address" msgid="850672263358989449">"Adres IP"</string>
     <string name="signal" msgid="1947969631626413228">"Siła sygnału"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"Włączanie..."</string>
@@ -302,14 +326,13 @@
     <string name="please_type_anonymous_identity" msgid="835061562079965048">"Tożsamość anonimowa"</string>
     <string name="please_select_client_certificate" msgid="2137906961594663234">"Certyfikat klienta"</string>
     <string name="please_select_ca_certificate" msgid="5010815181914420677">"Certyfikat urzędu certyfikacji"</string>
-    <string name="please_type_private_key_passwd" msgid="4077744679722504443">"Hasło do klucza prywatnego"</string>
     <string name="please_type_passphrase" msgid="8256017704131522462">"Hasło sieci bezprzewodowej"</string>
     <string name="please_type_hex_key" msgid="8751224390407867551">"Klucz szesnastkowy WEP (0–9, A–F)"</string>
     <string name="wifi_show_password" msgid="4235237470701732009">"Pokaż hasło."</string>
     <string name="scan_wifi" msgid="2459901725350542606">"Przeszukaj"</string>
     <string name="summary_not_in_range" msgid="3926674700733548684">"Poza zasięgiem"</string>
     <string name="summary_remembered" msgid="6079941090549401742">"zapamiętane"</string>
-    <string name="summary_connection_failed" msgid="7610394657613410489">"Połączenie nieudane. Wybierz, aby spróbować ponownie"</string>
+    <string name="summary_connection_failed" msgid="2351885658101671413">"Połączenie nie powiodło się. Dotknij, aby spróbować ponownie."</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Sieci Wi-Fi"</string>
     <string name="wifi_type_ssid" msgid="1326839657083292017">"Identyfikator SSID sieci"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Zabezpieczenia"</string>
@@ -360,6 +383,7 @@
     <string name="status_disconnected" msgid="7561688569905126046">"Rozłączona"</string>
     <string name="status_failed" msgid="610462050405904601">"Niepowodzenie"</string>
     <string name="sound_and_display_settings" msgid="349770582993029003">"Dźwięk i wyświetlacz"</string>
+    <string name="sound_and_display_settings_title" msgid="5036144539683697330">"Ustawienia dźwięku i wyświetlania"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Ustawienia dźwięku"</string>
     <string name="sound_and_display_settings_summary" msgid="1433943789593286064">"Ustaw dzwonki, powiadomienia, jasność ekranu"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Tryb cichy"</string>
@@ -385,11 +409,14 @@
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"Dotyk ekranu"</string>
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Odtwarzaj dźwięk podczas wybierania opcji na ekranie"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Odtwarzaj dźwięk podczas wybierania opcji na ekranie"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Dotykowe sprzężenie zwrotne"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Wibracje podczas naciskania przycisków i wykonywania określonych działań w interfejsie użytkownika"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Wibracje podczas naciskania przycisków i wykonywania określonych działań w interfejsie użytkownika"</string>
     <string name="play_media_notification_sounds_enable_title" msgid="1008791464029179529">"Powiadomienia karty SD"</string>
     <string name="play_media_notification_sounds_enable_summary_on" msgid="7675466959375667370">"Odtwarzaj dźwięk dla powiadomień o karcie SD"</string>
     <string name="play_media_notification_sounds_enable_summary_off" msgid="8672617597028744693">"Odtwarzaj dźwięk dla powiadomień o karcie SD"</string>
-    <string name="sync_settings" msgid="2212736205476453234">"Synchronizacja danych"</string>
-    <string name="sync_settings_summary" msgid="6480534906375217074">"Wybierz, które aplikacje są synchronizowane"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Konta i synchronizacja"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"Dodaj lub usuń konta i zmień ich ustawienia"</string>
     <string name="search_settings" msgid="1910951467596035063">"Szukaj"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Zarządzaj ustawieniami i historią wyszukiwania"</string>
     <string name="display_settings" msgid="3912042046350078328">"Ustawienia wyświetlacza"</string>
@@ -403,6 +430,7 @@
     <string name="brightness_summary" msgid="838917350127550703">"Dostosuj jasność ekranu"</string>
     <string name="screen_timeout" msgid="4882669461447531301">"Wygaszanie ekranu"</string>
     <string name="screen_timeout_summary" msgid="2905757633140605334">"Dostosuj opóźnienie automatycznego wyłączenia ekranu"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"Automatyczna jasność"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ustawienia blokady karty SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Ustaw blokadę SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Blokada karty SIM"</string>
@@ -436,7 +464,8 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Informacje o telefonie"</string>
     <string name="device_status" msgid="607405385799807324">"Informacje o telefonie"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Numer telefonu, sygnał itd."</string>
-    <string name="storage_settings_title" msgid="8461515684514801302">"Karta SD i pamięć"</string>
+    <string name="storage_settings" msgid="6681164315506788024">"Karta SD i pamięć telefonu"</string>
+    <string name="storage_settings_title" msgid="5379463509034022773">"Ustawienia karty SD i pamięci telefonu"</string>
     <string name="storage_settings_summary" msgid="9176693537325988610">"Odłącz kartę SD, pokaż ilość dostępnej pamięci w telefonie"</string>
     <string name="status_number" msgid="5123197324870153205">"Mój numer telefonu"</string>
     <string name="status_min_number" msgid="3519504522179420597">"Numer MIN"</string>
@@ -480,6 +509,11 @@
     <string name="apn_mms_port" msgid="4074188088199243040">"Port MMS"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"Typ uwierzytelniania"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Brak"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP lub CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Typ APN"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Usuń APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nowa nazwa APN"</string>
@@ -518,12 +552,15 @@
     <string name="location_network_based" msgid="8815705866861993344">"Użyj sieci Wi-Fi"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Określ moją lokalizację w aplikacjach (takich jak Mapy), korzystając z sieci bezprzewodowych"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Lokalizacja określana jest za pomocą Wi-Fi i/lub sieci komórkowych"</string>
-    <string name="location_gps" msgid="375912731641377120">"Użyj satelit GPS"</string>
-    <string name="location_street_level" msgid="5899941752252356344">"Ustalanie położenia z dokładnością do ulicy (wyłącz, aby oszczędzać baterię)"</string>
+    <string name="location_gps" msgid="6296125378829097831">"Użyj satelitów GPS"</string>
+    <string name="location_street_level" msgid="6460740847018275745">"Określaj lokalizację z dokładnością do ulicy (usuń zaznaczenie, aby oszczędzać baterię)"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Podaje dokładne położenie (zużywa więcej baterii, działa na zewnątrz)"</string>
-    <string name="use_location_title" msgid="7585990952633568732">"Udostępnij dla Google"</string>
-    <string name="use_location_summary" msgid="4411467143899877395">"Zezwalaj Google na korzystanie z danych o lokalizacji w celu polepszenia wyszukiwania oraz innych usług"</string>
-    <string name="use_location_warning_message" msgid="5696732842038416151">"Zezwalaj Google na korzystanie z danych o lokalizacji w celu polepszenia wyników wyszukiwania oraz innych usług"</string>
+    <string name="assisted_gps" msgid="4649317129586736885">"Użyj wspomaganego systemu GPS"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Użyj serwera do wspomagania systemu GPS (usuń zaznaczenie, aby zmniejszyć ruch sieciowy)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Użyj serwera do wspomagania systemu GPS (usuń zaznaczenie, aby zwiększyć wydajność systemu GPS)"</string>
+    <string name="use_location_title" msgid="5447030582538504247">"Użyj funkcji Moja lokalizacja"</string>
+    <string name="use_location_summary" msgid="1816849484040070431">"Użyj funkcji Moja lokalizacja na potrzeby wyników wyszukiwania Google oraz innych usług Google"</string>
+    <string name="use_location_warning_message" msgid="1420184860518262439">"Czy chcesz zezwalać Google na korzystanie z informacji o lokalizacji w celu poprawy wyników wyszukiwania oraz innych usług?"</string>
     <string name="agree" msgid="6288718671527758326">"Zgadzam się"</string>
     <string name="disagree" msgid="6221069272309799230">"Nie zgadzam się"</string>
     <string name="about_settings" msgid="1743378368185371685">"Informacje o telefonie"</string>
@@ -538,6 +575,10 @@
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencje open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Wystąpił problem podczas ładowania licencji."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Ładowanie..."</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Informacje o bezpieczeństwie"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informacje o bezpieczeństwie"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Telefon nie jest połączony z usługą transmisji danych. Aby wyświetlić te informacje teraz, przejdź do strony %s na dowolnym komputerze połączonym z internetem."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Trwa wczytywanie..."</string>
     <string name="lock_settings_title" msgid="5828348303971852121">"Wzór odblokowania ekranu"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Zmień wzór odblokowania"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potwierdź zapisany wzór"</string>
@@ -566,9 +607,9 @@
     <string name="skip_button_label" msgid="8680422740354436943">"Anuluj"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Dalej"</string>
     <string name="lock_title" msgid="4059246467204273930">"Zabezpieczanie telefonu"</string>
-    <string name="lock_intro_message" msgid="5352897389718432077"><font size="17">"Chroń swój telefon przed nieuprawnionym użyciem przez utworzenie osobistego wzoru odblokowania ekranu. "\n<font height="17">\n</font><b>"1"</b>" Obejrzyj rysowanie przykładowego wzoru na następnym ekranie. "\n<font height="17">\n</font><b>"2"</b>" Następnie narysuj swój własny wzór odblokowania. Eksperymentuj z różnymi wzorami, ale połącz co najmniej cztery punkty. "\n<font height="17">\n</font><b>"3"</b>" Narysuj swój wzór ponownie dla potwierdzenia. "\n<font height="17">\n</font><b>"Możemy zaczynać? Wybierz „Dalej”"</b>". "\n<font height="3">\n</font>"Aby zrezygnować z ustawiania blokady, wybierz „Anuluj”."</font></string>
+    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Chroń swój telefon przed nieautoryzowanym użyciem, tworząc osobisty wzorzec odblokowywania ekranu. "\n<font height="17">\n</font><b>"1"</b>"  Na następnym ekranie obejrzyj procedurę rysowania przykładowego wzorca. "\n<font height="17">\n</font><b>"2"</b>"  Po przygotowaniu się narysuj własny osobisty wzorzec odblokowywania. Wypróbuj różne wzorce, łącząc co najmniej cztery kropki. "\n<font height="17">\n</font><b>"3"</b>"  Ponownie narysuj swój wzorzec, aby go potwierdzić. "\n<font height="17">\n</font><b>"Wszystko gotowe? Dotknij przycisku „Dalej”"</b>". "\n<font height="3">\n</font>"Aby pozostawić telefon bez ochrony, dotknij przycisku „Anuluj”."</font></string>
     <string name="lock_example_title" msgid="8052305554017485410">"Przykładowy wzór"</string>
-    <string name="lock_example_message" msgid="7431982730914254881">"Połącz co najmniej cztery kropki."\n" "\n"Wybierz polecenie „Dalej”, aby narysować własny wzór."</string>
+    <string name="lock_example_message" msgid="1838650097090632706">"Połącz co najmniej cztery kropki."\n" "\n"Dotknij przycisku „Dalej”, aby rozpocząć rysowanie własnego wzorca."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Zarządzaj aplikacjami"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Zarządzaj zainstalowanymi aplikacjami oraz usuwaj je"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Aplikacje"</string>
@@ -602,12 +643,12 @@
     <string name="filter" msgid="2018011724373033887">"Filtr"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Wybierz opcje filtru"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Wszystkie"</string>
-    <string name="filter_apps_third_party" msgid="1096017647285183437">"Inne firmy"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Pobrane"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Uruchomione"</string>
     <string name="loading" msgid="3200408047793887917">"Ładowanie..."</string>
     <string name="recompute_size" msgid="7722567982831691718">"Przeliczanie rozmiaru..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Usuń"</string>
-    <string name="clear_data_dlg_text" msgid="8796694785488630642">"Wszystkie informacje zapisane w tej aplikacji zostaną na stałe usunięte."</string>
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"Wszystkie dane tej aplikacji zostaną trwale usunięte. Dotyczy to wszystkich plików, ustawień, kont, baz danych itd."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Anuluj"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"Nie znaleziono aplikacji"</string>
@@ -620,9 +661,23 @@
     <string name="security_settings_desc" msgid="3116027624526915561">"Ta aplikacja ma dostęp do następujących funkcji telefonu:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Przetwarzanie..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Nie można obliczyć rozmiaru pakietu"</string>
-    <string name="empty_list_msg" msgid="1883660401486953588">"Nie zainstalowano żadnych aplikacji innych firm."</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"Nie masz zainstalowanych żadnych aplikacji innych firm."</string>
     <string name="version_text" msgid="9189073826278676425">"wersja <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
-    <string name="language_settings" msgid="2939555761536357092">"Regionalne i język"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"Uruchomione usługi"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Wyświetl i kontroluj obecnie uruchomione usługi"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"Ponowne uruchamianie"</string>
+    <string name="no_running_services" msgid="6981216347270280598">"Brak uruchomionych usług"</string>
+    <string name="confirm_stop_service" msgid="5700448757318301681">"Zatrzymać usługę?"</string>
+    <string name="confirm_stop_service_msg" msgid="1202118456282395730">"Usługa nie będzie działać, dopóki nie zostanie ponownie uruchomiona. Może to mieć niepożądane konsekwencje dotyczące aplikacji <xliff:g id="APPLICATION">%1$s</xliff:g>."</string>
+    <string name="confirm_stop_stop" msgid="7382363913280993331">"Zatrzymaj"</string>
+    <string name="confirm_stop_cancel" msgid="206495326622692381">"Anuluj"</string>
+    <string name="service_started_by_app" msgid="8432097226392386802">"Uruchomiona przez aplikację: dotknij, aby zatrzymać"</string>
+    <string name="service_client_name" msgid="2337664610975074717">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: dotknij, aby zarządzać"</string>
+    <string name="service_background_processes" msgid="5158600475629177758">"Dostępne: <xliff:g id="FREE">%2$s</xliff:g>+<xliff:g id="MEMORY">%3$s</xliff:g> w <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_foreground_processes" msgid="4013890350284680796">"Pozostała: <xliff:g id="MEMORY">%2$s</xliff:g> w <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_process_name" msgid="8630408984456958400">"Proces: <xliff:g id="PROCESS">%1$s</xliff:g>"</string>
+    <string name="language_settings" msgid="502219872342167227">"Język i klawiatura"</string>
+    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Ustawienia języka i klawiatury"</string>
     <string name="language_settings_summary" msgid="595647729475399987">"Określ ustawienia regionalne (język i region) oraz opcje wprowadzania tekstu i autokorekty"</string>
     <string name="language_category" msgid="3391756582724541530">"Ustawienia regionalne"</string>
     <string name="text_category" msgid="6342540511465136739">"Ustawienia tekstu"</string>
@@ -637,7 +692,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Naciśnij dwukrotnie klawisz spacji, aby wstawić kropkę"</string>
     <string name="show_password" msgid="2198798062604049206">"Widoczne hasła"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Pokazuj hasło podczas wpisywania"</string>
-    <string name="ime_security_warning" msgid="3458652708716006477">"Ta metoda wprowadzania może gromadzić cały wpisywany tekst, w tym dane osobiste, takie jak hasła i numery kart kredytowych. Ta metoda pochodzi z aplikacji <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Włączyć tę metodę wprowadzania?"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"Ta metoda wprowadzania może gromadzić cały wpisywany tekst, w tym dane osobiste w postaci haseł i numerów kart kredytowych. Metoda pochodzi z aplikacji <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Czy użyć tej metody wprowadzania?"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Słownik użytkownika"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"Słownik użytkownika"</string>
     <string name="user_dict_settings_summary" msgid="2460427065601355471">"Dodaj i usuń słowa w słowniku użytkownika"</string>
@@ -665,7 +720,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Wprowadzanie tekstu"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Zarządzaj opcjami wprowadzania tekstu"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Ustawienia <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="4919680715154885028">"Ustawienia klawiatury ekranowej"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ustawienia klawiatury ekranowej"</string>
     <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Klawiatura urządzenia"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Ustawienia klawiatury wbudowanej"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Dla programistów"</string>
@@ -676,11 +731,11 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekran nigdy nie będzie gaszony podczas ładowania"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Pozorowanie położenia"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Zezwalaj na pozorowane położenia"</string>
-    <string name="adb_warning_title" msgid="1756027479229533250">"Czy włączyć debugowanie USB?"</string>
+    <string name="adb_warning_title" msgid="6234463310896563253">"Czy zezwalać na debugowanie USB?"</string>
     <string name="adb_warning_message" msgid="5352555112049663033">"Debugowanie USB jest przeznaczone wyłącznie do celów programistycznych. Może posłużyć do kopiowania danych między komputerem a urządzeniem, instalowania aplikacji w urządzeniu bez powiadamiania, a także odczytywania danych dziennika."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Wybierz gadżet"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Wybierz widżet"</string>
-    <string name="battery_history_details_for" msgid="5189636461798594740">"Szczegóły dla identyfikatora UID %d"</string>
+    <string name="battery_history_details_for" msgid="5924639922153109669">"Szczegóły dotyczące identyfikatora UID <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="battery_history_uid" msgid="1016606150528436298">"Identyfikator UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage" msgid="8010852371665217020">"Szczegóły wykorzystania sieci dla <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
     <string name="battery_history_bytes_received" msgid="980307569180518302">"Odebranych bajtów: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
@@ -716,12 +771,13 @@
     <string name="app_name_label" msgid="2000949925256858308">"Aplikacja"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"Licznik"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Czas użycia"</string>
-    <string name="accessibility_settings_title" msgid="4239640930601071058">"Ułatwienia dostępu"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"Ułatwienia dostępu"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Ustawienia ułatwień dostępu"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Zarządzaj opcjami ułatwień dostępu"</string>
     <string name="toggle_accessibility_title" msgid="650839277066574497">"Ułatwienia dostępu"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Usługi ułatwień dostępu"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Brak zainstalowanych usług ułatwień dostępu."</string>
-    <string name="accessibility_service_security_warning" msgid="8386156287296967181">"Ta usługa ułatwień dostępu może gromadzić cały wpisywany tekst, w tym dane osobiste w postaci numerów kart kredytowych, ale z wyłączeniem haseł. Może również śledzić działania w interfejsie użytkownika. Usługa pochodzi z aplikacji <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Czy włączyć tę usługę ułatwień dostępu?"</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Ta usługa ułatwień dostępu może gromadzić cały wpisywany tekst, w tym dane osobiste w postaci numerów kart kredytowych, ale z wyłączeniem haseł. Może również zapisywać w dzienniku działania w interfejsie użytkownika. Usługa pochodzi z aplikacji <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Czy skorzystać z tej usługi ułatwień dostępu?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Czy wyłączyć ułatwienia dostępu?"</string>
     <string name="power_usage_summary_title" msgid="5180282911164282324">"Użycie baterii"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Gdzie wykorzystywana jest bateria"</string>
@@ -733,7 +789,7 @@
     <string name="awake" msgid="387122265874485088">"Czas aktywności urządzenia"</string>
     <string name="wifi_on_time" msgid="4630925382578609056">"WiFi na czas"</string>
     <string name="bluetooth_on_time" msgid="4478515071957280711">"WiFi na czas"</string>
-    <string name="usage_name_percent" msgid="1899151069711662289">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="PERCENT">%2$s</xliff:g>%%"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Szczegóły użycia baterii"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Szczegóły użycia"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Dostosuj wykorzystanie energii"</string>
@@ -769,7 +825,7 @@
     <string name="battery_desc_wifi" msgid="1702486494565080431">"Użycie baterii przez Wi-Fi"</string>
     <string name="battery_sugg_wifi" msgid="7542345142282261691">"Wyłącz Wi-Fi, gdy nie jest używane i w miejscach, gdzie nie jest dostępne"</string>
     <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Użycie baterii przez bluetooth"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="144393178427277439">"Wyłącz bluetooth, gdy nie jest używany"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Wyłącz moduł Bluetooth, gdy nie jest używany"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Spróbuj połączyć się z innym urządzeniem bluetooth"</string>
     <string name="battery_desc_apps" msgid="8123202939321333639">"Użycie baterii przez działające aplikacje"</string>
     <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Zatrzymaj lub odinstaluj aplikację"</string>
@@ -781,9 +837,9 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Odśwież"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"System operacyjny Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Serwer mediów"</string>
-    <string name="tts_settings" msgid="6454363854545277027">"Synteza mowy"</string>
+    <string name="tts_settings" msgid="3348626948015962987">"Przetwarzanie tekstu na mowę"</string>
     <string name="tts_settings_summary" msgid="2627715231944602766">"Ustaw opcje zamiany tekstu na mowę"</string>
-    <string name="tts_settings_title" msgid="5064947197040356736">"Sterowanie syntezatorem mowy"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Ustawienia przetwarzania tekstu na mowę"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Zawsze używaj moich ustawień"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Poniższe ustawienia domyślne zastępują ustawienia aplikacji"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Ustawienia domyślne"</string>
@@ -801,8 +857,11 @@
     <string name="tts_demo" msgid="405357591189935876">"To jest przykład syntezy mowy."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Ustawienia zostały zmienione. Oto przykład aktualnie skonfigurowanego brzmienia."</string>
     <string name="gadget_title" msgid="7455548605888590466">"Zarządzanie energią"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Aktualizowanie ustawień Wi-Fi"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Aktualizowanie ustawień Bluetooth"</string>
+    <string name="credential_installer_activity_title" msgid="7600661521831762521">"Program instalacyjny danych logowania"</string>
     <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Ustawienia sieci VPN"</string>
-    <string name="vpn_connect_to" msgid="9040615733700098831">"Połącz z %s"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"Połącz z siecią <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="vpn_username_colon" msgid="7854930370861306247">"Nazwa użytkownika:"</string>
     <string name="vpn_password_colon" msgid="5716278710848606626">"Hasło:"</string>
     <string name="vpn_a_username" msgid="6664733641993968692">"nazwa użytkownika"</string>
@@ -820,9 +879,9 @@
     <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Rozłącz z siecią"</string>
     <string name="vpn_menu_edit" msgid="4526245173583195618">"Edytuj sieć"</string>
     <string name="vpn_menu_delete" msgid="3326527392609513129">"Usuń sieć"</string>
-    <string name="vpn_error_miss_entering" msgid="1467455143582547499">"Musisz wprowadzić wartość: %s."</string>
-    <string name="vpn_error_miss_selecting" msgid="953436717902387192">"Musisz wybrać wartość: %s."</string>
-    <string name="vpn_error_duplicate_name" msgid="2786397299628471911">"Nazwa sieci VPN „%s” już istnieje. Wybierz inną nazwę."</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Musisz wprowadzić wartość <xliff:g id="CODE">%s</xliff:g>."</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Musisz wybrać opcję <xliff:g id="OPTION">%s</xliff:g>."</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Nazwa sieci VPN „<xliff:g id="NAME">%s</xliff:g>” już istnieje. Wybierz inną nazwę."</string>
     <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Czy na pewno chcesz usunąć tę sieć VPN?"</string>
     <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Czy na pewno nie chcesz utworzyć tego profilu?"</string>
     <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Czy na pewno chcesz odrzucić zmiany wprowadzone w tym profilu?"</string>
@@ -833,10 +892,12 @@
     <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"W tej konfiguracji połączenia VPN brakuje co najmniej jednego klucza tajnego. Czy chcesz sprawdzić ustawienie klucza tajnego?"</string>
     <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Wprowadzono nieprawidłową nazwę użytkownika lub hasło. Czy chcesz spróbować ponownie?"</string>
     <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Serwer przerwał połączenie. Wprowadzona nazwa użytkownika lub hasło mogą być niepoprawne. Czy chcesz spróbować jeszcze raz?"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Serwer przerwał połączenie. Istnieje możliwość, że używana zapora sieciowa uniemożliwia nawiązanie połączenia z serwerem. Czy chcesz spróbować ponownie?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Negocjowanie połączenia z serwerem nie powiodło się. Serwer może nie akceptować wybranej opcji szyfrowania. Czy chcesz sprawdzić ustawienie szyfrowania?"</string>
     <string name="vpn_type_title" msgid="6392933604218676224">"Dodaj sieć VPN"</string>
     <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Dodaj sieć VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2550661826320709266">"Dodaj sieć VPN %s"</string>
-    <string name="vpn_edit_title_edit" msgid="1769999313158207723">"Szczegóły profilu %s"</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Dodaj sieć VPN <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Szczegóły profilu <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="vpns" msgid="3148141862835492816">"Sieci VPN"</string>
     <string name="vpn_connecting" msgid="8039521381692090116">"Łączenie..."</string>
     <string name="vpn_disconnecting" msgid="7748050200708257066">"Rozłączanie..."</string>
@@ -844,8 +905,8 @@
     <string name="vpn_connect_hint" msgid="7442898962925875181">"Połącz z siecią"</string>
     <string name="vpn_name" msgid="1550918148476193076">"Nazwa sieci VPN"</string>
     <string name="vpn_a_name" msgid="8445736942405283509">"nazwa sieci VPN"</string>
-    <string name="vpn_profile_added" msgid="2157095890825215726">"Dodano: %s"</string>
-    <string name="vpn_profile_replaced" msgid="384234123486734768">"Wprowadzanie zmian w %s"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"Dodano profil „<xliff:g id="NAME">%s</xliff:g>”"</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"Wprowadzanie zmian w profilu „<xliff:g id="NAME">%s</xliff:g>”"</string>
     <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Ustaw certyfikat użytkownika"</string>
     <string name="vpn_user_certificate" msgid="949322691686938888">"Certyfikat użytkownika"</string>
     <string name="vpn_a_user_certificate" msgid="8943983437956898649">"certyfikat użytkownika"</string>
@@ -866,53 +927,53 @@
     <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Nazwa serwera sieci VPN"</string>
     <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Domeny wyszukiwania DNS"</string>
     <string name="vpn_dns_search_list" msgid="4230034234026605360">"Domeny wyszukiwania DNS"</string>
-    <string name="vpn_field_is_set" msgid="1880980734721258127">"Wartość %s jest ustawiona"</string>
-    <string name="vpn_field_not_set" msgid="6827205815004809490">"Wartość %s nie jest ustawiona"</string>
-    <string name="vpn_field_not_set_optional" msgid="8665901697706781015">"Wartość %s (opcjonalna) nie jest ustawiona"</string>
-    <string name="vpn_enable_field" msgid="3348948489989523325">"Włącz %s"</string>
-    <string name="vpn_disable_field" msgid="2286966253789266389">"Wyłącz %s"</string>
-    <string name="vpn_is_enabled" msgid="5128973727115662815">"Opcja %s jest włączona"</string>
-    <string name="vpn_is_disabled" msgid="8028085699769751756">"Opcja %s jest wyłączona"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"Wartość <xliff:g id="VALUE">%s</xliff:g> jest ustawiona"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"Wartość <xliff:g id="VALUE">%s</xliff:g> nie została ustawiona"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"Wartość <xliff:g id="VALUE">%s</xliff:g> (opcjonalna) nie jest ustawiona"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"Włącz opcję <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"Wyłącz opcję <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"Opcja <xliff:g id="OPTION">%s</xliff:g> jest włączona"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"Opcja <xliff:g id="OPTION">%s</xliff:g> jest wyłączona"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Ustawienia sieci VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Konfiguruj wirtualne sieci prywatne (VPN) i zarządzaj nimi"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nie zmieniono)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nie ustawiono)"</string>
-    <string name="cstor_settings_category" msgid="2284299080682591107">"Magazyn danych logowania"</string>
-    <string name="cstor_access_title" msgid="1739505390736236717">"Użyj bezpiecznych danych logowania"</string>
-    <string name="cstor_access_summary" msgid="4512681868217546677">"Zezwalaj aplikacjom na dostęp do bezpiecznych certyfikatów i innych danych logowania"</string>
-    <string name="cstor_access_dialog_title" msgid="3024256293191879190">"Wprowadź hasło"</string>
-    <string name="cstor_access_dialog_hint_from_action" msgid="679746865623760961">"Wprowadź hasło magazynu danych logowania."</string>
-    <string name="cstor_set_passwd_title" msgid="6156763762703061470">"Ustaw hasło"</string>
-    <string name="cstor_set_passwd_summary" msgid="5248560429856597398">"Ustaw lub zmień hasło magazynu danych logowania"</string>
-    <string name="cstor_set_passwd_dialog_title" msgid="4071157542842979977">"Ustaw hasło"</string>
-    <string name="cstor_reset_title" msgid="6001600882136794382">"Wyczyść magazyn"</string>
-    <string name="cstor_reset_summary" msgid="7509525030771504833">"Usuń całą zawartość magazynu danych logowania i zresetuj jego hasło"</string>
-    <string name="cstor_reset_hint" msgid="5331632794451859788">"Czy na pewno chcesz usunąć wszystkie dane logowania i zresetować hasło magazynu danych logowania?"</string>
-    <string name="cstor_name_credential_dialog_title" msgid="1723509156126180662">"Nadaj certyfikatowi nazwę"</string>
-    <string name="cstor_credential_name" msgid="2958936431813760259">"Nazwa certyfikatu:"</string>
-    <string name="cstor_credential_password" msgid="7187440553141199409">"Hasło umożliwiające wyodrębnienie certyfikatu:"</string>
-    <string name="cstor_credential_info" msgid="6097346149400207440">"Szczegóły certyfikatu:"</string>
-    <string name="cstor_name_credential_hint" msgid="6889198058976515785">"Nazwa może zawierać tylko litery i cyfry."</string>
-    <string name="cstor_old_password" msgid="979282118063084561">"Bieżące hasło:"</string>
-    <string name="cstor_new_password" msgid="6218562692435670047">"Nowe hasło:"</string>
-    <string name="cstor_confirm_password" msgid="8996028123356342466">"Potwierdź nowe hasło:"</string>
-    <string name="cstor_first_time_hint" msgid="1831593416099224962">"Ustaw hasło magazynu danych logowania."</string>
-    <string name="cstor_first_time_hint_from_action" msgid="4690937025845780557">"Ustaw hasło magazynu danych logowania."</string>
-    <string name="cstor_password_error" msgid="2917326097260402464">"Wprowadź prawidłowe hasło."</string>
-    <string name="cstor_password_error_reset_warning" msgid="3336370539045905953">"Wprowadź prawidłowe hasło. Pozostała jedna próba wprowadzenia prawidłowego hasła – później zawartość magazynu danych logowania zostanie wymazana."</string>
-    <string name="cstor_password_error_reset_warning_plural" msgid="6209069679269017200">"Wprowadź prawidłowe hasło. Liczba pozostałych prób wprowadzenia prawidłowego hasła, zanim zawartość magazynu danych logowania zostanie wymazana: %d."</string>
-    <string name="cstor_passwords_error" msgid="956773958408751155">"Hasła nie są identyczne."</string>
-    <string name="cstor_passwords_empty_error" msgid="6062539742626760734">"Musisz wprowadzić i potwierdzić hasło."</string>
-    <string name="cstor_password_empty_error" msgid="7249632576906961482">"Wprowadź hasło."</string>
-    <string name="cstor_password_verification_error" msgid="8553930704493511389">"Wprowadź hasło ponownie. Hasło musi mieć co najmniej 8 znaków i nie może zawierać spacji."</string>
-    <string name="cstor_name_empty_error" msgid="7499971191993770322">"Wprowadź nazwę."</string>
-    <string name="cstor_name_char_error" msgid="8048089317968192516">"Wprowadź nazwę, która zawiera tylko litery i cyfry."</string>
-    <string name="cstor_storage_error" msgid="7140697503172458161">"Nie można zapisać certyfikatu. Kliknij przycisk OK, aby ponowić próbę."</string>
-    <string name="cstor_unable_to_save_cert" msgid="1631402544447196406">"Nie można zapisać certyfikatu. Magazyn danych uwierzytelniania nie został włączony lub poprawnie zainicjowany."</string>
-    <string name="cstor_cert_not_saved" msgid="6318149789449538491">"Certyfikat nie został zapisany."</string>
-    <string name="cstor_is_reset" msgid="449870501126790589">"Magazyn danych uwierzytelniania został wyczyszczony."</string>
-    <string name="cstor_is_enabled" msgid="4054049098081482785">"Magazyn danych logowania jest włączony."</string>
-    <string name="cstor_is_added" msgid="794788474010251572">"Dodano: %s."</string>
+    <string name="credentials_category" msgid="8536992056377271234">"Magazyn danych logowania"</string>
+    <string name="credentials_access" msgid="4843187230913860492">"Użyj bezpiecznych danych logowania"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"Zezwalaj aplikacjom na dostęp do bezpiecznych certyfikatów i innych danych logowania"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"Wprowadź hasło"</string>
+    <string name="credentials_unlock_hint" msgid="594679530407918031">"Wprowadź hasło magazynu danych logowania."</string>
+    <string name="credentials_install_certificates" msgid="177337517568022236">"Zainstaluj z karty SD"</string>
+    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Zainstaluj zaszyfrowane certyfikaty z karty SD"</string>
+    <string name="credentials_set_password" msgid="9104473585811899989">"Ustaw hasło"</string>
+    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Ustaw lub zmień hasło magazynu danych logowania"</string>
+    <string name="credentials_reset" msgid="9170150870552453457">"Wyczyść magazyn"</string>
+    <string name="credentials_reset_summary" msgid="1530388094693731636">"Wyczyść całą zawartość magazynu danych logowania i zresetuj jego hasło"</string>
+    <string name="credentials_reset_hint" msgid="819990295796804516">"Czy na pewno chcesz usunąć wszystkie dane logowania i zresetować hasło magazynu danych logowania?"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"Bieżące hasło:"</string>
+    <string name="credentials_new_password" msgid="267487774686796938">"Nowe hasło:"</string>
+    <string name="credentials_confirm_password" msgid="4732250000633424345">"Potwierdź nowe hasło:"</string>
+    <string name="credentials_first_time_hint" msgid="1567821077545346039">"Ustaw hasło dla magazynu danych logowania (co najmniej 8 znaków)."</string>
+    <string name="credentials_wrong_password" msgid="7525192410790152041">"Wprowadź prawidłowe hasło."</string>
+    <string name="credentials_reset_warning" msgid="6392481296673345268">"Wprowadź prawidłowe hasło. Pozostała jedna próba wprowadzenia prawidłowego hasła, później zawartość magazynu danych logowania zostanie wyczyszczona."</string>
+    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Wprowadź prawidłowe hasło. Liczba pozostałych prób wprowadzenia prawidłowego hasła, zanim zawartość magazynu danych logowania zostanie wymazana: <xliff:g id="NUMBER">%1$d</xliff:g>."</string>
+    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Hasła nie są identyczne."</string>
+    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Musisz wprowadzić i potwierdzić hasło."</string>
+    <string name="credentials_password_empty" msgid="8292138152983330473">"Wprowadź hasło."</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"Hasło musi mieć co najmniej 8 znaków."</string>
+    <string name="credentials_erased" msgid="7700309135582200849">"Magazyn danych uwierzytelniania został wyczyszczony."</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"Magazyn danych logowania jest włączony."</string>
+    <string name="credentials_disabled" msgid="7453188089059045380">"Magazyn danych logowania jest wyłączony."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Sygnał alarmowy"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Skonfiguruj sposób działania w przypadku połączenia alarmowego"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Prywatność"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Ustawienia prywatności"</string>
+    <string name="location_section_title" msgid="6072558684044939786">"Lokalizacja"</string>
+    <string name="settings_section_title" msgid="7413252428447723032">"Ustawienia"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Dane osobiste"</string>
+    <string name="backup_settings_title" msgid="2968262658155327829">"Utwórz kopię zapasową moich ustawień"</string>
+    <string name="backup_erase_dialog_title" msgid="6028429904055779443">"Kopia zapasowa ustawień"</string>
+    <string name="backup_erase_dialog_message" msgid="9096433810456900531">"Czy na pewno chcesz zakończyć tworzenie kopii zapasowych ustawień i usunąć wszystkie kopie z serwerów Google?"</string>
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index e32c196fbd7..688011b72a0 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -24,38 +24,59 @@
     <item msgid="5345178126174698955">"Pacífico"</item>
     <item msgid="8392017019801393511">"Todas"</item>
   </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"Sem animações"</item>
+    <item msgid="6291186755504776720">"Algumas animações"</item>
+    <item msgid="3856065399819979491">"Todas as animações"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"Não são apresentadas animações de janela"</item>
+    <item msgid="4460915688877708508">"São apresentadas algumas animações de janela"</item>
+    <item msgid="488968798204105119">"São apresentadas todas as animações de janela"</item>
+  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 segundos"</item>
     <item msgid="8881760709354815449">"30 segundos"</item>
     <item msgid="7589406073232279088">"1 minuto"</item>
     <item msgid="7001195990902244174">"2 minutos"</item>
     <item msgid="5721688686241190620">"10 minutos"</item>
-    <item msgid="1781492122915870416">"Nunca esgotar tempo"</item>
+    <item msgid="7156442995039264948">"30 minutos"</item>
+  </string-array>
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Muito lenta"</item>
+    <item msgid="2361722960903353554">"Lenta"</item>
+    <item msgid="1145554631248513562">"Normal"</item>
+    <item msgid="7553665153391107454">"Rápida"</item>
+    <item msgid="2538100882620724753">"Muito rápida"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item msgid="7526050907652687351">"Muito baixa"</item>
+    <item msgid="2692137425242433765">"Baixa"</item>
+    <item msgid="3332408460740717754">"Normal"</item>
+    <item msgid="4907380534957572531">"Alta"</item>
+    <item msgid="4699640516390840297">"Muito alto"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item msgid="478030717868306353">"Inglês americano"</item>
+    <item msgid="5192284521396794598">"Inglês britânico"</item>
+    <item msgid="3000262452051711991">"Francês"</item>
+    <item msgid="9214080387341763401">"Alemão"</item>
+    <item msgid="5972100016440094433">"Italiano"</item>
+    <item msgid="5811378076054402537">"Espanhol"</item>
+  </string-array>
+  <string-array name="wifi_security_entries">
+    <item msgid="2923732046112398627">"Automático"</item>
+    <item msgid="5434666299123318296">"Nenhum"</item>
+    <item msgid="3159594845889645948">"WEP"</item>
+    <item msgid="1687348101566181433">"WPA/WPA2 PSK"</item>
+    <item msgid="329777238762866787">"802.1x Enterprise"</item>
+  </string-array>
+  <string-array name="wifi_security_without_auto_entries">
+    <item msgid="4402120432904877907">"Nenhum"</item>
+    <item msgid="2329148995431627488">"WEP"</item>
+    <item msgid="6903317668294332381">"WPA/WPA2 PSK"</item>
+    <item msgid="7280821339307729710">"802.1x Enterprise"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
-    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
-    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
-    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
-    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
-    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
-    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
-    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
-    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
-    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
-    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
-    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
-    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
-    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
-    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
-    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
-    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
-    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
-    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
-    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
-    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
-    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
-    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
-    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
   <string-array name="wifi_wep_type">
     <item msgid="1497433962958697183">"Automático"</item>
     <item msgid="7182335713815377158">"WEP ASCII"</item>
@@ -84,15 +105,27 @@
     <item msgid="1908750532762193304">"Total de inícios"</item>
     <item msgid="1213951670006606353">"Nome da aplicação"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
-    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
-    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
-    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
-    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
-    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
-    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
-    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
-    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
-    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
-    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="1818786254010764570">"Nenhum"</item>
+    <item msgid="6189918678874123056">"PAP"</item>
+    <item msgid="1524112260493662517">"MSCHAP"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
+    <item msgid="8651992560135239389">"GTC"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Desactivada"</item>
+    <item msgid="3165868966179561687">"Alerta"</item>
+    <item msgid="6038758039030476855">"Vibrar"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"Nenhuma"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP ou CHAP"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 1de8244b0a3..1672256ffe7 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -15,6 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"Sim"</string>
+    <string name="no" msgid="6731231425810196216">"Não"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Ligar rádio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Desligar rádio"</string>
@@ -56,6 +58,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
     <string name="sdcard_setting" msgid="5922637503871474866">"Cartão SD"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Estado da bateria:"</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"Ficha de alimentação:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Escala da bateria:"</string>
     <string name="battery_info_level_label" msgid="8706526709307788737">"Nível da bateria:"</string>
     <string name="battery_info_health_label" msgid="6416051542741886958">"Condição da bateria:"</string>
@@ -75,6 +78,11 @@
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"A descarregar"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Não está a carregar"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Completo"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Desligado"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"CA+USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"Desconhecido"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Desconhecido"</string>
     <string name="battery_info_health_good" msgid="8070356565806711806">"Bom"</string>
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"Sobreaquecimento"</string>
@@ -104,14 +112,19 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Pedido de emparelhamento de Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Pedido de emparelhamento"</string>
     <string name="bluetooth_notif_message" msgid="5381418499788668724">"Seleccionar emparelhamento com "</string>
+    <string name="device_picker" msgid="8721012448931226323">"Seleccionador de dispositivo Bluetooth"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Pedido de emparelhamento de Bluetooth"</string>
+    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Uma aplicação no seu telefone está a solicitar autorização para activar o Bluetooth. Pretende fazê-lo?"</string>
+    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Uma aplicação do seu telefone está a solicitar autorização para que o seu telefone possa ser detectado por outros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Pretende fazê-lo?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Uma aplicação do seu telefone está a solicitar autorização para activar o Bluetooth e para que o seu telefone possa ser detectado por outros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Pretende fazê-lo?"</string>
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"A ligar Bluetooth..."</string>
     <string name="date_and_time" msgid="4114084177056654663">"Definições de data e hora"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 pm"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
     <string name="date_time_changeTime_text" msgid="7037437020000867740">"Mudar hora"</string>
     <string name="date_time_changeDate_text" msgid="5259762626498028057">"Data"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Seleccionar fuso horário"</string>
-    <!-- no translation found for normal_date_format (1982904221918374153) -->
-    <skip />
+    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Pré-visualização:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Tamanho do tipo de letra:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -192,33 +205,23 @@
     <string name="proxy_settings_label" msgid="3271174136184391743">"Definições de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
     <string name="settings_label" msgid="1626402585530130914">"Definições"</string>
-    <!-- no translation found for settings_shortcut (3672145147925639262) -->
-    <skip />
+    <string name="settings_shortcut" msgid="3672145147925639262">"Definições"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modo de voo"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Desactivar todas as ligações sem fios"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"A desactivar ligações sem fios..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"A activar ligações sem fios…"</string>
-    <string name="radio_controls_title" msgid="8356991079873437337">"Controlos sem fios"</string>
-    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
-    <skip />
-    <!-- no translation found for roaming (3596055926335478572) -->
-    <skip />
-    <!-- no translation found for roaming_enable (3737380951525303961) -->
-    <skip />
-    <!-- no translation found for roaming_disable (1295279574370898378) -->
-    <skip />
-    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
-    <skip />
-    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
-    <skip />
-    <!-- no translation found for roaming_warning (1269870211689178511) -->
-    <skip />
-    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
-    <skip />
-    <!-- no translation found for networks (6333316876545927039) -->
-    <skip />
-    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
-    <skip />
+    <string name="radio_controls_title" msgid="5868688473587168882">"Sem fios e redes"</string>
+    <string name="wireless_networks_settings_title" msgid="149274247949769551">"Definições de rede sem fios"</string>
+    <string name="radio_controls_summary" msgid="2998818677094465517">"Gerir Wi-Fi, Bluetooth, modo de avião, redes móveis e VPNs"</string>
+    <string name="roaming" msgid="3596055926335478572">"Roaming de dados"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Ligar a serviços de dados em roaming"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Ligar a serviços de dados em roaming"</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"A ligação de dados foi perdida porque saiu do alcance da sua rede e o roaming de dados estava desactivado."</string>
+    <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Ligar"</string>
+    <string name="roaming_warning" msgid="1269870211689178511">"Permitir roaming de dados? Os encargos de roaming podem ser significativos!"</string>
+    <string name="roaming_reenable_title" msgid="7626425894611573131">"Atenção"</string>
+    <string name="networks" msgid="6333316876545927039">"Selecção da operadora"</string>
+    <string name="sum_carrier_select" msgid="6648929373316748020">"Seleccione um operador de rede"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data e hora"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Definir data, hora, fuso horário e formatos"</string>
     <string name="date_time_auto" msgid="3086083265745944725">"Automático"</string>
@@ -231,25 +234,31 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Seleccionar formato de data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenar alfabeticamente"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por fuso horário"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"Segurança e localização"</string>
-    <!-- no translation found for security_settings_summary (967393342537986570) -->
-    <skip />
+    <string name="security_settings_title" msgid="5168491784222013179">"Localização e segurança"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"Definições de localização e segurança"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"Definir A minha localização, desbloqueio do ecrã, bloqueio do cartão SIM, bloqueio do armazenamento de credenciais"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir O meu local, desbloqueio do ecrã, bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Palavras-passe"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Ligar Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Definições de Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Definições de Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Gerir ligações, definir nome e detectabilidade do dispositivo"</string>
-    <string name="bluetooth_pin_entry" msgid="5627349871303455279">"Pedido de emparelhamento de Bluetooth"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Pedido de emparelhamento de Bluetooth"</string>
     <string name="bluetooth_device_info" msgid="6644515376523965073">"Informações sobre dispositivo Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="7551139612735632370">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Introduza o PIN para emparelhar."\n"(Tente 0000 ou 1234.)"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Introduza o PIN para emparelhar com \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" (tente 0000 ou 1234)."</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Escreva a chave de acesso para emparelhar com \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Para emparelhar com \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", confirme que está a mostrar a passkey: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"pretende emparelhamento."</string>
+    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Introduza <xliff:g id="PASSKEY">%2$s</xliff:g> em \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" para emparelhar."</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Par"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Não emparelhar"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"dispositivo bluetooth"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Atenção"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Ocorreu um problema ao emparelhar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="6938408362011024289">"Ocorreu um problema ao emparelhar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g> porque o PIN introduzido não está correcto."</string>
-    <!-- no translation found for bluetooth_pairing_device_down_error_message (6688215193824686741) -->
-    <skip />
-    <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
-    <skip />
+    <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Ocorreu um problema ao emparelhar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g> porque o PIN ou a Chave de acesso introduzidos não estão correctos."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"Não é possível estabelecer comunicação com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Emparelhamento rejeitado por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Ocorreu um problema ao ligar a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Procurar dispositivos"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Ligar"</string>
@@ -261,6 +270,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Ligar a..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Multimédia"</string>
     <string name="bluetooth_profile_headset" msgid="1874975688666658946">"Telefone"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Transferir"</string>
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Ligado ao áudio de multimédia"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Ligado ao áudio do telefone"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Ligado ao áudio do telefone e de multimédia"</string>
@@ -270,8 +280,11 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Perfis"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ligado ao áudio de multimédia"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ligado ao áudio do telefone"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ligado ao servidor de transferência de ficheiros"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Não ligado ao servidor de transferência de ficheiros"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilizar para áudio de multimédia"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilizar para áudio do telefone"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilizar para transferência de ficheiros"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activar Wi-Fi"</string>
@@ -288,25 +301,13 @@
     <string name="security" msgid="1040691896987225267">"Segurança"</string>
     <string name="wifi_security_open" msgid="3513305614048816607">"Abrir"</string>
     <string name="wifi_security_wep" msgid="7082604129842065776">"WEP"</string>
-    <string name="wifi_security_wpa" msgid="8980169410565477162">"WPA"</string>
-    <string name="wifi_security_wpa2" msgid="5780665935088930524">"WPA2"</string>
-    <!-- no translation found for wifi_security_wpa_eap (7485687331651751101) -->
-    <skip />
-    <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
-    <skip />
+    <string name="wifi_security_psk" msgid="3392399380570381452">"WPA/WPA2 PSK"</string>
+    <string name="wifi_security_eap" msgid="8309434150934969132">"Enterprise(802.1x)"</string>
     <string name="wifi_security_unknown" msgid="4564208312073060668">"Desconhecido"</string>
-    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
-    <skip />
+    <string name="wifi_security_verbose_open" msgid="8117878112088901945">"rede aberta"</string>
+    <string name="wifi_security_verbose_wep" msgid="9220757688700421508">"protegido por WEP"</string>
+    <string name="wifi_security_verbose_psk" msgid="1110130025330416225">"protegido por WPA/WPA2 PSK"</string>
+    <string name="wifi_security_verbose_eap" msgid="586632662086063">"protegido com 802.1x EAP"</string>
     <string name="ip_address" msgid="850672263358989449">"Endereço IP"</string>
     <string name="signal" msgid="1947969631626413228">"Intensidade do sinal"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"A ligar..."</string>
@@ -319,28 +320,19 @@
     <string name="error_saving" msgid="8294279443961615302">"Impossível guardar a rede"</string>
     <string name="connect" msgid="3079076576295839400">"Ligar"</string>
     <string name="connect_to_blank" msgid="6950910074058025378">"Ligar a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for please_select_eap (4488240331626456338) -->
-    <skip />
-    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
-    <skip />
-    <!-- no translation found for please_type_identity (7061261155499513089) -->
-    <skip />
-    <!-- no translation found for please_type_anonymous_identity (835061562079965048) -->
-    <skip />
-    <!-- no translation found for please_select_client_certificate (2137906961594663234) -->
-    <skip />
-    <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
-    <skip />
-    <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
-    <skip />
+    <string name="please_select_eap" msgid="4488240331626456338">"método EAP"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Autenticação da fase 2"</string>
+    <string name="please_type_identity" msgid="7061261155499513089">"Identidade"</string>
+    <string name="please_type_anonymous_identity" msgid="835061562079965048">"Identidade anónima"</string>
+    <string name="please_select_client_certificate" msgid="2137906961594663234">"Certificado cliente"</string>
+    <string name="please_select_ca_certificate" msgid="5010815181914420677">"certificado CA"</string>
     <string name="please_type_passphrase" msgid="8256017704131522462">"Palavra-passe de ligação sem fios"</string>
     <string name="please_type_hex_key" msgid="8751224390407867551">"Chave WEP hexadecimal (0-9, A-F)"</string>
     <string name="wifi_show_password" msgid="4235237470701732009">"Mostrar palavra-passe."</string>
     <string name="scan_wifi" msgid="2459901725350542606">"Procurar"</string>
     <string name="summary_not_in_range" msgid="3926674700733548684">"Fora do alcance"</string>
-    <!-- no translation found for summary_remembered (6079941090549401742) -->
-    <skip />
-    <string name="summary_connection_failed" msgid="7610394657613410489">"A ligação falhou. Seleccione para tentar novamente"</string>
+    <string name="summary_remembered" msgid="6079941090549401742">"memorizado"</string>
+    <string name="summary_connection_failed" msgid="2351885658101671413">"A ligação falhou; toque para tentar novamente"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
     <string name="wifi_type_ssid" msgid="1326839657083292017">"SSID da rede"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Segurança"</string>
@@ -391,6 +383,7 @@
     <string name="status_disconnected" msgid="7561688569905126046">"Desligado"</string>
     <string name="status_failed" msgid="610462050405904601">"Sem sucesso"</string>
     <string name="sound_and_display_settings" msgid="349770582993029003">"Som e visualização"</string>
+    <string name="sound_and_display_settings_title" msgid="5036144539683697330">"Definições de som e visualização"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Definições de som"</string>
     <string name="sound_and_display_settings_summary" msgid="1433943789593286064">"Definir toques, notificações, brilho do ecrã"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Modo silencioso"</string>
@@ -416,17 +409,16 @@
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"Selecção audível"</string>
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Reproduzir som ao efectuar selecção no ecrã"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Reproduzir som ao efectuar selecção no ecrã"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Comentário haptic"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrar ao premir teclas de função e em certas interacções da interface do utilizador"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrar ao premir teclas de função e em certas interacções da interface do utilizador"</string>
     <string name="play_media_notification_sounds_enable_title" msgid="1008791464029179529">"Notificações do cartão SD"</string>
-    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
-    <skip />
-    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
-    <skip />
-    <string name="sync_settings" msgid="2212736205476453234">"Sincronização de dados"</string>
-    <string name="sync_settings_summary" msgid="6480534906375217074">"Seleccionar as aplicações sincronizadas"</string>
-    <!-- no translation found for search_settings (1910951467596035063) -->
-    <skip />
-    <!-- no translation found for search_settings_summary (9205656546570654169) -->
-    <skip />
+    <string name="play_media_notification_sounds_enable_summary_on" msgid="7675466959375667370">"Reproduzir som para notificações do cartão SD"</string>
+    <string name="play_media_notification_sounds_enable_summary_off" msgid="8672617597028744693">"Reproduzir som para notificações do cartão SD"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Contas e sincronização"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"Adicionar ou remover contas e alterar definições de contas"</string>
+    <string name="search_settings" msgid="1910951467596035063">"Pesquisar"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Gerir definições e histórico de pesquisa"</string>
     <string name="display_settings" msgid="3912042046350078328">"Definições do visor"</string>
     <string name="animations_title" msgid="1062189037402346023">"Animação"</string>
     <string name="animations_summary_on" msgid="8843613112130484436">"Mostrar animação ao abrir e fechar janelas"</string>
@@ -438,6 +430,7 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar o brilho do ecrã"</string>
     <string name="screen_timeout" msgid="4882669461447531301">"Tempo limite do ecrã"</string>
     <string name="screen_timeout_summary" msgid="2905757633140605334">"Ajustar o tempo limite até à desactivação automática do ecrã"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Definições de bloqueio do cartão SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configurar bloqueio do cartão SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueio do cartão SIM"</string>
@@ -470,18 +463,14 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Não disponível"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
     <string name="device_status" msgid="607405385799807324">"Estado"</string>
-    <!-- no translation found for device_status_summary (2599162787451519618) -->
-    <skip />
-    <string name="storage_settings_title" msgid="8461515684514801302">"Armazenamento do telefone e cartão SD"</string>
+    <string name="device_status_summary" msgid="2599162787451519618">"Número de telefone, sinal, etc."</string>
+    <string name="storage_settings" msgid="6681164315506788024">"Armazenamento do telefone e cartão SD"</string>
+    <string name="storage_settings_title" msgid="5379463509034022773">"Definições de armazenamento do telefone e cartão SD"</string>
     <string name="storage_settings_summary" msgid="9176693537325988610">"Desmontar cartão SD, ver armazenamento disponível"</string>
-    <!-- no translation found for status_number (5123197324870153205) -->
-    <skip />
-    <!-- no translation found for status_min_number (3519504522179420597) -->
-    <skip />
-    <!-- no translation found for status_prl_version (8499039751817386529) -->
-    <skip />
-    <!-- no translation found for status_meid_number (1751442889111731088) -->
-    <skip />
+    <string name="status_number" msgid="5123197324870153205">"O meu número de telefone"</string>
+    <string name="status_min_number" msgid="3519504522179420597">"MINUTOS"</string>
+    <string name="status_prl_version" msgid="8499039751817386529">"Versão do PRL"</string>
+    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Tipo de rede móvel"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Estado da rede móvel"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Estado do serviço"</string>
@@ -520,6 +509,11 @@
     <string name="apn_mms_port" msgid="4074188088199243040">"Porta MMS"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"Tipo de autenticação"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Nenhuma"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP ou CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Tipo APN"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Eliminar APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Novo APN"</string>
@@ -535,11 +529,9 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Reposição de predefinições de APN concluída"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Reposição dos dados de fábrica"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Apaga todos os dados do telefone"</string>
-    <!-- no translation found for master_clear_desc (7823268823499739178) -->
-    <skip />
+    <string name="master_clear_desc" msgid="7823268823499739178">"Esta operação eliminará todos os dados do telefone, incluindo:"\n<li>"A sua Conta Google"</li>\n<li>"Definições e dados do sistema e das aplicações"</li>\n<li>"Aplicações transferidas"</li>\n"Não eliminará:"\n<li>"Software do sistema actual e aplicações agregadas"</li>\n<li>"Ficheiros do cartão SD, tais como música ou fotografias"</li></string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Repor telefone"</string>
-    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
-    <skip />
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"Apagar todas as informações pessoais e as aplicações transferidas? Não é possível reverter esta acção!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Apagar tudo"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Desenhe o seu padrão de desbloqueio"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Tem de desenhar o seu padrão de desbloqueio para confirmar uma reposição do telefone."</string>
@@ -556,20 +548,19 @@
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurar correio de voz, reencaminhamento de chamadas, chamada em espera, ID do autor da chamada"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móveis"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Definir opções de roaming, redes, APNs"</string>
-    <!-- no translation found for location_title (1029961368397484576) -->
-    <skip />
+    <string name="location_title" msgid="1029961368397484576">"A minha localização"</string>
     <string name="location_network_based" msgid="8815705866861993344">"Utilizar redes sem fios"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Ver localização em aplicações (como o Google Maps) utilizando redes sem fios"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Localização determinada por redes Wi-Fi e/ou móveis"</string>
-    <string name="location_gps" msgid="375912731641377120">"Activar satélites de GPS"</string>
-    <string name="location_street_level" msgid="5899941752252356344">"Ao localizar, determinar a localização exacta ao nível da rua (anular selecção para preservar a bateria)"</string>
+    <string name="location_gps" msgid="6296125378829097831">"Utilizar satélites GPS"</string>
+    <string name="location_street_level" msgid="6460740847018275745">"Ao localizar, determinar a localização exacta ao nível da rua (desmarque esta opção para preservar a bateria)"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Localizar ao nível da rua (exige mais bateria e vista do céu)"</string>
-    <!-- no translation found for use_location_title (7585990952633568732) -->
-    <skip />
-    <!-- no translation found for use_location_summary (4411467143899877395) -->
-    <skip />
-    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
-    <skip />
+    <string name="assisted_gps" msgid="4649317129586736885">"Utilizar GPS assistido"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizar o servidor para auxiliar o GPS (desmarque esta opção para reduzir a utilização da rede)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizar o servidor para auxiliar o GPS (desmarque esta opção para melhorar o desempenho do GPS)"</string>
+    <string name="use_location_title" msgid="5447030582538504247">"Utilizar A minha localização"</string>
+    <string name="use_location_summary" msgid="1816849484040070431">"Utilizar A minha localização para resultados de pesquisa do Google e outros serviços Google"</string>
+    <string name="use_location_warning_message" msgid="1420184860518262439">"Pretende permitir que o Google utilize a localização para resultados de pesquisa melhorados e outros serviços?"</string>
     <string name="agree" msgid="6288718671527758326">"Concordo"</string>
     <string name="disagree" msgid="6221069272309799230">"Discordar"</string>
     <string name="about_settings" msgid="1743378368185371685">"Acerca do telefone"</string>
@@ -579,12 +570,15 @@
     <string name="copyright_title" msgid="865906688917260647">"Direitos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licença"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termos e condições"</string>
-    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
-    <skip />
+    <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Tutorial do sistema"</string>
     <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Saiba como utilizar o seu telefone"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenças open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Ocorreu um problema ao carregar as licenças."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"A carregar..."</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Informações de segurança"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informações de segurança"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"O seu telefone não se encontra ligado a um serviço de dados. Para ver esta informação agora, aceda a %s a partir de qualquer computador ligado à Internet."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"A carregar..."</string>
     <string name="lock_settings_title" msgid="5828348303971852121">"Padrão de desbloqueio do ecrã"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Mudar padrão de desbloqueio"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmar padrão guardado"</string>
@@ -613,9 +607,9 @@
     <string name="skip_button_label" msgid="8680422740354436943">"Cancelar"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Seguinte"</string>
     <string name="lock_title" msgid="4059246467204273930">"Manter o telefone seguro"</string>
-    <string name="lock_intro_message" msgid="5352897389718432077"><font size="17">"Proteja o seu telefone contra utilização não autorizada criando um padrão pessoal de desbloqueio do ecrã. "\n<font height="17">\n</font><b>"1"</b>"  No ecrã seguinte, observe enquanto é desenhado um padrão exemplificativo. "\n<font height="17">\n</font><b>"2"</b>"  Quando estiver pronto, desenhe o seu padrão pessoal de desbloqueio. Experimente diferentes padrões, mas ligue pelo menos quatro pontos. "\n<font height="17">\n</font><b>"3"</b>"  Redesenhe o seu padrão para confirmar. "\n<font height="17">\n</font><b>"Pronto para começar? Seleccione “Seguinte”"</b>". "\n<font height="3">\n</font>"Para deixar o seu telefone desprotegido, seleccione “Cancelar”."</font></string>
+    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Proteja o seu telefone de utilização não autorizada, criando um padrão pessoal de desbloqueio do ecrã. "\n<font height="17">\n</font><b>"1"</b>"  No ecrã seguinte, observe enquanto é desenhado um padrão exemplificativo. "\n<font height="17">\n</font><b>"2"</b>"  Quando estiver pronto, desenhe o seu padrão pessoal de desbloqueio. Experimente diferentes padrões, mas ligue, pelo menos, quatro pontos. "\n<font height="17">\n</font><b>"3"</b>"  Redesenhe o seu padrão para confirmar. "\n<font height="17">\n</font><b>"Está pronto para começar? Toque em “Seguinte”"</b>". "\n<font height="3">\n</font>"Para deixar o seu telefone sem protecção, toque em “Cancelar”."</font></string>
     <string name="lock_example_title" msgid="8052305554017485410">"Padrão exemplificativo"</string>
-    <string name="lock_example_message" msgid="7431982730914254881">"Ligue pelo menos quatro pontos."\n" "\n"Seleccione “Seguinte” quando estiver pronto para desenhar o seu próprio padrão."</string>
+    <string name="lock_example_message" msgid="1838650097090632706">"Ligue, pelo menos, quatro pontos."\n" "\n"Toque em “Seguinte” quando estiver pronto para desenhar o seu próprio padrão."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Gerir aplicações"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Gerir e remover aplicações instaladas"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Aplicações"</string>
@@ -638,8 +632,7 @@
     <string name="data_size_label" msgid="8679376373625710107">"Dados"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstalar"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Limpar dados"</string>
-    <!-- no translation found for app_factory_reset (6635744722502563022) -->
-    <skip />
+    <string name="app_factory_reset" msgid="6635744722502563022">"Desinstalar actualizações"</string>
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Optou por iniciar esta aplicação por predefinição para algumas acções."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nenhuma predefinição definida."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Limpar predefinições"</string>
@@ -650,32 +643,41 @@
     <string name="filter" msgid="2018011724373033887">"Filtrar"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Seleccionar opções de filtro"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Todas"</string>
-    <string name="filter_apps_third_party" msgid="1096017647285183437">"De terceiros"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Transferidas"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Em execução"</string>
     <string name="loading" msgid="3200408047793887917">"A carregar..."</string>
     <string name="recompute_size" msgid="7722567982831691718">"A recalcular tamanho..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Eliminar"</string>
-    <string name="clear_data_dlg_text" msgid="8796694785488630642">"Todas as informações que guardou nesta aplicação serão eliminadas de forma permanente."</string>
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"Todos os dados desta aplicação serão eliminados definitivamente. Isto inclui todos os ficheiros, definições, contas, bases de dados, entre outros."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Cancelar"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"Aplicação não encontrada"</string>
     <string name="app_not_found_dlg_text" msgid="2980271680333341554">"Não foi possível localizar a aplicação na lista de aplicações instaladas."</string>
     <string name="clear_data_failed" msgid="581956197586913865">"Impossível limpar dados da aplicação."</string>
-    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
-    <skip />
-    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
-    <skip />
-    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
-    <skip />
-    <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
-    <skip />
+    <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Desinstalar actualizações"</string>
+    <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Pretende instalar todas as actualizações para esta aplicação de sistema do Android?"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Limpar dados"</string>
+    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Falha ao limpar os dados da aplicação"</string>
     <string name="security_settings_desc" msgid="3116027624526915561">"Esta aplicação pode aceder aos seguintes itens no seu telefone:"</string>
     <string name="computing_size" msgid="1599186977475211186">"A calcular..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Impossível calcular tamanho do pacote"</string>
-    <string name="empty_list_msg" msgid="1883660401486953588">"Não tem nenhuma aplicação de terceiros instalada."</string>
-    <!-- no translation found for version_text (9189073826278676425) -->
-    <skip />
-    <string name="language_settings" msgid="2939555761536357092">"Região e texto"</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"Não tem nenhuma aplicação de terceiros instalada."</string>
+    <string name="version_text" msgid="9189073826278676425">"versão <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"Serviços em execução"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Ver e controlar os serviços actualmente em execução"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"A reiniciar"</string>
+    <string name="no_running_services" msgid="6981216347270280598">"Não existem serviços em execução"</string>
+    <string name="confirm_stop_service" msgid="5700448757318301681">"Parar serviço?"</string>
+    <string name="confirm_stop_service_msg" msgid="1202118456282395730">"O serviço deixará de ser executado até que seja novamente iniciado. Isto pode ter consequências indesejáveis para a aplicação <xliff:g id="APPLICATION">%1$s</xliff:g>."</string>
+    <string name="confirm_stop_stop" msgid="7382363913280993331">"Parar"</string>
+    <string name="confirm_stop_cancel" msgid="206495326622692381">"Cancelar"</string>
+    <string name="service_started_by_app" msgid="8432097226392386802">"Iniciado pela aplicação: tocar para parar"</string>
+    <string name="service_client_name" msgid="2337664610975074717">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: toque para gerir"</string>
+    <string name="service_background_processes" msgid="5158600475629177758">"Disp.: <xliff:g id="FREE">%2$s</xliff:g>+<xliff:g id="MEMORY">%3$s</xliff:g> em <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_foreground_processes" msgid="4013890350284680796">"Outro: <xliff:g id="MEMORY">%2$s</xliff:g> em <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_process_name" msgid="8630408984456958400">"Processo: <xliff:g id="PROCESS">%1$s</xliff:g>"</string>
+    <string name="language_settings" msgid="502219872342167227">"Idioma e teclado"</string>
+    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Definições de idioma e teclado"</string>
     <string name="language_settings_summary" msgid="595647729475399987">"Definir opções de região (idioma e região), entrada de texto e correcção automática"</string>
     <string name="language_category" msgid="3391756582724541530">"Definição de região"</string>
     <string name="text_category" msgid="6342540511465136739">"Definições de texto"</string>
@@ -690,7 +692,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Premir duas vezes a tecla Espaço para inserir \".\""</string>
     <string name="show_password" msgid="2198798062604049206">"Palavras-passe visíveis"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Mostrar palavra-passe ao escrever"</string>
-    <string name="ime_security_warning" msgid="3458652708716006477">"Este método de entrada pode permitir recolher todo o texto que introduzir, incluindo dados pessoais como, por exemplo, palavras-passe e números de cartão de crédito. Decorre da aplicação <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Activar este método de entrada?"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"Este método de entrada pode permitir a recolha de todo o texto que introduzir, incluindo dados pessoais como, por exemplo, palavras-passe e números de cartão de crédito. O serviço é fornecido com a aplicação <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Utilizar este método de entrada?"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicionário do utilizador"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"Dicionário do utilizador"</string>
     <string name="user_dict_settings_summary" msgid="2460427065601355471">"Adicionar e remover palavras do dicionário do utilizador"</string>
@@ -718,7 +720,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Entrada de texto"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Gerir opções de entrada de texto"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Definições de <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="4919680715154885028">"Definições do teclado no ecrã"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Definições do teclado no ecrã"</string>
     <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Teclado do dispositivo"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Definições do teclado incorporado"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Desenvolvimento"</string>
@@ -729,13 +731,11 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"O ecrã nunca entrará em suspensão durante o carregamento"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
-    <!-- no translation found for adb_warning_title (1756027479229533250) -->
-    <skip />
-    <!-- no translation found for adb_warning_message (5352555112049663033) -->
-    <skip />
+    <string name="adb_warning_title" msgid="6234463310896563253">"Permitir depuração USB?"</string>
+    <string name="adb_warning_message" msgid="5352555112049663033">"A depuração USB é utilizada apenas para fins de programação. Pode ser utilizada para copiar dados entre o computador e o dispositivo, instalar aplicações no dispositivo sem notificação e ler dados do registo."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Escolher miniaplicação"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Escolher widget"</string>
-    <string name="battery_history_details_for" msgid="5189636461798594740">"Detalhes de UID %d"</string>
+    <string name="battery_history_details_for" msgid="5924639922153109669">"Detalhes de UID <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="battery_history_uid" msgid="1016606150528436298">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage" msgid="8010852371665217020">"Detalhes de utilização de rede para <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
     <string name="battery_history_bytes_received" msgid="980307569180518302">"Bytes recebidos: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
@@ -746,14 +746,10 @@
     <string name="battery_history_system_time" msgid="2015862072724507547">"Hora do sistema:"</string>
     <string name="battery_history_total_time" msgid="3618703970098556104">"Tempo total:"</string>
     <string name="battery_history_starts" msgid="9137453931978571696">"Inícios: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
-    <!-- no translation found for battery_history_days (7110262897769622564) -->
-    <skip />
-    <!-- no translation found for battery_history_hours (7525170329826274999) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
-    <skip />
-    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
-    <skip />
+    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
+    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
+    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
+    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
     <string name="battery_history_packages_sharing_this_uid" msgid="4101596071379250050">"Pacotes que partilham este UID:"</string>
     <string name="battery_history_no_data" msgid="1177238743237067617">"Não existem dados de utilização da bateria disponíveis"</string>
     <string name="battery_history_sensor" msgid="2333488996028993982">"Sensor:"</string>
@@ -775,400 +771,209 @@
     <string name="app_name_label" msgid="2000949925256858308">"Aplicação"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"Total"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Tempo de utilização"</string>
-    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
-    <skip />
-    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
-    <skip />
-    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
-    <skip />
-    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
-    <skip />
-    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
-    <skip />
-    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
-    <skip />
-    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
-    <skip />
-    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
-    <skip />
-    <!-- no translation found for power_usage_summary (7237084831082848168) -->
-    <skip />
-    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
-    <skip />
-    <!-- no translation found for battery_since_reset (7464546661121187045) -->
-    <skip />
-    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
-    <skip />
+    <string name="accessibility_settings" msgid="3975902491934816215">"Acessibilidade"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Definições de acessibilidade"</string>
+    <string name="accessibility_settings_summary" msgid="8185181964847149507">"Gerir opções de acessibilidade"</string>
+    <string name="toggle_accessibility_title" msgid="650839277066574497">"Acessibilidade"</string>
+    <string name="accessibility_services_category" msgid="8127851026323672607">"Serviços de acessibilidade"</string>
+    <string name="no_accessibility_services_summary" msgid="694578333333808159">"Nenhum serviço de acessibilidade instalado."</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Este serviço de acessibilidade pode captar todo o texto que escrever, incluindo dados pessoais e números de cartões de crédito, com excepção de palavras-passe. Também pode registar as interacções com a interface do utilizador. O serviço é fornecido com a aplicação <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Utilizar este serviço de acessibilidade?"</string>
+    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Desactivar acessibilidade?"</string>
+    <string name="power_usage_summary_title" msgid="5180282911164282324">"Utilização da bateria"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"O que tem estado a utilizar a bateria"</string>
+    <string name="battery_since_unplugged" msgid="338073389740738437">"Bateria utilizada desde que foi desligado"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"Bateria utilizada desde a reposição"</string>
+    <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> desde que foi desligado"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <!-- no translation found for awake (387122265874485088) -->
-    <skip />
-    <!-- no translation found for wifi_on_time (4630925382578609056) -->
-    <skip />
-    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
-    <skip />
-    <!-- no translation found for usage_name_percent (1899151069711662289) -->
-    <skip />
-    <!-- no translation found for details_title (7564809986329021063) -->
-    <skip />
-    <!-- no translation found for details_subtitle (32593908269911734) -->
-    <skip />
-    <!-- no translation found for controls_subtitle (390468421138288702) -->
-    <skip />
-    <!-- no translation found for packages_subtitle (4736416171658062768) -->
-    <skip />
-    <!-- no translation found for power_screen (2353149143338929583) -->
-    <skip />
-    <!-- no translation found for power_wifi (2382791137776486974) -->
-    <skip />
-    <!-- no translation found for power_bluetooth (4373329044379008289) -->
-    <skip />
-    <!-- no translation found for power_cell (6596471490976003056) -->
-    <skip />
-    <!-- no translation found for power_phone (5392641106474567277) -->
-    <skip />
-    <!-- no translation found for power_idle (9055659695602194990) -->
-    <skip />
-    <!-- no translation found for usage_type_cpu (715162150698338714) -->
-    <skip />
-    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
-    <skip />
-    <!-- no translation found for usage_type_gps (7989688715128160790) -->
-    <skip />
-    <!-- no translation found for usage_type_phone (9108247984998041853) -->
-    <skip />
-    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
-    <skip />
-    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
-    <skip />
-    <!-- no translation found for usage_type_audio (6957269406840886290) -->
-    <skip />
-    <!-- no translation found for usage_type_video (4295357792078579944) -->
-    <skip />
-    <!-- no translation found for usage_type_on_time (3351200096173733159) -->
-    <skip />
-    <!-- no translation found for usage_type_no_coverage (3797004252954385053) -->
-    <skip />
-    <!-- no translation found for battery_action_stop (649958863744041872) -->
-    <skip />
-    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
-    <skip />
-    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
-    <skip />
-    <!-- no translation found for battery_action_display (5302763261448580102) -->
-    <skip />
-    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
-    <skip />
-    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
-    <skip />
-    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
-    <skip />
-    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
-    <skip />
-    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
-    <skip />
-    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
-    <skip />
-    <!-- no translation found for battery_desc_display (5432795282958076557) -->
-    <skip />
-    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
-    <skip />
-    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
-    <skip />
-    <!-- no translation found for battery_sugg_wifi (7542345142282261691) -->
-    <skip />
-    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
-    <skip />
-    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
-    <skip />
-    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
-    <skip />
-    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_gps (4145005297393800223) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
-    <skip />
-    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
-    <skip />
-    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
-    <skip />
-    <!-- no translation found for menu_stats_total (8973377864854807854) -->
-    <skip />
-    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
-    <skip />
-    <!-- no translation found for process_kernel_label (3916858646836739323) -->
-    <skip />
-    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
-    <skip />
-    <!-- no translation found for tts_settings (6454363854545277027) -->
-    <skip />
-    <!-- no translation found for tts_settings_summary (2627715231944602766) -->
-    <skip />
-    <!-- no translation found for tts_settings_title (5064947197040356736) -->
-    <skip />
-    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
-    <skip />
-    <!-- no translation found for use_default_tts_settings_summary (4253502106159206276) -->
-    <skip />
-    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
-    <skip />
-    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
-    <skip />
-    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
-    <skip />
-    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
-    <skip />
-    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
-    <skip />
-    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
-    <skip />
-    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
-    <skip />
-    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
-    <skip />
-    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
-    <skip />
-    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
-    <skip />
-    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
-    <skip />
-    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
-    <skip />
-    <!-- no translation found for tts_demo (405357591189935876) -->
-    <skip />
-    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
-    <skip />
-    <!-- no translation found for gadget_title (7455548605888590466) -->
-    <skip />
-    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
-    <skip />
-    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
-    <skip />
-    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
-    <skip />
-    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
-    <skip />
-    <!-- no translation found for vpn_a_username (6664733641993968692) -->
-    <skip />
-    <!-- no translation found for vpn_a_password (1537213632501483753) -->
-    <skip />
-    <!-- no translation found for vpn_save_username (1408415289165970790) -->
-    <skip />
-    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
-    <skip />
-    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
-    <skip />
-    <!-- no translation found for vpn_no_button (7620339571187119107) -->
-    <skip />
-    <!-- no translation found for vpn_back_button (192036339792734970) -->
-    <skip />
-    <!-- no translation found for vpn_mistake_button (1683383660912491270) -->
-    <skip />
-    <!-- no translation found for vpn_menu_done (93528279226907926) -->
-    <skip />
-    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
-    <skip />
-    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
-    <skip />
-    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
-    <skip />
-    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
-    <skip />
-    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
-    <skip />
-    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
-    <skip />
-    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
-    <skip />
-    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
-    <skip />
-    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
-    <skip />
-    <!-- no translation found for vpn_reconnect_from_lost (2442844155623372118) -->
-    <skip />
-    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
-    <skip />
-    <!-- no translation found for vpn_challenge_error_dialog_msg (6174901754230038601) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set_dialog_msg (8013052814131532765) -->
-    <skip />
-    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
-    <skip />
-    <!-- no translation found for vpn_remote_hung_up_error_dialog_msg (1566946015052633150) -->
-    <skip />
-    <!-- no translation found for vpn_type_title (6392933604218676224) -->
-    <skip />
-    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
-    <skip />
-    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
-    <skip />
-    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
-    <skip />
-    <!-- no translation found for vpns (3148141862835492816) -->
-    <skip />
-    <!-- no translation found for vpn_connecting (8039521381692090116) -->
-    <skip />
-    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
-    <skip />
-    <!-- no translation found for vpn_connected (7641723116362845781) -->
-    <skip />
-    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
-    <skip />
-    <!-- no translation found for vpn_name (1550918148476193076) -->
-    <skip />
-    <!-- no translation found for vpn_a_name (8445736942405283509) -->
-    <skip />
-    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
-    <skip />
-    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
-    <skip />
-    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
-    <skip />
-    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
-    <skip />
-    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
-    <skip />
-    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
-    <skip />
-    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
-    <skip />
-    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
-    <skip />
-    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
-    <skip />
-    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
-    <skip />
-    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
-    <skip />
-    <!-- no translation found for vpn_pptp_encryption_title (2236795167467896499) -->
-    <skip />
-    <!-- no translation found for vpn_pptp_encryption (2602329949737259686) -->
-    <skip />
-    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
-    <skip />
-    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
-    <skip />
-    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
-    <skip />
-    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
-    <skip />
-    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
-    <skip />
-    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
-    <skip />
-    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
-    <skip />
-    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
-    <skip />
-    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
-    <skip />
-    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
-    <skip />
-    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
-    <skip />
-    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
-    <skip />
-    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
-    <skip />
-    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
-    <skip />
-    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
-    <skip />
-    <!-- no translation found for vpn_secret_unchanged (8700613973594154529) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set (1037792636371641845) -->
-    <skip />
-    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
-    <skip />
-    <!-- no translation found for cstor_access_title (1739505390736236717) -->
-    <skip />
-    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
-    <skip />
-    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
-    <skip />
-    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
-    <skip />
-    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
-    <skip />
-    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
-    <skip />
-    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
-    <skip />
-    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
-    <skip />
-    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
-    <skip />
-    <!-- no translation found for cstor_credential_password (7187440553141199409) -->
-    <skip />
-    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
-    <skip />
-    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
-    <skip />
-    <!-- no translation found for cstor_old_password (979282118063084561) -->
-    <skip />
-    <!-- no translation found for cstor_new_password (6218562692435670047) -->
-    <skip />
-    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
-    <skip />
-    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
-    <skip />
-    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
-    <skip />
-    <!-- no translation found for cstor_password_error (2917326097260402464) -->
-    <skip />
-    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
-    <skip />
-    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
-    <skip />
-    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
-    <skip />
-    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
-    <skip />
-    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
-    <skip />
-    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
-    <skip />
-    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
-    <skip />
-    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
-    <skip />
-    <!-- no translation found for cstor_storage_error (7140697503172458161) -->
-    <skip />
-    <!-- no translation found for cstor_unable_to_save_cert (1631402544447196406) -->
-    <skip />
-    <!-- no translation found for cstor_cert_not_saved (6318149789449538491) -->
-    <skip />
-    <!-- no translation found for cstor_is_reset (449870501126790589) -->
-    <skip />
-    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
-    <skip />
-    <!-- no translation found for cstor_is_added (794788474010251572) -->
-    <skip />
-    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
-    <skip />
-    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <string name="awake" msgid="387122265874485088">"Hora de activação do dispositivo"</string>
+    <string name="wifi_on_time" msgid="4630925382578609056">"tempo de ligação WiFi"</string>
+    <string name="bluetooth_on_time" msgid="4478515071957280711">"tempo de ligação WiFi"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
+    <string name="details_title" msgid="7564809986329021063">"Detalhes da utilização da bateria"</string>
+    <string name="details_subtitle" msgid="32593908269911734">"Utilizar detalhes"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"Ajustar utilização de energia"</string>
+    <string name="packages_subtitle" msgid="4736416171658062768">"Pacotes incluídos"</string>
+    <string name="power_screen" msgid="2353149143338929583">"Visor"</string>
+    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
+    <string name="power_cell" msgid="6596471490976003056">"inactividade do telefone"</string>
+    <string name="power_phone" msgid="5392641106474567277">"Chamadas de voz"</string>
+    <string name="power_idle" msgid="9055659695602194990">"Telefone inactivo"</string>
+    <string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
+    <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"primeiro plano da CPU"</string>
+    <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
+    <string name="usage_type_phone" msgid="9108247984998041853">"Telefone"</string>
+    <string name="usage_type_data_send" msgid="2857401966985425427">"Dados enviados"</string>
+    <string name="usage_type_data_recv" msgid="7251090882025234185">"Dados recebidos"</string>
+    <string name="usage_type_audio" msgid="6957269406840886290">"Áudio"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"Vídeo"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"Hora activada"</string>
+    <string name="usage_type_no_coverage" msgid="3797004252954385053">"Tempo sem sinal"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"Forçar paragem"</string>
+    <string name="battery_action_app_details" msgid="3275013531871113681">"Informações da aplicação"</string>
+    <string name="battery_action_app_settings" msgid="350562653472577250">"Definições da aplicação"</string>
+    <string name="battery_action_display" msgid="5302763261448580102">"Definições do visor"</string>
+    <string name="battery_action_wifi" msgid="5452076674659927993">"Definições WiFi"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Definições de Bluetooth"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"Bateria utilizada por chamadas de voz"</string>
+    <string name="battery_desc_standby" msgid="3009080001948091424">"Bateria utilizada quando o telefone está inactivo"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"Bateria utilizada pelo rádio do telefone"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"Mudar para modo de avião para poupar energia em áreas sem cobertura de rede"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"Bateria utilizada pelo ecrã e pela iluminação de fundo"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"Reduzir o brilho do ecrã e/ou o tempo que este permanece iluminado"</string>
+    <string name="battery_desc_wifi" msgid="1702486494565080431">"Bateria utilizada por Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="7542345142282261691">"Desactivar Wi-Fi quando não estiver a ser utilizado ou não estiver disponível"</string>
+    <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Bateria utilizada pelo bluetooth"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Desligar o bluetooth quando não estiver a ser utilizado"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Tente ligar a um dispositivo bluetooth diferente"</string>
+    <string name="battery_desc_apps" msgid="8123202939321333639">"Bateria utilizada pelas aplicações quando em execução"</string>
+    <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Parar ou desinstalar a aplicação"</string>
+    <string name="battery_sugg_apps_gps" msgid="4145005297393800223">"Desactivar o GPS quando não está a ser utilizado"</string>
+    <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"A aplicação pode sugerir definições para reduzir a utilização da bateria"</string>
+    <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que foi desligado"</string>
+    <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Desde a última vez que foi desligado por <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_total" msgid="8973377864854807854">"Totais de utilização"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"Actualizar"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"SO Android"</string>
+    <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
+    <string name="tts_settings" msgid="3348626948015962987">"Texto para voz"</string>
+    <string name="tts_settings_summary" msgid="2627715231944602766">"Definir opções de texto para voz"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Definições de texto para voz"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Utilizar sempre as minhas definições"</string>
+    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"As predefinições abaixo substituem as definições da aplicação"</string>
+    <string name="tts_default_settings_section" msgid="5787915620218907443">"Predefinições"</string>
+    <string name="tts_default_rate_title" msgid="6030550998379310088">"Taxa de voz"</string>
+    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Velocidade a que o texto é falado"</string>
+    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonalidade"</string>
+    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afecta o tom do texto falado"</string>
+    <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Define a voz do idioma específico para o texto lido"</string>
+    <string name="tts_play_example_title" msgid="7094780383253097230">"Ouvir um exemplo"</string>
+    <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproduzir uma breve demonstração de síntese de voz"</string>
+    <string name="tts_install_data_title" msgid="4264378440508149986">"Instalar dados de voz"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"Instalar os dados de voz necessários para a síntese de voz"</string>
+    <string name="tts_data_installed_summary" msgid="9162111552859972809">"As vozes necessárias para a síntese de voz já estão instaladas correctamente"</string>
+    <string name="tts_demo" msgid="405357591189935876">"Exemplo de síntese de voz."</string>
+    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"As suas definições foram alteradas. Segue-se um exemplo do respectivo som."</string>
+    <string name="gadget_title" msgid="7455548605888590466">"Controlo de Energia"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Actualizar definição de Wi-Fi"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Actualizar a definição do Bluetooth"</string>
+    <string name="credential_installer_activity_title" msgid="7600661521831762521">"Instalador de credenciais"</string>
+    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Definições da VPN"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"Ligar a <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpn_username_colon" msgid="7854930370861306247">"Nome de utilizador:"</string>
+    <string name="vpn_password_colon" msgid="5716278710848606626">"Palavra-passe:"</string>
+    <string name="vpn_a_username" msgid="6664733641993968692">"um nome de utilizador"</string>
+    <string name="vpn_a_password" msgid="1537213632501483753">"uma palavra-passe"</string>
+    <string name="vpn_save_username" msgid="1408415289165970790">"Memorizar nome de utilizador"</string>
+    <string name="vpn_connect_button" msgid="1699007212602470655">"Ligar"</string>
+    <string name="vpn_yes_button" msgid="8034531001149843119">"Sim"</string>
+    <string name="vpn_no_button" msgid="7620339571187119107">"Não"</string>
+    <string name="vpn_back_button" msgid="192036339792734970">"Anterior"</string>
+    <string name="vpn_mistake_button" msgid="1683383660912491270">"Não"</string>
+    <string name="vpn_menu_done" msgid="93528279226907926">"Guardar"</string>
+    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Cancelar"</string>
+    <string name="vpn_menu_revert" msgid="4407762442281467659">"Reverter"</string>
+    <string name="vpn_menu_connect" msgid="1089399414463784218">"Ligar a uma rede"</string>
+    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Desligado da rede"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Editar rede"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Eliminar rede"</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Tem de introduzir <xliff:g id="CODE">%s</xliff:g>."</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"É necessário seleccionar <xliff:g id="OPTION">%s</xliff:g>."</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"O nome VPN \"<xliff:g id="NAME">%s</xliff:g>\" já existe. Introduza outro nome."</string>
+    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Tem a certeza de que pretende eliminar esta VPN?"</string>
+    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Tem a certeza de que não pretende criar este perfil?"</string>
+    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Tem a certeza de que pretende rejeitar as alterações efectuadas a este perfil?"</string>
+    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Não foi possível estabelecer ligação à rede. Pretende tentar novamente?"</string>
+    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Ligação perdida. Pretende ligar novamente?"</string>
+    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Não é possível resolver o nome do servidor. Pretende verificar a definição do nome do servidor?"</string>
+    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Erro de chamada. Pretende verificar a definição secreta?"</string>
+    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Falta um ou vários segredos nesta configuração de VPN. Pretende verificar a definição de segredo?"</string>
+    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"O nome de utilizador ou a palavra-passe que introduziu estão incorrectos. Pretende tentar novamente?"</string>
+    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"O servidor desligou. O nome de utilizador ou a palavra-passe que introduziu podem estar incorrectos. Pretende tentar novamente?"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Servidor bloqueado. É possível que esteja protegido por uma firewall que impede a ligação ao servidor. Deseja tentar novamente?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"A negociação do servidor falhou. O servidor não pode concordar com a sua opção de encriptação. Deseja confirmar a sua definição de encriptação?"</string>
+    <string name="vpn_type_title" msgid="6392933604218676224">"Adicionar VPN"</string>
+    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Adicionar VPN"</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Adicionar VPN <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Detalhes de <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpns" msgid="3148141862835492816">"VPNs"</string>
+    <string name="vpn_connecting" msgid="8039521381692090116">"A ligar..."</string>
+    <string name="vpn_disconnecting" msgid="7748050200708257066">"A desligar..."</string>
+    <string name="vpn_connected" msgid="7641723116362845781">"Ligado"</string>
+    <string name="vpn_connect_hint" msgid="7442898962925875181">"Ligar a uma rede"</string>
+    <string name="vpn_name" msgid="1550918148476193076">"Nome VPN"</string>
+    <string name="vpn_a_name" msgid="8445736942405283509">"um nome VPN"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"\"<xliff:g id="NAME">%s</xliff:g>\" foi adicionado"</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"Foram efectuadas alterações a \"<xliff:g id="NAME">%s</xliff:g>\""</string>
+    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Definir certificado do utilizador"</string>
+    <string name="vpn_user_certificate" msgid="949322691686938888">"Certificado do utilizador"</string>
+    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"um certificado de utilizador"</string>
+    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Definir certificado CA"</string>
+    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certificado de autoridade de certificação (CA)"</string>
+    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"um certificado CA"</string>
+    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Definir segredo L2TP"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"segredo L2TP"</string>
+    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"um segredo L2TP"</string>
+    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"encriptação"</string>
+    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Encriptação PPTP"</string>
+    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Definir chave IPSec pré-partilhada"</string>
+    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"chave IPSec pré-partilhada"</string>
+    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"uma chave IPSec pré-partilhada"</string>
+    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Definir servidor VPN"</string>
+    <string name="vpn_vpn_server" msgid="1141754908824209260">"servidor VPN"</string>
+    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"um servidor VPN"</string>
+    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"nome de servidor VPN"</string>
+    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"domínios de pesquisa de DNS"</string>
+    <string name="vpn_dns_search_list" msgid="4230034234026605360">"domínios de pesquisa de DNS"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> está definido"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> não definido"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> não definido (opcional)"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"Activar <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"Desactivar <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> está activado"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> está desactivado"</string>
+    <string name="vpn_settings_title" msgid="7327468307909556719">"Definições VPN"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"Configurar e gerir VPNs (Redes Privadas Virtuais)"</string>
+    <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(não alterado)"</string>
+    <string name="vpn_secret_not_set" msgid="1037792636371641845">"(não definido)"</string>
+    <string name="credentials_category" msgid="8536992056377271234">"Armazenamento de credenciais"</string>
+    <string name="credentials_access" msgid="4843187230913860492">"Utilizar credenciais seguras"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"Permitir que as aplicações acedam a certificados seguros e outras credenciais"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"Introduzir palavra-passe"</string>
+    <string name="credentials_unlock_hint" msgid="594679530407918031">"Introduza a palavra-passe do armazenamento de credenciais."</string>
+    <string name="credentials_install_certificates" msgid="177337517568022236">"Instalar a partir do cartão SD"</string>
+    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Instalar certificados encriptados a partir do cartão SD"</string>
+    <string name="credentials_set_password" msgid="9104473585811899989">"Definir palavra-passe"</string>
+    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Definir ou alterar a palavra-passe do armazenamento de credenciais"</string>
+    <string name="credentials_reset" msgid="9170150870552453457">"Limpar armazenamento"</string>
+    <string name="credentials_reset_summary" msgid="1530388094693731636">"Limpar armazenamento de credenciais de todos os conteúdos e repor a respectiva palavra-passe"</string>
+    <string name="credentials_reset_hint" msgid="819990295796804516">"Tem a certeza de que pretende eliminar todas as credenciais e repor a palavra-passe do armazenamento de credenciais?"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"Palavra-passe actual:"</string>
+    <string name="credentials_new_password" msgid="267487774686796938">"Nova palavra-passe:"</string>
+    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmar nova palavra-passe:"</string>
+    <string name="credentials_first_time_hint" msgid="1567821077545346039">"Defina uma palavra-passe para o armazenamento de credenciais (com, pelo menos, 8 caracteres)."</string>
+    <string name="credentials_wrong_password" msgid="7525192410790152041">"Introduza a palavra-passe correcta."</string>
+    <string name="credentials_reset_warning" msgid="6392481296673345268">"Introduza a palavra-passe correcta. Tem mais uma tentativa para introduzir a palavra-passe correcta antes que o armazenamento de credenciais seja apagado."</string>
+    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Introduza a palavra-passe correcta. Tem mais <xliff:g id="NUMBER">%1$d</xliff:g> tentativas para introduzir a palavra-passe correcta antes que o armazenamento de credenciais seja apagado."</string>
+    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"As palavras-passe não correspondem."</string>
+    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Tem de introduzir e confirmar uma palavra-passe."</string>
+    <string name="credentials_password_empty" msgid="8292138152983330473">"Introduza a palavra-passe."</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"A palavra-passe deve ter, pelo menos, 8 caracteres."</string>
+    <string name="credentials_erased" msgid="7700309135582200849">"O armazenamento de credenciais foi apagado."</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"O armazenamento de credenciais está activado."</string>
+    <string name="credentials_disabled" msgid="7453188089059045380">"O armazenamento de credenciais está desactivado."</string>
+    <string name="emergency_tone_title" msgid="1055954530111587114">"Tom de emergência"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"Definir o comportamento quando é efectuada uma chamada de emergência"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Privacidade"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Definições de privacidade"</string>
+    <string name="location_section_title" msgid="6072558684044939786">"Localização"</string>
+    <string name="settings_section_title" msgid="7413252428447723032">"Definições"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Dados pessoais"</string>
+    <string name="backup_settings_title" msgid="2968262658155327829">"Efectuar uma cópia de segurança das minhas definições"</string>
+    <string name="backup_erase_dialog_title" msgid="6028429904055779443">"Cópia de segurança das definições"</string>
+    <string name="backup_erase_dialog_message" msgid="9096433810456900531">"Tem a certeza de que pretende parar a cópia de segurança das suas definições e apagar todas as cópias nos servidores da Google?"</string>
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
     <skip />
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index ac5e8e330bc..adea28cf584 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -24,38 +24,59 @@
     <item msgid="5345178126174698955">"Pacífico"</item>
     <item msgid="8392017019801393511">"Todos"</item>
   </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"Nenhuma animação"</item>
+    <item msgid="6291186755504776720">"Algumas animações"</item>
+    <item msgid="3856065399819979491">"Todas as animações"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"Nenhuma animação de janela é exibida"</item>
+    <item msgid="4460915688877708508">"Algumas animações de janela são exibidas"</item>
+    <item msgid="488968798204105119">"Todas as animações de janela são exibidas"</item>
+  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 segundos"</item>
     <item msgid="8881760709354815449">"30 segundos"</item>
     <item msgid="7589406073232279088">"1 minuto"</item>
     <item msgid="7001195990902244174">"2 minutos"</item>
     <item msgid="5721688686241190620">"10 minutos"</item>
-    <item msgid="1781492122915870416">"Nunca esgotar o tempo limite"</item>
+    <item msgid="7156442995039264948">"30 minutos"</item>
+  </string-array>
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Muito devagar"</item>
+    <item msgid="2361722960903353554">"Devagar"</item>
+    <item msgid="1145554631248513562">"Normal"</item>
+    <item msgid="7553665153391107454">"Rápida"</item>
+    <item msgid="2538100882620724753">"Muito rápida"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item msgid="7526050907652687351">"Muito baixa"</item>
+    <item msgid="2692137425242433765">"Baixa"</item>
+    <item msgid="3332408460740717754">"Normal"</item>
+    <item msgid="4907380534957572531">"Alta"</item>
+    <item msgid="4699640516390840297">"Muito alta"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item msgid="478030717868306353">"Inglês (EUA)"</item>
+    <item msgid="5192284521396794598">"Inglês (Reino Unido)"</item>
+    <item msgid="3000262452051711991">"Francês"</item>
+    <item msgid="9214080387341763401">"Alemão"</item>
+    <item msgid="5972100016440094433">"Italiano"</item>
+    <item msgid="5811378076054402537">"Espanhol"</item>
+  </string-array>
+  <string-array name="wifi_security_entries">
+    <item msgid="2923732046112398627">"Automático"</item>
+    <item msgid="5434666299123318296">"Nenhum"</item>
+    <item msgid="3159594845889645948">"WEP"</item>
+    <item msgid="1687348101566181433">"WPA/WPA2 PSK"</item>
+    <item msgid="329777238762866787">"802.1x Enterprise"</item>
+  </string-array>
+  <string-array name="wifi_security_without_auto_entries">
+    <item msgid="4402120432904877907">"Nenhum"</item>
+    <item msgid="2329148995431627488">"WEP"</item>
+    <item msgid="6903317668294332381">"WPA/WPA2 PSK"</item>
+    <item msgid="7280821339307729710">"802.1x Enterprise"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
-    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
-    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
-    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
-    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
-    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
-    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
-    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
-    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
-    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
-    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
-    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
-    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
-    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
-    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
-    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
-    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
-    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
-    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
-    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
-    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
-    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
-    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
-    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
   <string-array name="wifi_wep_type">
     <item msgid="1497433962958697183">"Automático"</item>
     <item msgid="7182335713815377158">"WEP ASCII"</item>
@@ -84,15 +105,27 @@
     <item msgid="1908750532762193304">"Iniciar contagem"</item>
     <item msgid="1213951670006606353">"Nome do aplicativo"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
-    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
-    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
-    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
-    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
-    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
-    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
-    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
-    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
-    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
-    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="1818786254010764570">"Nenhuma"</item>
+    <item msgid="6189918678874123056">"PAP"</item>
+    <item msgid="1524112260493662517">"MSCHAP"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
+    <item msgid="8651992560135239389">"GTC"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Desativado"</item>
+    <item msgid="3165868966179561687">"Alerta"</item>
+    <item msgid="6038758039030476855">"Vibrar"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"Nenhum"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP ou CHAP"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index bcb6bbe7d6c..40000375a29 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -15,6 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"Sim"</string>
+    <string name="no" msgid="6731231425810196216">"Não"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Ativar o rádio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Desativar o rádio"</string>
@@ -56,6 +58,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
     <string name="sdcard_setting" msgid="5922637503871474866">"Cartão SD"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Status da bateria:"</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"Tomada de alimentação:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Escala da bateria:"</string>
     <string name="battery_info_level_label" msgid="8706526709307788737">"Nível da bateria:"</string>
     <string name="battery_info_health_label" msgid="6416051542741886958">"Integridade da bateria:"</string>
@@ -75,6 +78,11 @@
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"Descarregando"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Não está carregando"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Cheio"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Desconectado"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"CA+USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"Desconhecido"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Desconhecido"</string>
     <string name="battery_info_health_good" msgid="8070356565806711806">"Bom"</string>
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"Superaquecimento"</string>
@@ -104,14 +112,19 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Solicitação de pareamento Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitação de pareamento"</string>
     <string name="bluetooth_notif_message" msgid="5381418499788668724">"Selecione para parear "</string>
+    <string name="device_picker" msgid="8721012448931226323">"Selecionador de dispositivo Bluetooth"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitação de permissão para Bluetooth"</string>
+    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Um aplicativo no seu telefone está solicitando permissão para ativar o Bluetooth. Deseja fazer isso?"</string>
+    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Um aplicativo no seu telefone está solicitando permissão para tornar o seu telefone detectável por outros dispositivos Bluetooth por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Deseja fazer isso?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Um aplicativo no seu telefone está solicitando permissão para ativar o Bluetooth e tornar o seu telefone detectável por outros dispositivos por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Deseja fazer isso?"</string>
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Ativando Bluetooth…"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Configurações de data e hora"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 pm"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
     <string name="date_time_changeTime_text" msgid="7037437020000867740">"Alterar horário"</string>
     <string name="date_time_changeDate_text" msgid="5259762626498028057">"Data"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Selecionar fuso horário"</string>
-    <!-- no translation found for normal_date_format (1982904221918374153) -->
-    <skip />
+    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Visualizar:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Tamanho da fonte:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -179,7 +192,7 @@
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Bytes usados:"</string>
     <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"Procurando mídia no cartão SD…"</string>
     <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"Cartão SD montado como somente leitura"</string>
-    <string name="next_label" msgid="4693520878012668114">"Próximo"</string>
+    <string name="next_label" msgid="4693520878012668114">"Avançar"</string>
     <string name="language_picker_title" msgid="4034157617842965844">"Local"</string>
     <string name="select_your_language" msgid="1146235168951906084">"Selecionar o seu idioma"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Selecionar atividade"</string>
@@ -192,64 +205,60 @@
     <string name="proxy_settings_label" msgid="3271174136184391743">"Configurações de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
     <string name="settings_label" msgid="1626402585530130914">"Configurações"</string>
-    <!-- no translation found for settings_shortcut (3672145147925639262) -->
-    <skip />
+    <string name="settings_shortcut" msgid="3672145147925639262">"Configurações"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modo avião"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Desativar todas as conexões sem fio"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Desativando as conexões sem fio…"</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Ativando conexões sem fio…"</string>
-    <string name="radio_controls_title" msgid="8356991079873437337">"Controles sem fio"</string>
-    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
-    <skip />
-    <!-- no translation found for roaming (3596055926335478572) -->
-    <skip />
-    <!-- no translation found for roaming_enable (3737380951525303961) -->
-    <skip />
-    <!-- no translation found for roaming_disable (1295279574370898378) -->
-    <skip />
-    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
-    <skip />
-    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
-    <skip />
-    <!-- no translation found for roaming_warning (1269870211689178511) -->
-    <skip />
-    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
-    <skip />
-    <!-- no translation found for networks (6333316876545927039) -->
-    <skip />
-    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
-    <skip />
+    <string name="radio_controls_title" msgid="5868688473587168882">"Redes sem fio e outras"</string>
+    <string name="wireless_networks_settings_title" msgid="149274247949769551">"Configurações sem fio e de rede"</string>
+    <string name="radio_controls_summary" msgid="2998818677094465517">"Gerenciar rede Wi-Fi, Bluetooth, modo avião, redes e VPNs"</string>
+    <string name="roaming" msgid="3596055926335478572">"Roaming de dados"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Conectar aos serviços de dados quando estiver em roaming"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Conectar aos serviços de dados quando estiver em roaming"</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"Você perdeu a conectividade de dados porque deixou o roaming de dados da sua rede doméstica desativado."</string>
+    <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Ativar"</string>
+    <string name="roaming_warning" msgid="1269870211689178511">"Permitir roaming de dados? Isso pode causar cobranças significativas de roaming!"</string>
+    <string name="roaming_reenable_title" msgid="7626425894611573131">"Atenção"</string>
+    <string name="networks" msgid="6333316876545927039">"Seleção de operador"</string>
+    <string name="sum_carrier_select" msgid="6648929373316748020">"Selecione um operador de rede"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data e hora"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Definir data, hora, fuso horário e formatos"</string>
     <string name="date_time_auto" msgid="3086083265745944725">"Automático"</string>
     <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Usar valores fornecidos pela rede"</string>
     <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Usar valores fornecidos pela rede"</string>
-    <string name="date_time_24hour" msgid="1193032284921000063">"Usar formato de 24 horas"</string>
+    <string name="date_time_24hour" msgid="1193032284921000063">"Formato de 24 horas"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Definir data e hora"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Selecionar fuso horário"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Definir data"</string>
     <string name="date_time_date_format" msgid="436706100255870967">"Selecionar formato de data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Classificar em ordem alfabética"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Classificar por fuso horário"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"Segurança e local"</string>
-    <!-- no translation found for security_settings_summary (967393342537986570) -->
-    <skip />
+    <string name="security_settings_title" msgid="5168491784222013179">"Local e segurança"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"Configurações de Local e segurança"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir o Meu local, o desbloqueio de tela, o bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Senhas"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Ativar Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Configurações de Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Configurações de Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Gerenciar conexões, definir o nome e detecção do dispositivo"</string>
-    <string name="bluetooth_pin_entry" msgid="5627349871303455279">"Solicitação de pareamento Bluetooth"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Solicitação de pareamento Bluetooth"</string>
     <string name="bluetooth_device_info" msgid="6644515376523965073">"Informações do dispositivo Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="7551139612735632370">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Digite o PIN para parear"\n"(tente 0000 ou 1234)."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Digite o PIN para emparelhar com \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" (tente 0000 ou 1234.)"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Digite a senha para emparelhar com \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Para emparelhar com \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", verifique se a senha está sendo exibida: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"deseja emparelhar."</string>
+    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Insira <xliff:g id="PASSKEY">%2$s</xliff:g> no \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" para emparelhar."</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Emparelhar"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Não emparelhar"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"dispositivo Bluetooth"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Atenção"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Houve um problema no pareamento com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="6938408362011024289">"Houve um problema ao parear com o <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, porque o PIN digitado está incorreto."</string>
-    <!-- no translation found for bluetooth_pairing_device_down_error_message (6688215193824686741) -->
-    <skip />
-    <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
-    <skip />
+    <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Houve um problema ao emparelhar com o <xliff:g id="DEVICE_NAME">%1$s</xliff:g> porque o PIN ou a senha está incorreto."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"Não é possível estabelecer comunicação com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Emparelhamento rejeitado por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Houve um problema na conexão com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Procurar dispositivos"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Conectar"</string>
@@ -261,6 +270,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectar-se a..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Mídia"</string>
     <string name="bluetooth_profile_headset" msgid="1874975688666658946">"Telefone"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Transferir"</string>
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Conectado ao áudio da mídia"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Conectado ao áudio do telefone"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Conectado ao áudio do telefone e da mídia"</string>
@@ -270,8 +280,11 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Perfis"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado ao áudio da mídia"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado ao áudio do telefone"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado ao servidor de transferência de arquivo"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Não está conectado ao servidor de transferência de arquivo"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Usar para áudio de mídia"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Usar para áudio do telefone"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Usado para transferência de arquivo"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Ativar Wi-Fi"</string>
@@ -288,25 +301,13 @@
     <string name="security" msgid="1040691896987225267">"Segurança"</string>
     <string name="wifi_security_open" msgid="3513305614048816607">"Aberta"</string>
     <string name="wifi_security_wep" msgid="7082604129842065776">"WEP"</string>
-    <string name="wifi_security_wpa" msgid="8980169410565477162">"WPA"</string>
-    <string name="wifi_security_wpa2" msgid="5780665935088930524">"WPA2"</string>
-    <!-- no translation found for wifi_security_wpa_eap (7485687331651751101) -->
-    <skip />
-    <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
-    <skip />
+    <string name="wifi_security_psk" msgid="3392399380570381452">"WPA/WPA2 PSK"</string>
+    <string name="wifi_security_eap" msgid="8309434150934969132">"Enterprise(802.1x)"</string>
     <string name="wifi_security_unknown" msgid="4564208312073060668">"Desconhecido"</string>
-    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
-    <skip />
+    <string name="wifi_security_verbose_open" msgid="8117878112088901945">"rede aberta"</string>
+    <string name="wifi_security_verbose_wep" msgid="9220757688700421508">"protegido por WEP"</string>
+    <string name="wifi_security_verbose_psk" msgid="1110130025330416225">"protegido com WPA/WPA2 PSK"</string>
+    <string name="wifi_security_verbose_eap" msgid="586632662086063">"protegido com 802.1x EAP"</string>
     <string name="ip_address" msgid="850672263358989449">"Endereço IP"</string>
     <string name="signal" msgid="1947969631626413228">"Potência do sinal"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"Ativando…"</string>
@@ -319,28 +320,19 @@
     <string name="error_saving" msgid="8294279443961615302">"Não é possível salvar a rede"</string>
     <string name="connect" msgid="3079076576295839400">"Conectar"</string>
     <string name="connect_to_blank" msgid="6950910074058025378">"Conectar-se a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for please_select_eap (4488240331626456338) -->
-    <skip />
-    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
-    <skip />
-    <!-- no translation found for please_type_identity (7061261155499513089) -->
-    <skip />
-    <!-- no translation found for please_type_anonymous_identity (835061562079965048) -->
-    <skip />
-    <!-- no translation found for please_select_client_certificate (2137906961594663234) -->
-    <skip />
-    <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
-    <skip />
-    <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
-    <skip />
+    <string name="please_select_eap" msgid="4488240331626456338">"Método EAP"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Autenticação da Fase 2"</string>
+    <string name="please_type_identity" msgid="7061261155499513089">"Identidade"</string>
+    <string name="please_type_anonymous_identity" msgid="835061562079965048">"Identidade anônima"</string>
+    <string name="please_select_client_certificate" msgid="2137906961594663234">"Certificado do cliente"</string>
+    <string name="please_select_ca_certificate" msgid="5010815181914420677">"Certificado de CA"</string>
     <string name="please_type_passphrase" msgid="8256017704131522462">"Senha sem fio"</string>
     <string name="please_type_hex_key" msgid="8751224390407867551">"Chave hexadecimal WEP (0 a 9, A a F)"</string>
     <string name="wifi_show_password" msgid="4235237470701732009">"Mostrar senha."</string>
     <string name="scan_wifi" msgid="2459901725350542606">"Verificar"</string>
     <string name="summary_not_in_range" msgid="3926674700733548684">"Não está dentro do alcance"</string>
-    <!-- no translation found for summary_remembered (6079941090549401742) -->
-    <skip />
-    <string name="summary_connection_failed" msgid="7610394657613410489">"Falha na conexão. Selecione para tentar novamente"</string>
+    <string name="summary_remembered" msgid="6079941090549401742">"lembrado"</string>
+    <string name="summary_connection_failed" msgid="2351885658101671413">"Falha na conexão. Toque para tentar novamente"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
     <string name="wifi_type_ssid" msgid="1326839657083292017">"SSID da rede"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Segurança"</string>
@@ -391,6 +383,7 @@
     <string name="status_disconnected" msgid="7561688569905126046">"Desconectado"</string>
     <string name="status_failed" msgid="610462050405904601">"Falha"</string>
     <string name="sound_and_display_settings" msgid="349770582993029003">"Som e tela"</string>
+    <string name="sound_and_display_settings_title" msgid="5036144539683697330">"Configurações de Som e tela"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Configurações de som"</string>
     <string name="sound_and_display_settings_summary" msgid="1433943789593286064">"Definir toques, notificações, brilho da tela"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Modo silencioso"</string>
@@ -416,17 +409,16 @@
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"Seleção audível"</string>
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Reproduzir som ao fazer uma seleção de tela"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Reproduzir som ao fazer uma seleção de tela"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Retorno com vibração"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrar ao pressionar teclas e em algumas interações com a interface de usuário"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrar ao pressionar teclas e em algumas interações com a interface de usuário"</string>
     <string name="play_media_notification_sounds_enable_title" msgid="1008791464029179529">"Notificações do cartão SD"</string>
-    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
-    <skip />
-    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
-    <skip />
-    <string name="sync_settings" msgid="2212736205476453234">"Sincronização de dados"</string>
-    <string name="sync_settings_summary" msgid="6480534906375217074">"Selecionar os aplicativos que serão sincronizados"</string>
-    <!-- no translation found for search_settings (1910951467596035063) -->
-    <skip />
-    <!-- no translation found for search_settings_summary (9205656546570654169) -->
-    <skip />
+    <string name="play_media_notification_sounds_enable_summary_on" msgid="7675466959375667370">"Reproduzir som para notificações do cartão SD"</string>
+    <string name="play_media_notification_sounds_enable_summary_off" msgid="8672617597028744693">"Reproduzir som para notificações do cartão SD"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Contas e sincronização"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"Adicionar ou remover contas e alterar as configurações da conta"</string>
+    <string name="search_settings" msgid="1910951467596035063">"Pesquisar"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Gerenciar configurações e histórico de pesquisa"</string>
     <string name="display_settings" msgid="3912042046350078328">"Configurações da tela"</string>
     <string name="animations_title" msgid="1062189037402346023">"Animação"</string>
     <string name="animations_summary_on" msgid="8843613112130484436">"Mostrar animação ao abrir e fechar janelas"</string>
@@ -437,9 +429,10 @@
     <string name="brightness" msgid="2354961343555249270">"Brilho"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar o brilho da tela"</string>
     <string name="screen_timeout" msgid="4882669461447531301">"Tempo limite da tela"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Ajuste depois de quanto tempo a tela será desligada automaticamente"</string>
-    <string name="sim_lock_settings" msgid="3392331196873564292">"Configurações de bloqueio do cartão SIM"</string>
-    <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configurar bloqueio do cartão SIM"</string>
+    <string name="screen_timeout_summary" msgid="2905757633140605334">"Ajustar depois de quanto tempo a tela será desligada automaticamente"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueio do SIM"</string>
+    <string name="sim_lock_settings_category" msgid="5136244267576697004">"Conf. bloqueio do SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueio do cartão SIM"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Bloquear cartão SIM"</string>
     <string name="sim_lock_on" msgid="2503536505568814324">"Exigir PIN para usar o telefone"</string>
@@ -470,18 +463,14 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Não disponível"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
-    <!-- no translation found for device_status_summary (2599162787451519618) -->
-    <skip />
-    <string name="storage_settings_title" msgid="8461515684514801302">"Cartão SD e armazenamento do telefone"</string>
+    <string name="device_status_summary" msgid="2599162787451519618">"Número de telefone, sinal etc."</string>
+    <string name="storage_settings" msgid="6681164315506788024">"Cartão SD e armazenamento do telefone"</string>
+    <string name="storage_settings_title" msgid="5379463509034022773">"Configurações de cartão SD e armazenamento do telefone"</string>
     <string name="storage_settings_summary" msgid="9176693537325988610">"Desmontar o cartão SD, visualizar armazenamento disponível"</string>
-    <!-- no translation found for status_number (5123197324870153205) -->
-    <skip />
-    <!-- no translation found for status_min_number (3519504522179420597) -->
-    <skip />
-    <!-- no translation found for status_prl_version (8499039751817386529) -->
-    <skip />
-    <!-- no translation found for status_meid_number (1751442889111731088) -->
-    <skip />
+    <string name="status_number" msgid="5123197324870153205">"Meu número de telefone"</string>
+    <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_prl_version" msgid="8499039751817386529">"Versão PRL"</string>
+    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Tipo de rede móvel"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Estado da rede móvel"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Estado do serviço"</string>
@@ -520,6 +509,11 @@
     <string name="apn_mms_port" msgid="4074188088199243040">"Porta MMS"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"Tipo de autenticação"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Nenhum"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP ou CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Tipo APN"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Excluir APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Novo APN"</string>
@@ -533,13 +527,11 @@
     <string name="restore_default_apn" msgid="2724583218635739913">"Restaurando as configurações APN padrão"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Redefinir para o padrão"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Redefinição das configurações padrão do APN concluída"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Redefinir configuração original"</string>
+    <string name="master_clear_title" msgid="5907939616087039756">"Configuração original"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Apaga todos os dados no telefone"</string>
-    <!-- no translation found for master_clear_desc (7823268823499739178) -->
-    <skip />
+    <string name="master_clear_desc" msgid="7823268823499739178">"Todos os dados do seu telefone serão apagados, incluindo:"\n<li>"Sua conta do Google"</li>\n<li>"Configurações e dados de aplicativos e do sistema"</li>\n<li>"Aplicativos que você fez download"</li>\n"Não serão apagados:"\n<li>"Aplicativos fornecidos e o software atual do sistema"</li>\n<li>"Arquivos do cartão SD, como música ou fotos"</li></string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Redefinir telefone"</string>
-    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
-    <skip />
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"Apagar todas as informações pessoais e os aplicativos que você fez download? É impossível reverter essa ação."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Apagar tudo"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Desenhe o seu padrão de desbloqueio"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Você precisa desenhar o seu padrão de desbloqueio para confirmar uma redefinição de telefone."</string>
@@ -552,24 +544,23 @@
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Apagar tudo"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Desenhe o seu padrão de desbloqueio"</string>
     <string name="media_format_gesture_explanation" msgid="4239529439389660159">"Você deve desenhar o seu padrão de desbloqueio para confirmar a formatação de um cartão SD."</string>
-    <string name="call_settings_title" msgid="5188713413939232801">"Configurações de chamada"</string>
+    <string name="call_settings_title" msgid="5188713413939232801">"Conf. De chamada"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurar correio voz, encaminhamento, espera etc."</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móveis"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Definir opções para roaming, redes, APNs"</string>
-    <!-- no translation found for location_title (1029961368397484576) -->
-    <skip />
+    <string name="location_title" msgid="1029961368397484576">"Meu Local"</string>
     <string name="location_network_based" msgid="8815705866861993344">"Usar redes sem fio"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Veja o local nos aplicativos (como o Google Maps) usando redes sem fio"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Local determinado pela rede Wi-Fi e/ou pelas redes móveis"</string>
-    <string name="location_gps" msgid="375912731641377120">"Ativar satélites GPS"</string>
-    <string name="location_street_level" msgid="5899941752252356344">"Durante a localização, a precisão chega no nível de rua (desmarque a seleção para conservar a bateria)"</string>
+    <string name="location_gps" msgid="6296125378829097831">"Usar satélites GPS"</string>
+    <string name="location_street_level" msgid="6460740847018275745">"Durante a localização, a precisão chega no nível de rua (desmarque para conservar a bateria)"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Localizar no nível da rua (exige mais bateria e visão do céu)"</string>
-    <!-- no translation found for use_location_title (7585990952633568732) -->
-    <skip />
-    <!-- no translation found for use_location_summary (4411467143899877395) -->
-    <skip />
-    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
-    <skip />
+    <string name="assisted_gps" msgid="4649317129586736885">"Usar GPS associado"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Usar servidor para auxiliar GPS (desmarque para reduzir o uso da rede)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Usar servidor para auxiliar GPS (desmarque para aprimorar o desempenho do GPS)"</string>
+    <string name="use_location_title" msgid="5447030582538504247">"Usar Meu Local"</string>
+    <string name="use_location_summary" msgid="1816849484040070431">"Usar Meu local para os resultados da pesquisa do Google e outros serviços do Google"</string>
+    <string name="use_location_warning_message" msgid="1420184860518262439">"Deseja permitir que o Google use o local para resultados de pesquisa aprimorados e outros serviços?"</string>
     <string name="agree" msgid="6288718671527758326">"Concordo"</string>
     <string name="disagree" msgid="6221069272309799230">"Não concordo"</string>
     <string name="about_settings" msgid="1743378368185371685">"Sobre o telefone"</string>
@@ -579,12 +570,15 @@
     <string name="copyright_title" msgid="865906688917260647">"Direitos autorais"</string>
     <string name="license_title" msgid="1990487604356037871">"Licença"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termos e Condições"</string>
-    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
-    <skip />
+    <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Tutorial do sistema"</string>
     <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Aprenda a usar o seu telefone"</string>
-    <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenças de código aberto"</string>
+    <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenças código aberto"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Há um problema ao carregar as licenças."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Carregando..."</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Informações de segurança"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informações de segurança"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"O telefone não está conectado ao serviço de dados. Para visualizar estas informações agora, acesse %s em qualquer computador conectado à internet."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Carregando..."</string>
     <string name="lock_settings_title" msgid="5828348303971852121">"Padrão de desbloqueio da tela"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Alterar padrão de desbloqueio"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmar padrão salvo"</string>
@@ -605,17 +599,17 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"É necessário desenhar o padrão para desbloquear a tela"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Usar padrão visível"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Usar feedback táctil"</string>
-    <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Definir padrão de desbloqueio"</string>
-    <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Alterar padrão de desbloqueio"</string>
+    <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Padrão de desbloqueio"</string>
+    <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Alterar padrão"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Como desenhar um padrão de desbloqueio"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Muitas tentativas incorretas!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Tente novamente em <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Cancelar"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Próximo"</string>
+    <string name="next_button_label" msgid="8890792540116568321">"Avançar"</string>
     <string name="lock_title" msgid="4059246467204273930">"Protegendo o seu telefone"</string>
-    <string name="lock_intro_message" msgid="5352897389718432077"><font size="17">"Proteja o seu telefone contra o uso não autorizado criando um padrão de desbloqueio de tela pessoal. "\n<font height="17">\n</font><b>"1"</b>"  Na próxima tela, observe enquanto um exemplo de padrão é desenhado. "\n<font height="17">\n</font><b>"2"</b>"  Quando estiver pronto, desenhe o seu próprio padrão de desbloqueio pessoal. Experimente padrões diferentes, mas conecte no mínimo quatro pontos. "\n<font height="17">\n</font><b>"3"</b>"  Desenhe novamente o seu padrão para confirmar. "\n<font height="17">\n</font><b>"Pronto para começar? Selecione “Próximo”"</b>". "\n<font height="3">\n</font>"Para deixar o seu telefone sem proteção, selecione “Cancelar”."</font></string>
+    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Proteja o seu telefone contra o uso não autorizado criando um padrão de desbloqueio de tela personalizado. "\n<font height="17">\n</font><b>"1"</b>"  Na próxima tela, observe enquanto um exemplo de padrão é desenhado. "\n<font height="17">\n</font><b>"2"</b>"  Quando estiver pronto, desenhe o seu próprio padrão de desbloqueio pessoal. Experimente padrões diferentes, mas conecte no mínimo quatro pontos. "\n<font height="17">\n</font><b>"3"</b>"  Desenhe novamente o seu padrão para confirmar. "\n<font height="17">\n</font><b>"Pronto para começar? Toque em “Avançar”"</b>". "\n<font height="3">\n</font>"Para deixar o seu telefone sem proteção, toque em “Cancelar”."</font></string>
     <string name="lock_example_title" msgid="8052305554017485410">"Exemplo de padrão"</string>
-    <string name="lock_example_message" msgid="7431982730914254881">"Conecte no mínimo quatro pontos."\n" "\n"Selecione “Próximo” quando estiver pronto para desenhar o seu próprio padrão."</string>
+    <string name="lock_example_message" msgid="1838650097090632706">"Conecte no mínimo quatro pontos."\n" "\n"Toque em “Avançar” quando estiver pronto para desenhar o seu próprio padrão."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Gerenciar aplicativos"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Gerenciar e remover aplicativos instalados"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Aplicativos"</string>
@@ -638,8 +632,7 @@
     <string name="data_size_label" msgid="8679376373625710107">"Dados"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstalar"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Limpar dados"</string>
-    <!-- no translation found for app_factory_reset (6635744722502563022) -->
-    <skip />
+    <string name="app_factory_reset" msgid="6635744722502563022">"Desinstalar atualizações"</string>
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Você selecionou a inicialização padrão deste aplicativo para algumas ações."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nenhum padrão definido."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Limpar padrão"</string>
@@ -650,47 +643,56 @@
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Selecionar as opções de filtro"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Todos"</string>
-    <string name="filter_apps_third_party" msgid="1096017647285183437">"Terceiros"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Download concluído"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Em execução"</string>
     <string name="loading" msgid="3200408047793887917">"Carregando..."</string>
     <string name="recompute_size" msgid="7722567982831691718">"Recalculando o tamanho…"</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Excluir"</string>
-    <string name="clear_data_dlg_text" msgid="8796694785488630642">"Todas as informações salvas neste aplicativo serão excluídas permanentemente."</string>
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"Todos os dados deste aplicativo serão excluídos permanentemente. Isso inclui todos os arquivos, configurações, contas, bancos de dados e outros."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Cancelar"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"Aplicativo não encontrado"</string>
     <string name="app_not_found_dlg_text" msgid="2980271680333341554">"O aplicativo não foi encontrado na lista de aplicativos instalados."</string>
     <string name="clear_data_failed" msgid="581956197586913865">"Não é possível limpar os dados do aplicativo."</string>
-    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
-    <skip />
-    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
-    <skip />
-    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
-    <skip />
-    <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
-    <skip />
+    <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Desinstalar atualizações"</string>
+    <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Deseja desinstalar todas as atualizações deste aplicativo do sistema Android?"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Limpar dados"</string>
+    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Falha ao limpar os dados do aplicativo"</string>
     <string name="security_settings_desc" msgid="3116027624526915561">"Este aplicativo pode acessar os seguintes itens no seu telefone:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Calculando…"</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Não é possível calcular o tamanho do pacote"</string>
-    <string name="empty_list_msg" msgid="1883660401486953588">"Você não tem aplicativos de terceiros instalados."</string>
-    <!-- no translation found for version_text (9189073826278676425) -->
-    <skip />
-    <string name="language_settings" msgid="2939555761536357092">"Local e texto"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"Definir opções de local (idioma e região), entrada de texto e correção automática"</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"Você não tem aplicativos de terceiros instalados."</string>
+    <string name="version_text" msgid="9189073826278676425">"versão <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"Serviços em execução"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Visualizar e controlar os serviços em execução no momento"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"Reiniciando"</string>
+    <string name="no_running_services" msgid="6981216347270280598">"Sem serviços em execução"</string>
+    <string name="confirm_stop_service" msgid="5700448757318301681">"Parar o serviço?"</string>
+    <string name="confirm_stop_service_msg" msgid="1202118456282395730">"O serviço não será mais executado até ser iniciado novamente. Isso pode ter consequências indesejáveis no aplicativo <xliff:g id="APPLICATION">%1$s</xliff:g>."</string>
+    <string name="confirm_stop_stop" msgid="7382363913280993331">"Parar"</string>
+    <string name="confirm_stop_cancel" msgid="206495326622692381">"Cancelar"</string>
+    <string name="service_started_by_app" msgid="8432097226392386802">"Iniciado pelo aplicativo: toque para parar"</string>
+    <string name="service_client_name" msgid="2337664610975074717">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: toque para gerenciar"</string>
+    <string name="service_background_processes" msgid="5158600475629177758">"Disp.: <xliff:g id="FREE">%2$s</xliff:g>+<xliff:g id="MEMORY">%3$s</xliff:g> em <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_foreground_processes" msgid="4013890350284680796">"Outro: <xliff:g id="MEMORY">%2$s</xliff:g> em <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_process_name" msgid="8630408984456958400">"Processo: <xliff:g id="PROCESS">%1$s</xliff:g>"</string>
+    <string name="language_settings" msgid="502219872342167227">"Idioma e teclado"</string>
+    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Configurações de idioma e teclado"</string>
+    <string name="language_settings_summary" msgid="595647729475399987">"Definir opções de idioma e região, entrada de texto e correção automática"</string>
     <string name="language_category" msgid="3391756582724541530">"Configuração de local"</string>
     <string name="text_category" msgid="6342540511465136739">"Configurações de texto"</string>
     <string name="phone_language" msgid="2138384312336494991">"Selecionar local"</string>
     <string name="phone_language_summary" msgid="1809580675831352352">"Selecionar o idioma e a região"</string>
     <string name="auto_replace" msgid="6199184757891937822">"Substituição automática"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Corrigir palavras digitadas incorretamente"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Iniciar com letra maiúscula automaticamente"</string>
+    <string name="auto_caps" msgid="581633131114124121">"Iniciar com maiúscula"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Escrever a primeira letra nas sentenças com letra maiúscula"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Pontuação automática"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Configurações de teclado físico"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Pressione a tecla de Espaço duas vezes para inserir \".\""</string>
     <string name="show_password" msgid="2198798062604049206">"Senhas visíveis"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Mostrar senha ao digitar"</string>
-    <string name="ime_security_warning" msgid="3458652708716006477">"Este método de entrada pode coletar todo o texto que você digitar, incluindo dados pessoais como senhas e números de cartão de crédito. Ele é proveniente do aplicativo <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Ativar este método de entrada?"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"Este método de entrada pode coletar todo o texto que você digitar, incluindo dados pessoais como senhas e números de cartão de crédito. Ele é proveniente do aplicativo <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Usar este método de entrada?"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicionário do usuário"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"Dicionário do usuário"</string>
     <string name="user_dict_settings_summary" msgid="2460427065601355471">"Adicionar e remover palavras do dicionário do usuário"</string>
@@ -718,7 +720,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Entrada de texto"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Gerenciar opções de entrada de texto"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Configurações de <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="4919680715154885028">"Configurações do teclado virtual"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Configurações do teclado virtual"</string>
     <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Teclado do dispositivo"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Configurações de teclado integrado"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Desenvolvimento"</string>
@@ -729,13 +731,11 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"A tela nunca entrará em inatividade enquanto estiver carregando."</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
-    <!-- no translation found for adb_warning_title (1756027479229533250) -->
-    <skip />
-    <!-- no translation found for adb_warning_message (5352555112049663033) -->
-    <skip />
+    <string name="adb_warning_title" msgid="6234463310896563253">"Permitir a depuração USB?"</string>
+    <string name="adb_warning_message" msgid="5352555112049663033">"A depuração USB serve apenas para fins de desenvolvimento. Ela pode ser usada para copiar dados entre o computador e o aparelho, instalar aplicativos no seu aparelho sem notificação e ler dados de registro."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Escolher o gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Escolher widget"</string>
-    <string name="battery_history_details_for" msgid="5189636461798594740">"Detalhes do UID %d"</string>
+    <string name="battery_history_details_for" msgid="5924639922153109669">"Detalhes do UID <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="battery_history_uid" msgid="1016606150528436298">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage" msgid="8010852371665217020">"Detalhes do uso da rede do <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
     <string name="battery_history_bytes_received" msgid="980307569180518302">"Bytes recebidos: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
@@ -746,14 +746,10 @@
     <string name="battery_history_system_time" msgid="2015862072724507547">"Tempo do sistema:"</string>
     <string name="battery_history_total_time" msgid="3618703970098556104">"Tempo total:"</string>
     <string name="battery_history_starts" msgid="9137453931978571696">"Inicia: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
-    <!-- no translation found for battery_history_days (7110262897769622564) -->
-    <skip />
-    <!-- no translation found for battery_history_hours (7525170329826274999) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
-    <skip />
-    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
-    <skip />
+    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
+    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
+    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
+    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
     <string name="battery_history_packages_sharing_this_uid" msgid="4101596071379250050">"Pacotes que compartilham este UID:"</string>
     <string name="battery_history_no_data" msgid="1177238743237067617">"Não há dados de uso da bateria disponíveis"</string>
     <string name="battery_history_sensor" msgid="2333488996028993982">"Sensor:"</string>
@@ -775,400 +771,209 @@
     <string name="app_name_label" msgid="2000949925256858308">"Aplicativo"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"Contagem"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Tempo de uso"</string>
-    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
-    <skip />
-    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
-    <skip />
-    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
-    <skip />
-    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
-    <skip />
-    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
-    <skip />
-    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
-    <skip />
-    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
-    <skip />
-    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
-    <skip />
-    <!-- no translation found for power_usage_summary (7237084831082848168) -->
-    <skip />
-    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
-    <skip />
-    <!-- no translation found for battery_since_reset (7464546661121187045) -->
-    <skip />
-    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
-    <skip />
+    <string name="accessibility_settings" msgid="3975902491934816215">"Acessibilidade"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Configurações de acessibilidade"</string>
+    <string name="accessibility_settings_summary" msgid="8185181964847149507">"Gerenciar opções de acessibilidade"</string>
+    <string name="toggle_accessibility_title" msgid="650839277066574497">"Acessibilidade"</string>
+    <string name="accessibility_services_category" msgid="8127851026323672607">"Serviços de acessibilidade"</string>
+    <string name="no_accessibility_services_summary" msgid="694578333333808159">"Nenhum serviço de acessibilidade instalado."</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Este serviço de acessibilidade pode coletar todo o texto que você digitar, incluindo dados pessoais e números de cartão de crédito, menos senhas. Ele também pode registrar as interações da interface do usuário. Ele é proveniente do aplicativo <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Usar este serviço de acessibilidade?"</string>
+    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Desativar acessibilidade?"</string>
+    <string name="power_usage_summary_title" msgid="5180282911164282324">"Uso da bateria"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"Onde a bateria tem sido usada"</string>
+    <string name="battery_since_unplugged" msgid="338073389740738437">"Uso da bateria desde a desconexão do aparelho"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"Uso da bateria desde a redefinição"</string>
+    <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> desde que foi desconectado"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <!-- no translation found for awake (387122265874485088) -->
-    <skip />
-    <!-- no translation found for wifi_on_time (4630925382578609056) -->
-    <skip />
-    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
-    <skip />
-    <!-- no translation found for usage_name_percent (1899151069711662289) -->
-    <skip />
-    <!-- no translation found for details_title (7564809986329021063) -->
-    <skip />
-    <!-- no translation found for details_subtitle (32593908269911734) -->
-    <skip />
-    <!-- no translation found for controls_subtitle (390468421138288702) -->
-    <skip />
-    <!-- no translation found for packages_subtitle (4736416171658062768) -->
-    <skip />
-    <!-- no translation found for power_screen (2353149143338929583) -->
-    <skip />
-    <!-- no translation found for power_wifi (2382791137776486974) -->
-    <skip />
-    <!-- no translation found for power_bluetooth (4373329044379008289) -->
-    <skip />
-    <!-- no translation found for power_cell (6596471490976003056) -->
-    <skip />
-    <!-- no translation found for power_phone (5392641106474567277) -->
-    <skip />
-    <!-- no translation found for power_idle (9055659695602194990) -->
-    <skip />
-    <!-- no translation found for usage_type_cpu (715162150698338714) -->
-    <skip />
-    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
-    <skip />
-    <!-- no translation found for usage_type_gps (7989688715128160790) -->
-    <skip />
-    <!-- no translation found for usage_type_phone (9108247984998041853) -->
-    <skip />
-    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
-    <skip />
-    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
-    <skip />
-    <!-- no translation found for usage_type_audio (6957269406840886290) -->
-    <skip />
-    <!-- no translation found for usage_type_video (4295357792078579944) -->
-    <skip />
-    <!-- no translation found for usage_type_on_time (3351200096173733159) -->
-    <skip />
-    <!-- no translation found for usage_type_no_coverage (3797004252954385053) -->
-    <skip />
-    <!-- no translation found for battery_action_stop (649958863744041872) -->
-    <skip />
-    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
-    <skip />
-    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
-    <skip />
-    <!-- no translation found for battery_action_display (5302763261448580102) -->
-    <skip />
-    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
-    <skip />
-    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
-    <skip />
-    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
-    <skip />
-    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
-    <skip />
-    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
-    <skip />
-    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
-    <skip />
-    <!-- no translation found for battery_desc_display (5432795282958076557) -->
-    <skip />
-    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
-    <skip />
-    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
-    <skip />
-    <!-- no translation found for battery_sugg_wifi (7542345142282261691) -->
-    <skip />
-    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
-    <skip />
-    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
-    <skip />
-    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
-    <skip />
-    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_gps (4145005297393800223) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
-    <skip />
-    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
-    <skip />
-    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
-    <skip />
-    <!-- no translation found for menu_stats_total (8973377864854807854) -->
-    <skip />
-    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
-    <skip />
-    <!-- no translation found for process_kernel_label (3916858646836739323) -->
-    <skip />
-    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
-    <skip />
-    <!-- no translation found for tts_settings (6454363854545277027) -->
-    <skip />
-    <!-- no translation found for tts_settings_summary (2627715231944602766) -->
-    <skip />
-    <!-- no translation found for tts_settings_title (5064947197040356736) -->
-    <skip />
-    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
-    <skip />
-    <!-- no translation found for use_default_tts_settings_summary (4253502106159206276) -->
-    <skip />
-    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
-    <skip />
-    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
-    <skip />
-    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
-    <skip />
-    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
-    <skip />
-    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
-    <skip />
-    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
-    <skip />
-    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
-    <skip />
-    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
-    <skip />
-    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
-    <skip />
-    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
-    <skip />
-    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
-    <skip />
-    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
-    <skip />
-    <!-- no translation found for tts_demo (405357591189935876) -->
-    <skip />
-    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
-    <skip />
-    <!-- no translation found for gadget_title (7455548605888590466) -->
-    <skip />
-    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
-    <skip />
-    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
-    <skip />
-    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
-    <skip />
-    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
-    <skip />
-    <!-- no translation found for vpn_a_username (6664733641993968692) -->
-    <skip />
-    <!-- no translation found for vpn_a_password (1537213632501483753) -->
-    <skip />
-    <!-- no translation found for vpn_save_username (1408415289165970790) -->
-    <skip />
-    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
-    <skip />
-    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
-    <skip />
-    <!-- no translation found for vpn_no_button (7620339571187119107) -->
-    <skip />
-    <!-- no translation found for vpn_back_button (192036339792734970) -->
-    <skip />
-    <!-- no translation found for vpn_mistake_button (1683383660912491270) -->
-    <skip />
-    <!-- no translation found for vpn_menu_done (93528279226907926) -->
-    <skip />
-    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
-    <skip />
-    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
-    <skip />
-    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
-    <skip />
-    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
-    <skip />
-    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
-    <skip />
-    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
-    <skip />
-    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
-    <skip />
-    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
-    <skip />
-    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
-    <skip />
-    <!-- no translation found for vpn_reconnect_from_lost (2442844155623372118) -->
-    <skip />
-    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
-    <skip />
-    <!-- no translation found for vpn_challenge_error_dialog_msg (6174901754230038601) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set_dialog_msg (8013052814131532765) -->
-    <skip />
-    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
-    <skip />
-    <!-- no translation found for vpn_remote_hung_up_error_dialog_msg (1566946015052633150) -->
-    <skip />
-    <!-- no translation found for vpn_type_title (6392933604218676224) -->
-    <skip />
-    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
-    <skip />
-    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
-    <skip />
-    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
-    <skip />
-    <!-- no translation found for vpns (3148141862835492816) -->
-    <skip />
-    <!-- no translation found for vpn_connecting (8039521381692090116) -->
-    <skip />
-    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
-    <skip />
-    <!-- no translation found for vpn_connected (7641723116362845781) -->
-    <skip />
-    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
-    <skip />
-    <!-- no translation found for vpn_name (1550918148476193076) -->
-    <skip />
-    <!-- no translation found for vpn_a_name (8445736942405283509) -->
-    <skip />
-    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
-    <skip />
-    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
-    <skip />
-    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
-    <skip />
-    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
-    <skip />
-    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
-    <skip />
-    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
-    <skip />
-    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
-    <skip />
-    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
-    <skip />
-    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
-    <skip />
-    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
-    <skip />
-    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
-    <skip />
-    <!-- no translation found for vpn_pptp_encryption_title (2236795167467896499) -->
-    <skip />
-    <!-- no translation found for vpn_pptp_encryption (2602329949737259686) -->
-    <skip />
-    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
-    <skip />
-    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
-    <skip />
-    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
-    <skip />
-    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
-    <skip />
-    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
-    <skip />
-    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
-    <skip />
-    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
-    <skip />
-    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
-    <skip />
-    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
-    <skip />
-    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
-    <skip />
-    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
-    <skip />
-    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
-    <skip />
-    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
-    <skip />
-    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
-    <skip />
-    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
-    <skip />
-    <!-- no translation found for vpn_secret_unchanged (8700613973594154529) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set (1037792636371641845) -->
-    <skip />
-    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
-    <skip />
-    <!-- no translation found for cstor_access_title (1739505390736236717) -->
-    <skip />
-    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
-    <skip />
-    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
-    <skip />
-    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
-    <skip />
-    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
-    <skip />
-    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
-    <skip />
-    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
-    <skip />
-    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
-    <skip />
-    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
-    <skip />
-    <!-- no translation found for cstor_credential_password (7187440553141199409) -->
-    <skip />
-    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
-    <skip />
-    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
-    <skip />
-    <!-- no translation found for cstor_old_password (979282118063084561) -->
-    <skip />
-    <!-- no translation found for cstor_new_password (6218562692435670047) -->
-    <skip />
-    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
-    <skip />
-    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
-    <skip />
-    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
-    <skip />
-    <!-- no translation found for cstor_password_error (2917326097260402464) -->
-    <skip />
-    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
-    <skip />
-    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
-    <skip />
-    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
-    <skip />
-    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
-    <skip />
-    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
-    <skip />
-    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
-    <skip />
-    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
-    <skip />
-    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
-    <skip />
-    <!-- no translation found for cstor_storage_error (7140697503172458161) -->
-    <skip />
-    <!-- no translation found for cstor_unable_to_save_cert (1631402544447196406) -->
-    <skip />
-    <!-- no translation found for cstor_cert_not_saved (6318149789449538491) -->
-    <skip />
-    <!-- no translation found for cstor_is_reset (449870501126790589) -->
-    <skip />
-    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
-    <skip />
-    <!-- no translation found for cstor_is_added (794788474010251572) -->
-    <skip />
-    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
-    <skip />
-    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <string name="awake" msgid="387122265874485088">"Tempo de ativação do aparelho"</string>
+    <string name="wifi_on_time" msgid="4630925382578609056">"Tempo de ativação da rede WiFi"</string>
+    <string name="bluetooth_on_time" msgid="4478515071957280711">"Tempo de ativação da rede WiFi"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
+    <string name="details_title" msgid="7564809986329021063">"Detalhes de uso da bateria"</string>
+    <string name="details_subtitle" msgid="32593908269911734">"Detalhes de uso"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"Ajustar uso de energia"</string>
+    <string name="packages_subtitle" msgid="4736416171658062768">"Pacotes incluídos"</string>
+    <string name="power_screen" msgid="2353149143338929583">"Tela"</string>
+    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
+    <string name="power_cell" msgid="6596471490976003056">"Célula em espera"</string>
+    <string name="power_phone" msgid="5392641106474567277">"Chamadas de voz"</string>
+    <string name="power_idle" msgid="9055659695602194990">"Telefone ocioso"</string>
+    <string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
+    <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU prioritária"</string>
+    <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
+    <string name="usage_type_phone" msgid="9108247984998041853">"Telefone"</string>
+    <string name="usage_type_data_send" msgid="2857401966985425427">"Dados enviados"</string>
+    <string name="usage_type_data_recv" msgid="7251090882025234185">"Dados recebidos"</string>
+    <string name="usage_type_audio" msgid="6957269406840886290">"Áudio"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"Vídeo"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"Horário de ativação"</string>
+    <string name="usage_type_no_coverage" msgid="3797004252954385053">"Horário sem o sinal"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"Forçar parada"</string>
+    <string name="battery_action_app_details" msgid="3275013531871113681">"Informações do aplicativo"</string>
+    <string name="battery_action_app_settings" msgid="350562653472577250">"Configurações do aplicativo"</string>
+    <string name="battery_action_display" msgid="5302763261448580102">"Configurações da tela"</string>
+    <string name="battery_action_wifi" msgid="5452076674659927993">"Configurações de WiFi"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Conf. de Bluetooth"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"Bateria usada por chamadas de voz"</string>
+    <string name="battery_desc_standby" msgid="3009080001948091424">"Bateria usada quando o telefone está ocioso"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"Bateria usada por rádio celular"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"Alternar para o modo para avião para economizar energia nas áreas sem cobertura celular"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"Bateria usada pela tela e pela luz de fundo"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"Reduzir o brilho e/ou o tempo limite da tela"</string>
+    <string name="battery_desc_wifi" msgid="1702486494565080431">"Bateria usada por Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="7542345142282261691">"Desativar rede Wi-Fi quando não estiver em uso ou disponível"</string>
+    <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Bateria usada por Bluetooth"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Desativar Bluetooth quando não estiver em uso"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Tente conectar a um dispositivo Bluetooth diferente"</string>
+    <string name="battery_desc_apps" msgid="8123202939321333639">"Bateria usada por aplicativos em execução"</string>
+    <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Parar ou desinstalar o aplicativo"</string>
+    <string name="battery_sugg_apps_gps" msgid="4145005297393800223">"Desativar GPS quando não estiver em uso"</string>
+    <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"O aplicativo pode oferecer configurações para reduzir o uso da bateria"</string>
+    <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que foi desconectado"</string>
+    <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Quando foi desconectado pela última vez para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_total" msgid="8973377864854807854">"Total de uso"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"Atualizar"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"Sistema operacional do Android"</string>
+    <string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor de mídia"</string>
+    <string name="tts_settings" msgid="3348626948015962987">"Conversão de texto em voz"</string>
+    <string name="tts_settings_summary" msgid="2627715231944602766">"Definir opções de conversão de texto em fala"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Configurações da Conversão de texto em voz"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Usar minhas config."</string>
+    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"As conf. padrão abaixo substituem as conf. do aplicativo"</string>
+    <string name="tts_default_settings_section" msgid="5787915620218907443">"Configurações padrão"</string>
+    <string name="tts_default_rate_title" msgid="6030550998379310088">"Taxa de fala"</string>
+    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Velocidade em que o texto é falado"</string>
+    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Frequência do som"</string>
+    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afeta o tom do texto falado"</string>
+    <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Define a voz específica do idioma para o texto falado"</string>
+    <string name="tts_play_example_title" msgid="7094780383253097230">"Ouça um exemplo"</string>
+    <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproduzir uma rápida demonstração da voz sintetizada"</string>
+    <string name="tts_install_data_title" msgid="4264378440508149986">"Instalar dados de voz"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"É necessário instalar os dados de voz para a sintetização da fala"</string>
+    <string name="tts_data_installed_summary" msgid="9162111552859972809">"As vozes necessárias para sintetização já estão instaladas corretamente"</string>
+    <string name="tts_demo" msgid="405357591189935876">"Este é um exemplo de sintetização de voz."</string>
+    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Suas configurações foram alteradas. Veja um exemplo de como elas ficaram."</string>
+    <string name="gadget_title" msgid="7455548605888590466">"Controle de energia"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Atualizando configuração Wi-Fi"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Atualizando configuração Bluetooth"</string>
+    <string name="credential_installer_activity_title" msgid="7600661521831762521">"Instalador de credenciais"</string>
+    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Configurações de VPN"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"Conectar-se a <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpn_username_colon" msgid="7854930370861306247">"Nome de usuário:"</string>
+    <string name="vpn_password_colon" msgid="5716278710848606626">"Senha:"</string>
+    <string name="vpn_a_username" msgid="6664733641993968692">"um nome de usuário"</string>
+    <string name="vpn_a_password" msgid="1537213632501483753">"uma senha"</string>
+    <string name="vpn_save_username" msgid="1408415289165970790">"Lembrar nome de usuário"</string>
+    <string name="vpn_connect_button" msgid="1699007212602470655">"Conectar"</string>
+    <string name="vpn_yes_button" msgid="8034531001149843119">"Sim"</string>
+    <string name="vpn_no_button" msgid="7620339571187119107">"Não"</string>
+    <string name="vpn_back_button" msgid="192036339792734970">"Voltar"</string>
+    <string name="vpn_mistake_button" msgid="1683383660912491270">"Não"</string>
+    <string name="vpn_menu_done" msgid="93528279226907926">"Salvar"</string>
+    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Cancelar"</string>
+    <string name="vpn_menu_revert" msgid="4407762442281467659">"Reverter"</string>
+    <string name="vpn_menu_connect" msgid="1089399414463784218">"Conectar-se à rede"</string>
+    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Desconectar da rede"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Editar rede"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Excluir rede"</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Insira <xliff:g id="CODE">%s</xliff:g>."</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Selecione <xliff:g id="OPTION">%s</xliff:g>."</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"O nome de VPN \'<xliff:g id="NAME">%s</xliff:g>\' já existe. Procure outro nome."</string>
+    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Tem certeza de que deseja excluir esta VPN?"</string>
+    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Tem certeza de que não deseja criar esse perfil?"</string>
+    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Tem certeza de que deseja descartar as alterações feitas nesse perfil?"</string>
+    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Não é possível se conectar à rede. Deseja tentar novamente?"</string>
+    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Conexão perdida. Deseja conectar novamente?"</string>
+    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"O nome do servidor não pode ser solucionado. Deseja verificar sua configuração de nome de servidor?"</string>
+    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Erro de desafio. Deseja verificar sua configuração de pergunta secreta?"</string>
+    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Um ou mais segredos estão faltando nessa configuração de VPN. Deseja verificar sua configuração de pergunta secreta?"</string>
+    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"O nome de usuário ou a senha inserida está incorreta. Deseja tentar novamente?"</string>
+    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Servidor desligado. O nome de usuário ou a senha inserida talvez esteja incorreta. Deseja tentar novamente?"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Servidor desconectado. Talvez você esteja atrás de um firewall que impede a conexão com o servidor. Deseja tentar novamente?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Falha na negociação do servidor. Provavelmente o servidor não concorde com a sua opção de criptografia. Deseja verificar a sua configuração de criptografia?"</string>
+    <string name="vpn_type_title" msgid="6392933604218676224">"Adicionar VPN"</string>
+    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Adicionar VPN"</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Adicionar VPN <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Detalhes de <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpns" msgid="3148141862835492816">"VPNs"</string>
+    <string name="vpn_connecting" msgid="8039521381692090116">"Conectando..."</string>
+    <string name="vpn_disconnecting" msgid="7748050200708257066">"Desconectando..."</string>
+    <string name="vpn_connected" msgid="7641723116362845781">"Conectado"</string>
+    <string name="vpn_connect_hint" msgid="7442898962925875181">"Conectar-se à rede"</string>
+    <string name="vpn_name" msgid="1550918148476193076">"Nome da VPN"</string>
+    <string name="vpn_a_name" msgid="8445736942405283509">"um nome da VPN"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"\'<xliff:g id="NAME">%s</xliff:g>\' foi adicionado"</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"Foram feitas alterações em \'<xliff:g id="NAME">%s</xliff:g>\'"</string>
+    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Definir certificado do usuário"</string>
+    <string name="vpn_user_certificate" msgid="949322691686938888">"Certificado do usuário"</string>
+    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"um certificado do usuário"</string>
+    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Definir certificado de CA"</string>
+    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certificado da autoridade de certificação (CA)"</string>
+    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"um certificado de CA"</string>
+    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Definir segredo L2TP"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Segredo L2TP"</string>
+    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"um segredo L2TP"</string>
+    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"criptografia"</string>
+    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Criptografia PPTP"</string>
+    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Definir chave pré-compartilhada IPSec"</string>
+    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Chave pré-compartilhada IPSec"</string>
+    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"uma chave pré-compartilhada IPSec"</string>
+    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Definir servidor da VPN"</string>
+    <string name="vpn_vpn_server" msgid="1141754908824209260">"Servidor da VPN"</string>
+    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"um servidor da VPN"</string>
+    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Nome do servidor da VPN"</string>
+    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Domínios de pesquisa DNS"</string>
+    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Domínios de pesquisa DNS"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> foi definido"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> não definido"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> não definido (opcional)"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"Ativar <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"Desativar <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> foi ativado"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> foi desativado"</string>
+    <string name="vpn_settings_title" msgid="7327468307909556719">"Configurações de VPN"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"Configurar e gerenciar VPNs (Redes privadas virtuais)"</string>
+    <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(não alterado)"</string>
+    <string name="vpn_secret_not_set" msgid="1037792636371641845">"(não definido)"</string>
+    <string name="credentials_category" msgid="8536992056377271234">"Armazenamento de credenciais"</string>
+    <string name="credentials_access" msgid="4843187230913860492">"Usar credenciais seguras"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"Permitir que os aplicativos acessem certificados seguros e outras credenciais"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"Inserir senha"</string>
+    <string name="credentials_unlock_hint" msgid="594679530407918031">"Insira a senha do armazenamento de credenciais."</string>
+    <string name="credentials_install_certificates" msgid="177337517568022236">"Instalar do cartão SD"</string>
+    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Instalar certificados criptografados do cartão SD"</string>
+    <string name="credentials_set_password" msgid="9104473585811899989">"Definir senha"</string>
+    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Definir ou alterar a senha do armazenamento de credenciais"</string>
+    <string name="credentials_reset" msgid="9170150870552453457">"Limpar armazenamento"</string>
+    <string name="credentials_reset_summary" msgid="1530388094693731636">"Remover todo o conteúdo do armazenamento de credenciais e redefinir a senha"</string>
+    <string name="credentials_reset_hint" msgid="819990295796804516">"Tem certeza de que deseja excluir todas as credenciais e redefinir a senha do armazenamento de credenciais?"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"Senha atual:"</string>
+    <string name="credentials_new_password" msgid="267487774686796938">"Nova senha:"</string>
+    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmar nova senha:"</string>
+    <string name="credentials_first_time_hint" msgid="1567821077545346039">"Definir uma senha para o armazenamento de credenciais (no mínimo 8 caracteres)"</string>
+    <string name="credentials_wrong_password" msgid="7525192410790152041">"Insira a senha correta."</string>
+    <string name="credentials_reset_warning" msgid="6392481296673345268">"Insira a senha correta. Você tem mais uma tentativa para inserir a senha correta antes que o armazenamento de credenciais seja apagado."</string>
+    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Insira a senha correta. Você tem mais <xliff:g id="NUMBER">%1$d</xliff:g> tentativas para inserir a senha correta antes que o armazenamento de credenciais seja apagado."</string>
+    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"As senhas não correspondem."</string>
+    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Insira e confirme uma senha."</string>
+    <string name="credentials_password_empty" msgid="8292138152983330473">"Insira a senha."</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"A senha deve ter no mínimo 8 caracteres."</string>
+    <string name="credentials_erased" msgid="7700309135582200849">"O armazenamento de credenciais foi apagado."</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"O armazenamento de credenciais foi ativado."</string>
+    <string name="credentials_disabled" msgid="7453188089059045380">"O armazenamento de credenciais foi desativado."</string>
+    <string name="emergency_tone_title" msgid="1055954530111587114">"Tom de emergência"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"Definir comportamento durante uma chamada de emergência"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Privacidade"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Configurações de privacidade"</string>
+    <string name="location_section_title" msgid="6072558684044939786">"Local"</string>
+    <string name="settings_section_title" msgid="7413252428447723032">"Configurações"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Dados pessoais"</string>
+    <string name="backup_settings_title" msgid="2968262658155327829">"Fazer backup de minhas configurações"</string>
+    <string name="backup_erase_dialog_title" msgid="6028429904055779443">"Backup das configurações"</string>
+    <string name="backup_erase_dialog_message" msgid="9096433810456900531">"Tem certeza de que deseja parar de fazer backup das suas configurações e apagar todas as cópias nos servidores do Google?"</string>
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
     <skip />
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index f2fd25f44f7..353e6acb608 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -24,38 +24,59 @@
     <item msgid="5345178126174698955">"Тихий океан"</item>
     <item msgid="8392017019801393511">"Все"</item>
   </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"Без анимации"</item>
+    <item msgid="6291186755504776720">"Анимация в отдельных случаях"</item>
+    <item msgid="3856065399819979491">"Все анимации"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"Анимация в окне не отображается"</item>
+    <item msgid="4460915688877708508">"В окне отображается некоторая часть анимации"</item>
+    <item msgid="488968798204105119">"В окне отображается вся анимация полностью"</item>
+  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 секунд"</item>
     <item msgid="8881760709354815449">"30 секунд"</item>
     <item msgid="7589406073232279088">"1 минута"</item>
     <item msgid="7001195990902244174">"2 минуты"</item>
     <item msgid="5721688686241190620">"10 минут"</item>
-    <item msgid="1781492122915870416">"Не отключать"</item>
+    <item msgid="7156442995039264948">"30 минут"</item>
+  </string-array>
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Очень медленная"</item>
+    <item msgid="2361722960903353554">"Медленная"</item>
+    <item msgid="1145554631248513562">"Обычная"</item>
+    <item msgid="7553665153391107454">"Быстрая"</item>
+    <item msgid="2538100882620724753">"Очень быстро"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item msgid="7526050907652687351">"Очень низкий"</item>
+    <item msgid="2692137425242433765">"Низкий"</item>
+    <item msgid="3332408460740717754">"Обычный"</item>
+    <item msgid="4907380534957572531">"Высокий"</item>
+    <item msgid="4699640516390840297">"Очень высокий"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item msgid="478030717868306353">"Английский (США)"</item>
+    <item msgid="5192284521396794598">"Английский (Великобритания)"</item>
+    <item msgid="3000262452051711991">"Французский"</item>
+    <item msgid="9214080387341763401">"Немецкий"</item>
+    <item msgid="5972100016440094433">"Итальянский"</item>
+    <item msgid="5811378076054402537">"Испанский"</item>
+  </string-array>
+  <string-array name="wifi_security_entries">
+    <item msgid="2923732046112398627">"Авто"</item>
+    <item msgid="5434666299123318296">"Нет"</item>
+    <item msgid="3159594845889645948">"WEP"</item>
+    <item msgid="1687348101566181433">"WPA/WPA2 PSK"</item>
+    <item msgid="329777238762866787">"802.1x Enterprise"</item>
+  </string-array>
+  <string-array name="wifi_security_without_auto_entries">
+    <item msgid="4402120432904877907">"Нет"</item>
+    <item msgid="2329148995431627488">"WEP"</item>
+    <item msgid="6903317668294332381">"WPA/WPA2 PSK"</item>
+    <item msgid="7280821339307729710">"802.1x Enterprise"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
-    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
-    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
-    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
-    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
-    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
-    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
-    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
-    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
-    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
-    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
-    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
-    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
-    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
-    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
-    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
-    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
-    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
-    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
-    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
-    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
-    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
-    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
-    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
   <string-array name="wifi_wep_type">
     <item msgid="1497433962958697183">"Авто"</item>
     <item msgid="7182335713815377158">"WEP ASCII"</item>
@@ -75,7 +96,7 @@
     <item msgid="4832254146664706277">"Прочее использование"</item>
   </string-array>
   <string-array name="battery_history_which_spinner">
-    <item msgid="3451981114763440074">"С последнего отключения питания"</item>
+    <item msgid="3451981114763440074">"После последнего отключения питания"</item>
     <item msgid="166936313535197598">"Всего с момента загрузки"</item>
     <item msgid="4793941382744963893">"Всего за все время"</item>
   </string-array>
@@ -84,15 +105,27 @@
     <item msgid="1908750532762193304">"Начать подсчет"</item>
     <item msgid="1213951670006606353">"Название приложения"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
-    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
-    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
-    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
-    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
-    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
-    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
-    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
-    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
-    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
-    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="1818786254010764570">"Нет"</item>
+    <item msgid="6189918678874123056">"PAP"</item>
+    <item msgid="1524112260493662517">"MSCHAP"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
+    <item msgid="8651992560135239389">"GTC"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Выкл."</item>
+    <item msgid="3165868966179561687">"Оповещение"</item>
+    <item msgid="6038758039030476855">"Вибрация"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"Нет"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP или CHAP"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 356bb9f18ed..75f6458ceab 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -15,6 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"Да"</string>
+    <string name="no" msgid="6731231425810196216">"Нет"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Неизвестно"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Включить радио"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Отключить радио"</string>
@@ -56,6 +58,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"ОК"</string>
     <string name="sdcard_setting" msgid="5922637503871474866">"SD-карта"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Состояние батареи:"</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"Питание:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Шкала батареи:"</string>
     <string name="battery_info_level_label" msgid="8706526709307788737">"Уровень заряда батареи:"</string>
     <string name="battery_info_health_label" msgid="6416051542741886958">"Уровень заряда батареи:"</string>
@@ -75,6 +78,11 @@
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"Разрядка батареи"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не заряжается"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Полностью"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Не подключено"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"Питание от сети"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"Питание от сети и USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"Неизвестно"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Неизвестно"</string>
     <string name="battery_info_health_good" msgid="8070356565806711806">"Хорошо"</string>
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"Перегрев"</string>
@@ -89,7 +97,7 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Имя устройства"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Без настройки имени, использовать имя аккаунта"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Поиск устройств"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет отключено."</string>
+    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"Связь с <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет разорвана."</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Подключено"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Отключено"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Отключение..."</string>
@@ -104,14 +112,19 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Запрос сопряжения Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Запрос на сопряжение"</string>
     <string name="bluetooth_notif_message" msgid="5381418499788668724">"Выберите для сопряжения с "</string>
+    <string name="device_picker" msgid="8721012448931226323">"Выбор устройства Bluetooth"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Запрос разрешения на включение Bluetooth"</string>
+    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Приложение на вашем телефоне запрашивает разрешение на включение Bluetooth. Разрешить?"</string>
+    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Приложение на вашем телефоне запрашивает разрешение на включение видимого режима Bluetooth на <xliff:g id="TIMEOUT">%1$d</xliff:g> с. Разрешить?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Приложение на вашем телефоне запрашивает разрешение на включение Bluetooth и видимого режима на <xliff:g id="TIMEOUT">%1$d</xliff:g> с. Разрешить?"</string>
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Включается Bluetooth..."</string>
     <string name="date_and_time" msgid="4114084177056654663">"Настройки даты и времени"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 pm"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
     <string name="date_time_changeTime_text" msgid="7037437020000867740">"Изменить время"</string>
     <string name="date_time_changeDate_text" msgid="5259762626498028057">"Дата"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Выбрать часовой пояс"</string>
-    <!-- no translation found for normal_date_format (1982904221918374153) -->
-    <skip />
+    <string name="normal_date_format" msgid="1982904221918374153">"Обычный (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Предварительный просмотр:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Размер шрифта:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -192,35 +205,25 @@
     <string name="proxy_settings_label" msgid="3271174136184391743">"Настройки прокси-сервера"</string>
     <string name="cancel" msgid="6859253417269739139">"Отмена"</string>
     <string name="settings_label" msgid="1626402585530130914">"Настройки"</string>
-    <!-- no translation found for settings_shortcut (3672145147925639262) -->
-    <skip />
+    <string name="settings_shortcut" msgid="3672145147925639262">"Настройки"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Режим полета"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Отключить все беспроводные соединения"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Отключение беспроводных соединений..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Включение беспроводных соединений..."</string>
-    <string name="radio_controls_title" msgid="8356991079873437337">"Настройки беспроводных модулей"</string>
-    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
-    <skip />
-    <!-- no translation found for roaming (3596055926335478572) -->
-    <skip />
-    <!-- no translation found for roaming_enable (3737380951525303961) -->
-    <skip />
-    <!-- no translation found for roaming_disable (1295279574370898378) -->
-    <skip />
-    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
-    <skip />
-    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
-    <skip />
-    <!-- no translation found for roaming_warning (1269870211689178511) -->
-    <skip />
-    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
-    <skip />
-    <!-- no translation found for networks (6333316876545927039) -->
-    <skip />
-    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
-    <skip />
+    <string name="radio_controls_title" msgid="5868688473587168882">"Беспроводные сети"</string>
+    <string name="wireless_networks_settings_title" msgid="149274247949769551">"Настройки беспроводных модулей"</string>
+    <string name="radio_controls_summary" msgid="2998818677094465517">"Wi-Fi, Bluetooth, режим полета, мобильные сети и VPN"</string>
+    <string name="roaming" msgid="3596055926335478572">"Интернет-роуминг"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Подключаться к службам передачи данных при роуминге"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Подключаться к службам передачи данных при роуминге"</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"Передача данных прекращена, потому что телефон находится за пределами домашней сети, а интернет-роуминг выключен."</string>
+    <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Включить"</string>
+    <string name="roaming_warning" msgid="1269870211689178511">"Разрешить интернет-роуминг? Возможны высокие расходы за использование роуминга."</string>
+    <string name="roaming_reenable_title" msgid="7626425894611573131">"Внимание"</string>
+    <string name="networks" msgid="6333316876545927039">"Выбор оператора"</string>
+    <string name="sum_carrier_select" msgid="6648929373316748020">"Выберите оператора связи"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Дата и время"</string>
-    <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Настроить часовой пояс, форматы даты и времени"</string>
+    <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Установка даты, времени, часового пояса и форматов"</string>
     <string name="date_time_auto" msgid="3086083265745944725">"Автоматически"</string>
     <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Использовать данные, предоставленные сетью"</string>
     <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Использовать данные, предоставленные сетью"</string>
@@ -231,25 +234,31 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Выбрать формат даты"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Упорядочить по алфавиту"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Упорядочить по часовому поясу"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"Безопасность и место"</string>
-    <!-- no translation found for security_settings_summary (967393342537986570) -->
-    <skip />
+    <string name="security_settings_title" msgid="5168491784222013179">"Местоположение и безопасность"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"Настройки местоположения и безопасности"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Пароли"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Включить Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Настройки Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Настройки Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Настройка подключений, видимости и имени устройства"</string>
-    <string name="bluetooth_pin_entry" msgid="5627349871303455279">"Запрос сопряжения Bluetooth"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Запрос сопряжения Bluetooth"</string>
     <string name="bluetooth_device_info" msgid="6644515376523965073">"Сведения об устройстве Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="7551139612735632370">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Введите PIN-код для сопряжения."\n"(Попробуйте 0000 или 1234.)"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Введите PIN-код для сопряжения с <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. (Попробуйте 0000 или 1234.)"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Введите ключ доступа для сопряжения с <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Для сопряжения с \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" подтвердите, что показывается ключ доступа: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"запрашивает сопряжение."</string>
+    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Введите <xliff:g id="PASSKEY">%2$s</xliff:g> на <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, чтобы выполнить сопряжение."</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Сопряжение"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Не устанавливать сопряжение"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"устройство Bluetooth"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Внимание"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Неполадка при сопряжении с <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="6938408362011024289">"Неполадка при сопряжении с <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Введен неверный PIN."</string>
-    <!-- no translation found for bluetooth_pairing_device_down_error_message (6688215193824686741) -->
-    <skip />
-    <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
-    <skip />
+    <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Неполадка при сопряжении с <xliff:g id="DEVICE_NAME">%1$s</xliff:g> из-за неверно введенного PIN-кода или ключа доступа."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"Не удается установить соединение с <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> не разрешает сопряжение."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Возникла неполадка при подключении к <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Поиск устройств"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Подключить"</string>
@@ -261,6 +270,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Подключить к..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Мультимедиа"</string>
     <string name="bluetooth_profile_headset" msgid="1874975688666658946">"Телефон"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Передать"</string>
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Подключено к мультимедийному аудиоустройству"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Подключено к аудиоустройству телефона"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Подключено к телефону и мультимедийному аудиоустройству"</string>
@@ -270,8 +280,11 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Профили"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Подключено к мультимедийному аудиоустройству"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Подключено к аудиоустройству телефона"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Установлено подключение к серверу передачи файлов"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Нет подключения к серверу передачи файлов"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Использовать для мультимедийного аудиоустройства"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Использовать для аудиоустройства телефона"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Используется для передачи файлов"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Включить Wi-Fi"</string>
@@ -288,25 +301,13 @@
     <string name="security" msgid="1040691896987225267">"Безопасность"</string>
     <string name="wifi_security_open" msgid="3513305614048816607">"Открыть"</string>
     <string name="wifi_security_wep" msgid="7082604129842065776">"WEP"</string>
-    <string name="wifi_security_wpa" msgid="8980169410565477162">"WPA"</string>
-    <string name="wifi_security_wpa2" msgid="5780665935088930524">"WPA2"</string>
-    <!-- no translation found for wifi_security_wpa_eap (7485687331651751101) -->
-    <skip />
-    <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
-    <skip />
+    <string name="wifi_security_psk" msgid="3392399380570381452">"WPA/WPA2 PSK"</string>
+    <string name="wifi_security_eap" msgid="8309434150934969132">"Enterprise (802.1x)"</string>
     <string name="wifi_security_unknown" msgid="4564208312073060668">"Неизвестно"</string>
-    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
-    <skip />
+    <string name="wifi_security_verbose_open" msgid="8117878112088901945">"открытая сеть"</string>
+    <string name="wifi_security_verbose_wep" msgid="9220757688700421508">"защищено WEP"</string>
+    <string name="wifi_security_verbose_psk" msgid="1110130025330416225">"защищено WPA/WPA2 PSK"</string>
+    <string name="wifi_security_verbose_eap" msgid="586632662086063">"защищено 802.1x EAP"</string>
     <string name="ip_address" msgid="850672263358989449">"IP-адрес"</string>
     <string name="signal" msgid="1947969631626413228">"Громкость сигнала"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"Включение..."</string>
@@ -319,28 +320,19 @@
     <string name="error_saving" msgid="8294279443961615302">"Не удалось сохранить сеть"</string>
     <string name="connect" msgid="3079076576295839400">"Подключить"</string>
     <string name="connect_to_blank" msgid="6950910074058025378">"Подключить к <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for please_select_eap (4488240331626456338) -->
-    <skip />
-    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
-    <skip />
-    <!-- no translation found for please_type_identity (7061261155499513089) -->
-    <skip />
-    <!-- no translation found for please_type_anonymous_identity (835061562079965048) -->
-    <skip />
-    <!-- no translation found for please_select_client_certificate (2137906961594663234) -->
-    <skip />
-    <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
-    <skip />
-    <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
-    <skip />
+    <string name="please_select_eap" msgid="4488240331626456338">"Метод EAP"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"2-й этап аутентификации"</string>
+    <string name="please_type_identity" msgid="7061261155499513089">"Идентификационный код"</string>
+    <string name="please_type_anonymous_identity" msgid="835061562079965048">"Идентификационный код без определения личности"</string>
+    <string name="please_select_client_certificate" msgid="2137906961594663234">"Сертификат клиента"</string>
+    <string name="please_select_ca_certificate" msgid="5010815181914420677">"Сертификат центра сертификации"</string>
     <string name="please_type_passphrase" msgid="8256017704131522462">"Пароль для беспроводного подключения"</string>
     <string name="please_type_hex_key" msgid="8751224390407867551">"Шестнадцатеричный ключ WEP (0-9, A-F)"</string>
     <string name="wifi_show_password" msgid="4235237470701732009">"Показать пароль."</string>
     <string name="scan_wifi" msgid="2459901725350542606">"Поиск"</string>
     <string name="summary_not_in_range" msgid="3926674700733548684">"Вне диапазона"</string>
-    <!-- no translation found for summary_remembered (6079941090549401742) -->
-    <skip />
-    <string name="summary_connection_failed" msgid="7610394657613410489">"Не удалось установить соединение. Выберите, чтобы повторить попытку"</string>
+    <string name="summary_remembered" msgid="6079941090549401742">"сохранено в памяти"</string>
+    <string name="summary_connection_failed" msgid="2351885658101671413">"Не удалось установить соединение. Нажмите, чтобы повторить попытку."</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Сети Wi-Fi"</string>
     <string name="wifi_type_ssid" msgid="1326839657083292017">"Сетевой SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Безопасность"</string>
@@ -391,8 +383,9 @@
     <string name="status_disconnected" msgid="7561688569905126046">"Отключено"</string>
     <string name="status_failed" msgid="610462050405904601">"Сбой"</string>
     <string name="sound_and_display_settings" msgid="349770582993029003">"Звук и изображение"</string>
+    <string name="sound_and_display_settings_title" msgid="5036144539683697330">"Звук и изображение"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Настройки звука"</string>
-    <string name="sound_and_display_settings_summary" msgid="1433943789593286064">"Настроить мелодии, уведомления, яркость экрана"</string>
+    <string name="sound_and_display_settings_summary" msgid="1433943789593286064">"Настройка мелодий, уведомлений, яркости экрана"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Тихий режим"</string>
     <string name="silent_mode_summary" msgid="9081534746589616108">"Все звуки, кроме мультимедиа и сигналов, отключены"</string>
     <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Все звуки, кроме аудио и видео, отключены"</string>
@@ -414,19 +407,18 @@
     <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Воспроизводить тональные сигналы клавиатуры"</string>
     <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Воспроизводить тональные сигналы клавиатуры"</string>
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"Звук при нажатии"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Воспроизводить тональный сигнал при выборе экрана"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Воспроизводить звук при нажатии на экран"</string>
+    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"При нажатии на экран будет слышен звук"</string>
+    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"При нажатии на экран звука не будет"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Обратная связь"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Вибрация при нажатии софт-клавиш и некоторых элементов интерфейса"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Вибрация при нажатии софт-клавиш и некоторых элементов интерфейса"</string>
     <string name="play_media_notification_sounds_enable_title" msgid="1008791464029179529">"Уведомления карты SD"</string>
-    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
-    <skip />
-    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
-    <skip />
-    <string name="sync_settings" msgid="2212736205476453234">"Синхронизация данных"</string>
-    <string name="sync_settings_summary" msgid="6480534906375217074">"Выбрать приложения для синхронизации"</string>
-    <!-- no translation found for search_settings (1910951467596035063) -->
-    <skip />
-    <!-- no translation found for search_settings_summary (9205656546570654169) -->
-    <skip />
+    <string name="play_media_notification_sounds_enable_summary_on" msgid="7675466959375667370">"Включать звук для уведомлений SD-карты"</string>
+    <string name="play_media_notification_sounds_enable_summary_off" msgid="8672617597028744693">"Включать звук для уведомлений SD-карты"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Аккаунты и синхронизация"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"Добавление или удаление аккаунтов и изменение настроек аккаунта"</string>
+    <string name="search_settings" msgid="1910951467596035063">"Поиск"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Настроить параметры и управлять историей поиска"</string>
     <string name="display_settings" msgid="3912042046350078328">"Настройки экрана"</string>
     <string name="animations_title" msgid="1062189037402346023">"Анимация"</string>
     <string name="animations_summary_on" msgid="8843613112130484436">"Показывать анимацию при открытии и закрытии окон"</string>
@@ -438,6 +430,7 @@
     <string name="brightness_summary" msgid="838917350127550703">"Настроить яркость экрана"</string>
     <string name="screen_timeout" msgid="4882669461447531301">"Время отключения экрана"</string>
     <string name="screen_timeout_summary" msgid="2905757633140605334">"Выбрать интервал до автоматического отключения экрана"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"Яркость автоматически"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Настройки блокировки SIM-карты"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Настроить блокировку SIM-карты"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Блокировка SIM-карты"</string>
@@ -448,7 +441,7 @@
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN-код SIM-карты"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Заблокировать SIM-карту"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Разблокировать SIM-карту"</string>
-    <string name="sim_enter_old" msgid="6074196344494634348">"Старый PIN-код SIM-карты"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"Прежний PIN-код SIM-карты"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"Новый PIN SIM-карты"</string>
     <string name="sim_reenter_new" msgid="3178510434642201544">"Введите новый PIN повторно"</string>
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN-код SIM-карты"</string>
@@ -470,18 +463,14 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Недоступно"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Состояние"</string>
     <string name="device_status" msgid="607405385799807324">"Состояние"</string>
-    <!-- no translation found for device_status_summary (2599162787451519618) -->
-    <skip />
-    <string name="storage_settings_title" msgid="8461515684514801302">"SD-карта и память телефона"</string>
-    <string name="storage_settings_summary" msgid="9176693537325988610">"Демонтировать SD-карту, показать доступную память"</string>
-    <!-- no translation found for status_number (5123197324870153205) -->
-    <skip />
-    <!-- no translation found for status_min_number (3519504522179420597) -->
-    <skip />
-    <!-- no translation found for status_prl_version (8499039751817386529) -->
-    <skip />
-    <!-- no translation found for status_meid_number (1751442889111731088) -->
-    <skip />
+    <string name="device_status_summary" msgid="2599162787451519618">"Номер телефона, сигнал и т.д."</string>
+    <string name="storage_settings" msgid="6681164315506788024">"SD-карта и память телефона"</string>
+    <string name="storage_settings_title" msgid="5379463509034022773">"Настройки SD-карты и памяти телефона"</string>
+    <string name="storage_settings_summary" msgid="9176693537325988610">"Отключение SD-карты, сведения о доступной памяти"</string>
+    <string name="status_number" msgid="5123197324870153205">"Мой номер телефона"</string>
+    <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_prl_version" msgid="8499039751817386529">"Версия PRL"</string>
+    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Тип мобильной сети"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Состояние сотовой сети"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Состояние службы"</string>
@@ -520,6 +509,11 @@
     <string name="apn_mms_port" msgid="4074188088199243040">"Порт MMS"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"Тип аутентификации"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Нет"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP или CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Тип APN"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Удалить APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Новая точка доступа"</string>
@@ -535,11 +529,9 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Восстановление настроек APN по умолчанию завершено"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Возврат к исходным настройкам"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Удаляет всю информацию в памяти телефона"</string>
-    <!-- no translation found for master_clear_desc (7823268823499739178) -->
-    <skip />
+    <string name="master_clear_desc" msgid="7823268823499739178">"С телефона будут удалены все данные, в том числе: "\n<li>"ваш аккаунт Google;"</li>\n<li>"данные и настройки системы и приложений;"</li>\n<li>"загруженные приложения."</li>\n"Не будут удалены:"\n<li>"текущее системное ПО и пакетные приложения;"</li>\n<li>"файлы на SD-карте, например фотографии и музыка."</li></string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Сбросить настройки телефона"</string>
-    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
-    <skip />
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"Стереть всю личную информацию и загруженные приложения? Это действие нельзя отменить!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Стереть все"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Начертить графический ключ"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Для подтверждения сброса настроек телефона необходимо начертить графический ключ."</string>
@@ -553,23 +545,22 @@
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Начертить графический ключ разблокировки"</string>
     <string name="media_format_gesture_explanation" msgid="4239529439389660159">"Для подтверждения форматирования карты SD нужно начертить графический ключ разблокировки."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Настройки вызовов"</string>
-    <string name="call_settings_summary" msgid="7291195704801002886">"Настроить голосовую почту, АОН, переадресацию, паралл. вызов"</string>
+    <string name="call_settings_summary" msgid="7291195704801002886">"Голосовая почта, АОН, переадресация, параллельный вызов"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Мобильная сеть"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Настроить параметры роуминга, сетей, точек доступа (APN)"</string>
-    <!-- no translation found for location_title (1029961368397484576) -->
-    <skip />
+    <string name="location_title" msgid="1029961368397484576">"Мое местоположение"</string>
     <string name="location_network_based" msgid="8815705866861993344">"Беспроводные сети"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Просматривайте местоположение в приложениях (например, в Картах), используя беспроводную сеть"</string>
+    <string name="location_networks_disabled" msgid="2708968452901433980">"Местоположение не определяется с помощью беспроводных сетей"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Местоположение определяется сотовой сетью и/или Wi-Fi"</string>
-    <string name="location_gps" msgid="375912731641377120">"Спутники GPS"</string>
-    <string name="location_street_level" msgid="5899941752252356344">"При определении местоположения с точностью до улицы (отмените выделения для экономии энергии батареи)"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Точные координаты (требуется открытое небо и больше энергии)"</string>
-    <!-- no translation found for use_location_title (7585990952633568732) -->
-    <skip />
-    <!-- no translation found for use_location_summary (4411467143899877395) -->
-    <skip />
-    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
-    <skip />
+    <string name="location_gps" msgid="6296125378829097831">"Спутники GPS"</string>
+    <string name="location_street_level" msgid="6460740847018275745">"Точные координаты (требуется открытое небо и больше энергии)"</string>
+    <string name="location_gps_disabled" msgid="6632537158777308128">"Приблизительные координаты (экономит энергию)"</string>
+    <string name="assisted_gps" msgid="4649317129586736885">"Использовать A-GPS"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Использовать сервер для A-GPS (снимите флажок для менее интенсивного использования сети)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Использовать сервер для A-GPS (снимите флажок для улучшения работы GPS)"</string>
+    <string name="use_location_title" msgid="5447030582538504247">"Использовать функцию \"Мое местоположение\""</string>
+    <string name="use_location_summary" msgid="1816849484040070431">"Использовать функцию \"Мое местоположение\" для улучшения результатов поиска Google и работы других служб Google."</string>
+    <string name="use_location_warning_message" msgid="1420184860518262439">"Разрешить Google использовать данные о местоположении для улучшения результативности поиска и работы других служб?"</string>
     <string name="agree" msgid="6288718671527758326">"Принимаю"</string>
     <string name="disagree" msgid="6221069272309799230">"Не принимаю"</string>
     <string name="about_settings" msgid="1743378368185371685">"О телефоне"</string>
@@ -579,12 +570,15 @@
     <string name="copyright_title" msgid="865906688917260647">"Авторские права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лицензия"</string>
     <string name="terms_title" msgid="7697580845616764642">"Условия предоставления услуг"</string>
-    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
-    <skip />
+    <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Руководство по работе с системой"</string>
     <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Узнайте, как пользоваться телефоном"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Лицензии ПО с открытым исходным кодом"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"При загрузке лицензий возникла неполадка."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Идет загрузка…"</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Сведения о безопасности"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Сведения о безопасности"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Телефон не подключен к службе передачи данных. Чтобы просмотреть эту информацию, откройте страницу %s на любом компьютере, подключенном к Интернету."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Идет загрузка…"</string>
     <string name="lock_settings_title" msgid="5828348303971852121">"Графический ключ разблокировки экрана"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Изменить графический ключ"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Начертите существующий ключ"</string>
@@ -613,11 +607,11 @@
     <string name="skip_button_label" msgid="8680422740354436943">"Отмена"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Далее"</string>
     <string name="lock_title" msgid="4059246467204273930">"Обеспечение безопасности телефона"</string>
-    <string name="lock_intro_message" msgid="5352897389718432077"><font size="17">"Защитите телефон от несанкционированного использования, создав собственный графический ключ разблокировки экрана. "\n<font height="17">\n</font><b>"1"</b>"  На следующем экране показан пример вычерчивания ключа. "\n<font height="17">\n</font><b>"3"</b>"  Подготовьтесь и создайте собственный графический ключ разблокировки. Можно экспериментировать с ключами, но в них должны быть соединены как минимум четыре точки. "\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_intro_message" msgid="9100785646737118042"><font size="17">"Защитите телефон от несанкционированного использования, создав собственный графический ключ разблокировки экрана. "\n<font height="17">\n</font><b>"1"</b>"  На следующем экране показан пример вычерчивания ключа. "\n<font height="17">\n</font><b>"3"</b>"  Подготовьтесь и создайте собственный графический ключ разблокировки. Можно экспериментировать с ключами, но в них должны быть соединены как минимум четыре точки. "\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" msgid="8052305554017485410">"Пример графического ключа"</string>
-    <string name="lock_example_message" msgid="7431982730914254881">"Соедините как минимум четыре точки."\n" "\n"Выберите \"Далее\", когда будете готовы начертить собственный графический ключ разблокировки."</string>
+    <string name="lock_example_message" msgid="1838650097090632706">"Соедините как минимум четыре точки."\n" "\n"Выберите \"Далее\", когда будете готовы начертить собственный графический ключ разблокировки."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Управление приложениями"</string>
-    <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Управлять установленными приложениями и удалять их"</string>
+    <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Управление установленными приложениями и удаление их"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Приложения"</string>
     <string name="applications_settings_summary" msgid="2714215108369119717">"Управление приложениями, настройка клавиш быстрого запуска"</string>
     <string name="applications_settings_header" msgid="6018266337275422250">"Настройки приложения"</string>
@@ -638,8 +632,7 @@
     <string name="data_size_label" msgid="8679376373625710107">"Данные"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Удалить"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Стереть данные"</string>
-    <!-- no translation found for app_factory_reset (6635744722502563022) -->
-    <skip />
+    <string name="app_factory_reset" msgid="6635744722502563022">"Удалить обновления"</string>
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Выбран запуск этого приложения по умолчанию при выполнении некоторых действий."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Без настроек по умолчанию."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Удалить настройки по умолчанию"</string>
@@ -650,33 +643,42 @@
     <string name="filter" msgid="2018011724373033887">"Фильтр"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Выбрать параметры фильтра"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Все"</string>
-    <string name="filter_apps_third_party" msgid="1096017647285183437">"Независимые производители"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Сторонние разработчики"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Выполняемые сейчас"</string>
     <string name="loading" msgid="3200408047793887917">"Идет загрузка…"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Повторное вычисление размера..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Удалить"</string>
-    <string name="clear_data_dlg_text" msgid="8796694785488630642">"Вся информация, сохраненная в этом приложении, будет удалена навсегда."</string>
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"Все данные этой программы будут удалены навсегда, включая все файлы, базы данных, настройки, аккаунты и прочее."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"ОК"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Отмена"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"Приложение не найдено"</string>
     <string name="app_not_found_dlg_text" msgid="2980271680333341554">"Приложение не было найдено в списке установленных приложений."</string>
     <string name="clear_data_failed" msgid="581956197586913865">"Не удалось очистить данные приложения."</string>
-    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
-    <skip />
-    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
-    <skip />
-    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
-    <skip />
-    <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
-    <skip />
+    <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Удалить обновления"</string>
+    <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Удалить все обновления в этом системном приложении Android?"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Стереть данные"</string>
+    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Не удалось очистить данные для приложения"</string>
     <string name="security_settings_desc" msgid="3116027624526915561">"Это приложение имеет доступ к следующей информации и следующие права:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Вычисление..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Не удалось вычислить размер пакета"</string>
-    <string name="empty_list_msg" msgid="1883660401486953588">"Не обнаружено установленных приложений от независимых поставщиков."</string>
-    <!-- no translation found for version_text (9189073826278676425) -->
-    <skip />
-    <string name="language_settings" msgid="2939555761536357092">"Регион и ввод текста"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"Выбрать язык и регион, способ ввода текста и параметры автокоррекции"</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"Не обнаружено установленных приложений от независимых поставщиков."</string>
+    <string name="version_text" msgid="9189073826278676425">"Версия <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"Работающие службы"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Просмотр и управление работающими службами"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"Перезапуск"</string>
+    <string name="no_running_services" msgid="6981216347270280598">"Работающие службы отсутствуют"</string>
+    <string name="confirm_stop_service" msgid="5700448757318301681">"Остановить службу?"</string>
+    <string name="confirm_stop_service_msg" msgid="1202118456282395730">"Эта служба не будет больше выполняться, пока не будет запущена снова. Это может негативно повлиять на программу <xliff:g id="APPLICATION">%1$s</xliff:g>."</string>
+    <string name="confirm_stop_stop" msgid="7382363913280993331">"Стоп"</string>
+    <string name="confirm_stop_cancel" msgid="206495326622692381">"Отмена"</string>
+    <string name="service_started_by_app" msgid="8432097226392386802">"Запущено приложением. Нажмите, чтобы остановить."</string>
+    <string name="service_client_name" msgid="2337664610975074717">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: нажмите, чтобы изменить"</string>
+    <string name="service_background_processes" msgid="5158600475629177758">"Дост.: <xliff:g id="FREE">%2$s</xliff:g>+<xliff:g id="MEMORY">%3$s</xliff:g> (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
+    <string name="service_foreground_processes" msgid="4013890350284680796">"Другое: <xliff:g id="MEMORY">%2$s</xliff:g> (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
+    <string name="service_process_name" msgid="8630408984456958400">"Процесс <xliff:g id="PROCESS">%1$s</xliff:g>"</string>
+    <string name="language_settings" msgid="502219872342167227">"Язык и клавиатура"</string>
+    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Настройки языка и клавиатуры"</string>
+    <string name="language_settings_summary" msgid="595647729475399987">"Выбор языка и региона, способов ввода и настройка автокоррекции"</string>
     <string name="language_category" msgid="3391756582724541530">"Региональные настройки"</string>
     <string name="text_category" msgid="6342540511465136739">"Настройки текста"</string>
     <string name="phone_language" msgid="2138384312336494991">"Выбрать регион"</string>
@@ -690,7 +692,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Для ввода точки можно дважды нажать клавишу \"Пробел\""</string>
     <string name="show_password" msgid="2198798062604049206">"Видимые пароли"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Показывать пароль при вводе"</string>
-    <string name="ime_security_warning" msgid="3458652708716006477">"Возможно, при использовании этого метода будут собираться все вводимые данные, в том числе такие личные сведения, как пароли или номера кредитных карт. Метод обеспечивается приложением <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Разрешить этот метод ввода?"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"Возможно, при использовании этого метода будут собираться все вводимые данные, в том числе такие личные сведения, как пароли или номера кредитных карт. Метод обеспечивается приложением <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Использовать этот метод ввода?"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Пользовательский словарь"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"Пользовательский словарь"</string>
     <string name="user_dict_settings_summary" msgid="2460427065601355471">"Добавить или удалить слова из пользовательского словаря"</string>
@@ -718,24 +720,22 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Ввод текста"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Задать параметры ввода текста"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Настройки <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="4919680715154885028">"Настройки экранной клавиатуры"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Настройки экранной клавиатуры"</string>
     <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Клавиатура устройства"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Настройки встроенной клавиатуры"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Разработка"</string>
-    <string name="development_settings_summary" msgid="2151320488701538355">"Настроить параметры для разработки приложений"</string>
+    <string name="development_settings_summary" msgid="2151320488701538355">"Настройка параметров для разработки приложений"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Отладка USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Режим отладки при подключенном USB-устройстве"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Оставить включенным"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Во время зарядки экран будет всегда включен"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Разрешить копии мест"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешить копии местоположений"</string>
-    <!-- no translation found for adb_warning_title (1756027479229533250) -->
-    <skip />
-    <!-- no translation found for adb_warning_message (5352555112049663033) -->
-    <skip />
+    <string name="adb_warning_title" msgid="6234463310896563253">"Разрешить отладку USB?"</string>
+    <string name="adb_warning_message" msgid="5352555112049663033">"Отладка USB предназначена только в целях разработки. С ее помощью можно копировать данные с компьютера на мобильное устройство и обратно, устанавливать на устройство приложения без уведомления и просматривать данные журналов."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Выбор·гаджета"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Выбор виджета"</string>
-    <string name="battery_history_details_for" msgid="5189636461798594740">"Сведения для идентификатора пользователя %d"</string>
+    <string name="battery_history_details_for" msgid="5924639922153109669">"Сведения для идентификатора пользователя <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="battery_history_uid" msgid="1016606150528436298">"Идентификатор пользователя <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage" msgid="8010852371665217020">"Сведения об использовании сети приложением <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
     <string name="battery_history_bytes_received" msgid="980307569180518302">"Получено байт: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
@@ -746,14 +746,10 @@
     <string name="battery_history_system_time" msgid="2015862072724507547">"Системное время:"</string>
     <string name="battery_history_total_time" msgid="3618703970098556104">"Общее время:"</string>
     <string name="battery_history_starts" msgid="9137453931978571696">"Запусков: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
-    <!-- no translation found for battery_history_days (7110262897769622564) -->
-    <skip />
-    <!-- no translation found for battery_history_hours (7525170329826274999) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
-    <skip />
-    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
-    <skip />
+    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> дн. <xliff:g id="HOURS">%2$d</xliff:g> ч. <xliff:g id="MINUTES">%3$d</xliff:g> мин. <xliff:g id="SECONDS">%4$d</xliff:g> с."</string>
+    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> ч. <xliff:g id="MINUTES">%2$d</xliff:g> мин. <xliff:g id="SECONDS">%3$d</xliff:g> с."</string>
+    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> мин. <xliff:g id="SECONDS">%2$d</xliff:g> с."</string>
+    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> с."</string>
     <string name="battery_history_packages_sharing_this_uid" msgid="4101596071379250050">"Пакеты с этим идентификатором пользователя:"</string>
     <string name="battery_history_no_data" msgid="1177238743237067617">"Данные об использовании батареи недоступны"</string>
     <string name="battery_history_sensor" msgid="2333488996028993982">"Сенсор:"</string>
@@ -775,400 +771,209 @@
     <string name="app_name_label" msgid="2000949925256858308">"Приложение"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"Подсчет"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Время использования"</string>
-    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
-    <skip />
-    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
-    <skip />
-    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
-    <skip />
-    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
-    <skip />
-    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
-    <skip />
-    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
-    <skip />
-    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
-    <skip />
-    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
-    <skip />
-    <!-- no translation found for power_usage_summary (7237084831082848168) -->
-    <skip />
-    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
-    <skip />
-    <!-- no translation found for battery_since_reset (7464546661121187045) -->
-    <skip />
-    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
-    <skip />
+    <string name="accessibility_settings" msgid="3975902491934816215">"Специальные возможности"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Настройки специальных возможностей"</string>
+    <string name="accessibility_settings_summary" msgid="8185181964847149507">"Настройка специальных возможностей"</string>
+    <string name="toggle_accessibility_title" msgid="650839277066574497">"Специальные возможности"</string>
+    <string name="accessibility_services_category" msgid="8127851026323672607">"Службы специальных возможностей"</string>
+    <string name="no_accessibility_services_summary" msgid="694578333333808159">"Службы специальных возможностей не установлены."</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Эта служба специальных возможностей может записывать весь текст, который вы вводите, в том числе личные данные и номера кредитных карт, за исключением паролей. Служба запущена приложением <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Использовать службу?"</string>
+    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Отключить специальные возможности?"</string>
+    <string name="power_usage_summary_title" msgid="5180282911164282324">"Расход заряда батареи"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"На что расходуется заряд батареи"</string>
+    <string name="battery_since_unplugged" msgid="338073389740738437">"Расход заряда батареи с момента отключения от сети питания"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"Расход заряда батареи с момента перезагрузки"</string>
+    <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> с момента отключения"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <!-- no translation found for awake (387122265874485088) -->
-    <skip />
-    <!-- no translation found for wifi_on_time (4630925382578609056) -->
-    <skip />
-    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
-    <skip />
-    <!-- no translation found for usage_name_percent (1899151069711662289) -->
-    <skip />
-    <!-- no translation found for details_title (7564809986329021063) -->
-    <skip />
-    <!-- no translation found for details_subtitle (32593908269911734) -->
-    <skip />
-    <!-- no translation found for controls_subtitle (390468421138288702) -->
-    <skip />
-    <!-- no translation found for packages_subtitle (4736416171658062768) -->
-    <skip />
-    <!-- no translation found for power_screen (2353149143338929583) -->
-    <skip />
-    <!-- no translation found for power_wifi (2382791137776486974) -->
-    <skip />
-    <!-- no translation found for power_bluetooth (4373329044379008289) -->
-    <skip />
-    <!-- no translation found for power_cell (6596471490976003056) -->
-    <skip />
-    <!-- no translation found for power_phone (5392641106474567277) -->
-    <skip />
-    <!-- no translation found for power_idle (9055659695602194990) -->
-    <skip />
-    <!-- no translation found for usage_type_cpu (715162150698338714) -->
-    <skip />
-    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
-    <skip />
-    <!-- no translation found for usage_type_gps (7989688715128160790) -->
-    <skip />
-    <!-- no translation found for usage_type_phone (9108247984998041853) -->
-    <skip />
-    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
-    <skip />
-    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
-    <skip />
-    <!-- no translation found for usage_type_audio (6957269406840886290) -->
-    <skip />
-    <!-- no translation found for usage_type_video (4295357792078579944) -->
-    <skip />
-    <!-- no translation found for usage_type_on_time (3351200096173733159) -->
-    <skip />
-    <!-- no translation found for usage_type_no_coverage (3797004252954385053) -->
-    <skip />
-    <!-- no translation found for battery_action_stop (649958863744041872) -->
-    <skip />
-    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
-    <skip />
-    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
-    <skip />
-    <!-- no translation found for battery_action_display (5302763261448580102) -->
-    <skip />
-    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
-    <skip />
-    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
-    <skip />
-    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
-    <skip />
-    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
-    <skip />
-    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
-    <skip />
-    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
-    <skip />
-    <!-- no translation found for battery_desc_display (5432795282958076557) -->
-    <skip />
-    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
-    <skip />
-    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
-    <skip />
-    <!-- no translation found for battery_sugg_wifi (7542345142282261691) -->
-    <skip />
-    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
-    <skip />
-    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
-    <skip />
-    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
-    <skip />
-    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_gps (4145005297393800223) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
-    <skip />
-    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
-    <skip />
-    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
-    <skip />
-    <!-- no translation found for menu_stats_total (8973377864854807854) -->
-    <skip />
-    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
-    <skip />
-    <!-- no translation found for process_kernel_label (3916858646836739323) -->
-    <skip />
-    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
-    <skip />
-    <!-- no translation found for tts_settings (6454363854545277027) -->
-    <skip />
-    <!-- no translation found for tts_settings_summary (2627715231944602766) -->
-    <skip />
-    <!-- no translation found for tts_settings_title (5064947197040356736) -->
-    <skip />
-    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
-    <skip />
-    <!-- no translation found for use_default_tts_settings_summary (4253502106159206276) -->
-    <skip />
-    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
-    <skip />
-    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
-    <skip />
-    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
-    <skip />
-    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
-    <skip />
-    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
-    <skip />
-    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
-    <skip />
-    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
-    <skip />
-    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
-    <skip />
-    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
-    <skip />
-    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
-    <skip />
-    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
-    <skip />
-    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
-    <skip />
-    <!-- no translation found for tts_demo (405357591189935876) -->
-    <skip />
-    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
-    <skip />
-    <!-- no translation found for gadget_title (7455548605888590466) -->
-    <skip />
-    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
-    <skip />
-    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
-    <skip />
-    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
-    <skip />
-    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
-    <skip />
-    <!-- no translation found for vpn_a_username (6664733641993968692) -->
-    <skip />
-    <!-- no translation found for vpn_a_password (1537213632501483753) -->
-    <skip />
-    <!-- no translation found for vpn_save_username (1408415289165970790) -->
-    <skip />
-    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
-    <skip />
-    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
-    <skip />
-    <!-- no translation found for vpn_no_button (7620339571187119107) -->
-    <skip />
-    <!-- no translation found for vpn_back_button (192036339792734970) -->
-    <skip />
-    <!-- no translation found for vpn_mistake_button (1683383660912491270) -->
-    <skip />
-    <!-- no translation found for vpn_menu_done (93528279226907926) -->
-    <skip />
-    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
-    <skip />
-    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
-    <skip />
-    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
-    <skip />
-    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
-    <skip />
-    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
-    <skip />
-    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
-    <skip />
-    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
-    <skip />
-    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
-    <skip />
-    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
-    <skip />
-    <!-- no translation found for vpn_reconnect_from_lost (2442844155623372118) -->
-    <skip />
-    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
-    <skip />
-    <!-- no translation found for vpn_challenge_error_dialog_msg (6174901754230038601) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set_dialog_msg (8013052814131532765) -->
-    <skip />
-    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
-    <skip />
-    <!-- no translation found for vpn_remote_hung_up_error_dialog_msg (1566946015052633150) -->
-    <skip />
-    <!-- no translation found for vpn_type_title (6392933604218676224) -->
-    <skip />
-    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
-    <skip />
-    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
-    <skip />
-    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
-    <skip />
-    <!-- no translation found for vpns (3148141862835492816) -->
-    <skip />
-    <!-- no translation found for vpn_connecting (8039521381692090116) -->
-    <skip />
-    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
-    <skip />
-    <!-- no translation found for vpn_connected (7641723116362845781) -->
-    <skip />
-    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
-    <skip />
-    <!-- no translation found for vpn_name (1550918148476193076) -->
-    <skip />
-    <!-- no translation found for vpn_a_name (8445736942405283509) -->
-    <skip />
-    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
-    <skip />
-    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
-    <skip />
-    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
-    <skip />
-    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
-    <skip />
-    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
-    <skip />
-    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
-    <skip />
-    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
-    <skip />
-    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
-    <skip />
-    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
-    <skip />
-    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
-    <skip />
-    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
-    <skip />
-    <!-- no translation found for vpn_pptp_encryption_title (2236795167467896499) -->
-    <skip />
-    <!-- no translation found for vpn_pptp_encryption (2602329949737259686) -->
-    <skip />
-    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
-    <skip />
-    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
-    <skip />
-    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
-    <skip />
-    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
-    <skip />
-    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
-    <skip />
-    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
-    <skip />
-    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
-    <skip />
-    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
-    <skip />
-    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
-    <skip />
-    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
-    <skip />
-    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
-    <skip />
-    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
-    <skip />
-    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
-    <skip />
-    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
-    <skip />
-    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
-    <skip />
-    <!-- no translation found for vpn_secret_unchanged (8700613973594154529) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set (1037792636371641845) -->
-    <skip />
-    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
-    <skip />
-    <!-- no translation found for cstor_access_title (1739505390736236717) -->
-    <skip />
-    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
-    <skip />
-    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
-    <skip />
-    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
-    <skip />
-    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
-    <skip />
-    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
-    <skip />
-    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
-    <skip />
-    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
-    <skip />
-    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
-    <skip />
-    <!-- no translation found for cstor_credential_password (7187440553141199409) -->
-    <skip />
-    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
-    <skip />
-    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
-    <skip />
-    <!-- no translation found for cstor_old_password (979282118063084561) -->
-    <skip />
-    <!-- no translation found for cstor_new_password (6218562692435670047) -->
-    <skip />
-    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
-    <skip />
-    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
-    <skip />
-    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
-    <skip />
-    <!-- no translation found for cstor_password_error (2917326097260402464) -->
-    <skip />
-    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
-    <skip />
-    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
-    <skip />
-    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
-    <skip />
-    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
-    <skip />
-    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
-    <skip />
-    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
-    <skip />
-    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
-    <skip />
-    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
-    <skip />
-    <!-- no translation found for cstor_storage_error (7140697503172458161) -->
-    <skip />
-    <!-- no translation found for cstor_unable_to_save_cert (1631402544447196406) -->
-    <skip />
-    <!-- no translation found for cstor_cert_not_saved (6318149789449538491) -->
-    <skip />
-    <!-- no translation found for cstor_is_reset (449870501126790589) -->
-    <skip />
-    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
-    <skip />
-    <!-- no translation found for cstor_is_added (794788474010251572) -->
-    <skip />
-    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
-    <skip />
-    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <string name="awake" msgid="387122265874485088">"Время включения устройства"</string>
+    <string name="wifi_on_time" msgid="4630925382578609056">"Время работы WiFi"</string>
+    <string name="bluetooth_on_time" msgid="4478515071957280711">"Время работы WiFi"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
+    <string name="details_title" msgid="7564809986329021063">"Подробные сведения о расходе заряда батареи"</string>
+    <string name="details_subtitle" msgid="32593908269911734">"Использовать сведения"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"Настроить режим энергопотребления"</string>
+    <string name="packages_subtitle" msgid="4736416171658062768">"Вложенные пакеты"</string>
+    <string name="power_screen" msgid="2353149143338929583">"Показать"</string>
+    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
+    <string name="power_cell" msgid="6596471490976003056">"В режиме ожидания"</string>
+    <string name="power_phone" msgid="5392641106474567277">"Голосовые вызовы"</string>
+    <string name="power_idle" msgid="9055659695602194990">"Телефон в режиме ожидания"</string>
+    <string name="usage_type_cpu" msgid="715162150698338714">"Суммарное использование ЦП"</string>
+    <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Использование ЦП активными приложениями"</string>
+    <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
+    <string name="usage_type_phone" msgid="9108247984998041853">"Телефон"</string>
+    <string name="usage_type_data_send" msgid="2857401966985425427">"Данные отправлены"</string>
+    <string name="usage_type_data_recv" msgid="7251090882025234185">"Полученные данные"</string>
+    <string name="usage_type_audio" msgid="6957269406840886290">"Аудио"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"Видео"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"Время работы"</string>
+    <string name="usage_type_no_coverage" msgid="3797004252954385053">"Время отсутствия сигнала"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"Остановить принудительно"</string>
+    <string name="battery_action_app_details" msgid="3275013531871113681">"Сведения о приложении"</string>
+    <string name="battery_action_app_settings" msgid="350562653472577250">"Настройки приложения"</string>
+    <string name="battery_action_display" msgid="5302763261448580102">"Настройки экрана"</string>
+    <string name="battery_action_wifi" msgid="5452076674659927993">"Настройки WiFi"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Настройки Bluetooth"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"Заряд батареи, израсходованный на голосовые вызовы"</string>
+    <string name="battery_desc_standby" msgid="3009080001948091424">"Расход заряда батареи в режиме ожидания"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"Батарея используется сотовым радио"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"Перейти в режим полета, чтобы сэкономить заряд батареи при отсутствии покрытия сети"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"Заряд батареи, израсходованный на подсветку экрана"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"Уменьшить яркость экрана и/или время до отключения экрана"</string>
+    <string name="battery_desc_wifi" msgid="1702486494565080431">"Батарея используется Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="7542345142282261691">"Отключить модуль Wi-Fi, когда он не используется или сеть недоступна"</string>
+    <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Заряд батареи, израсходованный Bluetooth"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Отключить Bluetooth, если он не используется"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Попробуйте подключиться к другому устройству Bluetooth"</string>
+    <string name="battery_desc_apps" msgid="8123202939321333639">"Расход заряда батареи для работы приложений"</string>
+    <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Остановить или удалить приложение"</string>
+    <string name="battery_sugg_apps_gps" msgid="4145005297393800223">"Отключать GPS, когда не используется"</string>
+    <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"В программе могут быть настройки для снижения расхода заряда батареи"</string>
+    <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> с момента отключения"</string>
+    <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"С последнего отключения <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_total" msgid="8973377864854807854">"Суммарное использование"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"Обновить"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"ОС Android"</string>
+    <string name="process_mediaserver_label" msgid="6500382062945689285">"Сервер медиа"</string>
+    <string name="tts_settings" msgid="3348626948015962987">"Преобразование текста в речь"</string>
+    <string name="tts_settings_summary" msgid="2627715231944602766">"Настроить параметры преобразования текста в речь"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Настройки синтеза речи"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Всегда использовать мои настройки"</string>
+    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Переопределенные настройки приложения имеют приоритет перед настройками по умолчанию"</string>
+    <string name="tts_default_settings_section" msgid="5787915620218907443">"Настройки по умолчанию"</string>
+    <string name="tts_default_rate_title" msgid="6030550998379310088">"Скорость речи"</string>
+    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Скорость чтения текста"</string>
+    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Тон"</string>
+    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Влияет на высоту синтезированной речи"</string>
+    <string name="tts_default_lang_title" msgid="8018087612299820556">"Язык"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Выбрать голос, связанный с определенным языком, для чтения текста"</string>
+    <string name="tts_play_example_title" msgid="7094780383253097230">"Прослушайте пример"</string>
+    <string name="tts_play_example_summary" msgid="8029071615047894486">"Воспроизвести краткую демонстрацию синтезированной речи"</string>
+    <string name="tts_install_data_title" msgid="4264378440508149986">"Установка голосовых данных"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"Установить голосовые данные, необходимые для синтеза речи"</string>
+    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Голоса, необходимые для синтеза речи, уже установлены"</string>
+    <string name="tts_demo" msgid="405357591189935876">"Это пример синтеза речи."</string>
+    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Ваши настройки изменены. Вот пример того, как это звучит."</string>
+    <string name="gadget_title" msgid="7455548605888590466">"Управление питанием"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Обновление настроек Wi-Fi"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Обновление настроек Bluetooth"</string>
+    <string name="credential_installer_activity_title" msgid="7600661521831762521">"Установщик регистрационных данных"</string>
+    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Настройки VPN"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"Подключить к \"<xliff:g id="NAME">%s</xliff:g>\""</string>
+    <string name="vpn_username_colon" msgid="7854930370861306247">"Имя:"</string>
+    <string name="vpn_password_colon" msgid="5716278710848606626">"Пароль:"</string>
+    <string name="vpn_a_username" msgid="6664733641993968692">"имя пользователя"</string>
+    <string name="vpn_a_password" msgid="1537213632501483753">"пароль"</string>
+    <string name="vpn_save_username" msgid="1408415289165970790">"Запомнить имя пользователя"</string>
+    <string name="vpn_connect_button" msgid="1699007212602470655">"Подключить"</string>
+    <string name="vpn_yes_button" msgid="8034531001149843119">"Да"</string>
+    <string name="vpn_no_button" msgid="7620339571187119107">"Нет"</string>
+    <string name="vpn_back_button" msgid="192036339792734970">"Назад"</string>
+    <string name="vpn_mistake_button" msgid="1683383660912491270">"Нет"</string>
+    <string name="vpn_menu_done" msgid="93528279226907926">"Сохранить"</string>
+    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Отмена"</string>
+    <string name="vpn_menu_revert" msgid="4407762442281467659">"Отменить изменения"</string>
+    <string name="vpn_menu_connect" msgid="1089399414463784218">"Подключить к сети"</string>
+    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Отключиться от сети"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Изменить сеть"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Удалить сеть"</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Необходимо ввести <xliff:g id="CODE">%s</xliff:g>."</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Необходимо выбрать <xliff:g id="OPTION">%s</xliff:g>."</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"VPN с названием \"<xliff:g id="NAME">%s</xliff:g>\" уже существует. Выберите другое название."</string>
+    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Действительно удалить эту VPN?"</string>
+    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Не создавать этот профиль?"</string>
+    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Отменить все изменения этого профиля?"</string>
+    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Не удалось подключиться к сети. Повторить попытку?"</string>
+    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Соединение утрачено. Подключиться снова?"</string>
+    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Не удается найти сервер с таким именем. Проверить настройки имени сервера?"</string>
+    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Ошибка проверки. Проверить настройки секретов?"</string>
+    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"В данной конфигурации VPN не хватает одного или более секретов. Проверить настройки секретов?"</string>
+    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Вы неверно ввели имя пользователя или пароль. Повторить попытку?"</string>
+    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Сеанс прекращен сервером. Возможно, вы неверно ввели имя пользователя или пароль. Повторить попытку?"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Сбой на сервере. Возможно вы защищены брандмауэром, который не дает подключиться к серверу. Повторить попытку?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Связь с сервером не установлена. Возможно, не были согласованы параметры шифрования. Изменить настройки шифрования?"</string>
+    <string name="vpn_type_title" msgid="6392933604218676224">"Добавить VPN"</string>
+    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Добавить VPN"</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Добавить VPN \"<xliff:g id="NAME">%s</xliff:g>\""</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Сведения: <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpns" msgid="3148141862835492816">"Сети VPN"</string>
+    <string name="vpn_connecting" msgid="8039521381692090116">"Подключение..."</string>
+    <string name="vpn_disconnecting" msgid="7748050200708257066">"Отключение..."</string>
+    <string name="vpn_connected" msgid="7641723116362845781">"Подключено"</string>
+    <string name="vpn_connect_hint" msgid="7442898962925875181">"Подключить к сети"</string>
+    <string name="vpn_name" msgid="1550918148476193076">"Имя VPN"</string>
+    <string name="vpn_a_name" msgid="8445736942405283509">"имя VPN"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"Профиль \"<xliff:g id="NAME">%s</xliff:g>\" добавлен"</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"В профиль \"<xliff:g id="NAME">%s</xliff:g>\" внесены изменения"</string>
+    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Установить пользовательский сертификат"</string>
+    <string name="vpn_user_certificate" msgid="949322691686938888">"Сертификат пользователя"</string>
+    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"сертификат пользователя"</string>
+    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Установить сертификат центра сертификации"</string>
+    <string name="vpn_ca_certificate" msgid="465085144064264742">"Сертификат центра сертификации"</string>
+    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"сертификат центра сертификации"</string>
+    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Установить секрет L2TP"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"секрет L2TP"</string>
+    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"секрет L2TP"</string>
+    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"шифрование"</string>
+    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Шифрование PPTP"</string>
+    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Установить совместно используемый ключ IPSec"</string>
+    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Совместно используемый ключ IPSec"</string>
+    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"совместно используемый ключ IPSec"</string>
+    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Указать сервер VPN"</string>
+    <string name="vpn_vpn_server" msgid="1141754908824209260">"Сервер VPN"</string>
+    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"сервер VPN"</string>
+    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Имя сервера VPN"</string>
+    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Домены поиска DNS"</string>
+    <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS поиска"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> установлено"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> не установлено"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> не установлено (необязательно)"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"Включить <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"Отключить <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> вкл."</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> откл."</string>
+    <string name="vpn_settings_title" msgid="7327468307909556719">"Настройки VPN"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"Настройка и управление виртуальными частными сетями (VPN)"</string>
+    <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(не изменялось)"</string>
+    <string name="vpn_secret_not_set" msgid="1037792636371641845">"(не настроено)"</string>
+    <string name="credentials_category" msgid="8536992056377271234">"Хранилище регистрационных данных"</string>
+    <string name="credentials_access" msgid="4843187230913860492">"Использовать безопасные регистрационные данные"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"Разрешить приложениям доступ к сертификатам безопасности и другим регистрационным данным"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"Ввод пароля"</string>
+    <string name="credentials_unlock_hint" msgid="594679530407918031">"Введите пароль для доступа в хранилище регистрационных данных."</string>
+    <string name="credentials_install_certificates" msgid="177337517568022236">"Установка с SD-карты"</string>
+    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Установить зашифрованные сертификаты с SD-карты"</string>
+    <string name="credentials_set_password" msgid="9104473585811899989">"Установить пароль"</string>
+    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Установить или изменить пароль для доступа в хранилище регистрационных данных"</string>
+    <string name="credentials_reset" msgid="9170150870552453457">"Очистить хранилище"</string>
+    <string name="credentials_reset_summary" msgid="1530388094693731636">"Очистить все регистрационные данные в хранилище и сбросить пароль"</string>
+    <string name="credentials_reset_hint" msgid="819990295796804516">"Вы действительно хотите удалить все регистрационные данные и сбросить пароль для доступа в хранилище регистрационных данных?"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"Текущий пароль:"</string>
+    <string name="credentials_new_password" msgid="267487774686796938">"Новый пароль:"</string>
+    <string name="credentials_confirm_password" msgid="4732250000633424345">"Подтвердите новый пароль:"</string>
+    <string name="credentials_first_time_hint" msgid="1567821077545346039">"Установите пароль для доступа в хранилище регистрационных данных (не менее 8 символов)."</string>
+    <string name="credentials_wrong_password" msgid="7525192410790152041">"Введите правильный пароль."</string>
+    <string name="credentials_reset_warning" msgid="6392481296673345268">"Введите правильный пароль. У вас осталась 1 попытка. После этого хранилище регистрационных данных будет очищено."</string>
+    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Введите правильный пароль. Количество попыток ограничено (осталось: <xliff:g id="NUMBER">%1$d</xliff:g>). После этого хранилище регистрационных данных будет очищено."</string>
+    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Пароли не совпадают."</string>
+    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Необходимо ввести и подтвердить пароль."</string>
+    <string name="credentials_password_empty" msgid="8292138152983330473">"Введите пароль."</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"В пароле должно быть не менее 8 символов."</string>
+    <string name="credentials_erased" msgid="7700309135582200849">"Хранилище регистрационных данных очищено."</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"Хранилище регистрационных данных включено."</string>
+    <string name="credentials_disabled" msgid="7453188089059045380">"Хранилище регистрационных данных отключено."</string>
+    <string name="emergency_tone_title" msgid="1055954530111587114">"Тональный сигнал экстренного вызова"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"Настроить режим работы при экстренном вызове"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Конфиденциальность"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Настройки конфиденциальности"</string>
+    <string name="location_section_title" msgid="6072558684044939786">"Местоположение"</string>
+    <string name="settings_section_title" msgid="7413252428447723032">"Настройки"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Личные данные"</string>
+    <string name="backup_settings_title" msgid="2968262658155327829">"Создать резервную копию настроек"</string>
+    <string name="backup_erase_dialog_title" msgid="6028429904055779443">"Резервные копии настроек"</string>
+    <string name="backup_erase_dialog_message" msgid="9096433810456900531">"Вы уверены, что не хотите больше создавать резервные копии настроек и хотите удалить все копии с серверов Google?"</string>
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
     <skip />
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 34dcd084615..e2de9457c98 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -24,38 +24,59 @@
     <item msgid="5345178126174698955">"Stilla havet"</item>
     <item msgid="8392017019801393511">"Alla"</item>
   </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"Inga animeringar"</item>
+    <item msgid="6291186755504776720">"Vissa animeringar"</item>
+    <item msgid="3856065399819979491">"Alla animeringar"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"Inga fönsteranimeringar visas"</item>
+    <item msgid="4460915688877708508">"Vissa fönsteranimeringar visas"</item>
+    <item msgid="488968798204105119">"Alla fönsteranimeringar visas"</item>
+  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 sekunder"</item>
     <item msgid="8881760709354815449">"30 sekunder"</item>
     <item msgid="7589406073232279088">"1 minut"</item>
     <item msgid="7001195990902244174">"2 minuter"</item>
     <item msgid="5721688686241190620">"10 minuter"</item>
-    <item msgid="1781492122915870416">"Ingen tidsgräns"</item>
+    <item msgid="7156442995039264948">"30 minuter"</item>
+  </string-array>
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Mycket långsam"</item>
+    <item msgid="2361722960903353554">"Långsam"</item>
+    <item msgid="1145554631248513562">"Normal"</item>
+    <item msgid="7553665153391107454">"Snabb"</item>
+    <item msgid="2538100882620724753">"Mycket snabb"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item msgid="7526050907652687351">"Mycket låg"</item>
+    <item msgid="2692137425242433765">"Låg"</item>
+    <item msgid="3332408460740717754">"Normal"</item>
+    <item msgid="4907380534957572531">"Hög"</item>
+    <item msgid="4699640516390840297">"Mycket hög"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item msgid="478030717868306353">"Amerikansk engelska"</item>
+    <item msgid="5192284521396794598">"Brittisk engelska"</item>
+    <item msgid="3000262452051711991">"Franska"</item>
+    <item msgid="9214080387341763401">"Tyska"</item>
+    <item msgid="5972100016440094433">"Italienska"</item>
+    <item msgid="5811378076054402537">"Spanska"</item>
+  </string-array>
+  <string-array name="wifi_security_entries">
+    <item msgid="2923732046112398627">"Automatiskt"</item>
+    <item msgid="5434666299123318296">"Inga"</item>
+    <item msgid="3159594845889645948">"WEP"</item>
+    <item msgid="1687348101566181433">"WPA/WPA2 PSK"</item>
+    <item msgid="329777238762866787">"802.1x Enterprise"</item>
+  </string-array>
+  <string-array name="wifi_security_without_auto_entries">
+    <item msgid="4402120432904877907">"Inga"</item>
+    <item msgid="2329148995431627488">"WEP"</item>
+    <item msgid="6903317668294332381">"WPA/WPA2 PSK"</item>
+    <item msgid="7280821339307729710">"802.1x Enterprise"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
-    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
-    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
-    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
-    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
-    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
-    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
-    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
-    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
-    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
-    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
-    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
-    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
-    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
-    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
-    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
-    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
-    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
-    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
-    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
-    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
-    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
-    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
-    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
   <string-array name="wifi_wep_type">
     <item msgid="1497433962958697183">"Automatiskt"</item>
     <item msgid="7182335713815377158">"WEP ASCII"</item>
@@ -84,15 +105,27 @@
     <item msgid="1908750532762193304">"Starta räkneverk"</item>
     <item msgid="1213951670006606353">"Namn på program"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
-    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
-    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
-    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
-    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
-    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
-    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
-    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
-    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
-    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
-    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="1818786254010764570">"Inga"</item>
+    <item msgid="6189918678874123056">"PAP"</item>
+    <item msgid="1524112260493662517">"MSCHAP"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
+    <item msgid="8651992560135239389">"GTC"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Av"</item>
+    <item msgid="3165868966179561687">"Varning"</item>
+    <item msgid="6038758039030476855">"Vibrera"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"Inga"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP eller CHAP"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 6b1b90f6c92..1ec0c07db50 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -15,6 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"Ja"</string>
+    <string name="no" msgid="6731231425810196216">"Nej"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Okänd"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Sätt på radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Stäng av radio"</string>
@@ -56,6 +58,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
     <string name="sdcard_setting" msgid="5922637503871474866">"SD-kort"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Batteristatus"</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"Elkontakt:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Batteriskala:"</string>
     <string name="battery_info_level_label" msgid="8706526709307788737">"Batterinivå:"</string>
     <string name="battery_info_health_label" msgid="6416051542741886958">"Batteriets tillstånd:"</string>
@@ -75,6 +78,11 @@
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"Laddar ur"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Laddar inte"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Fullt"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Urkopplad"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"Okänd"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Okänd"</string>
     <string name="battery_info_health_good" msgid="8070356565806711806">"Bra"</string>
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"Överhettning"</string>
@@ -104,14 +112,19 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Begäran om parkoppling för Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Begäran om parkoppling"</string>
     <string name="bluetooth_notif_message" msgid="5381418499788668724">"Välj att parkoppla med "</string>
+    <string name="device_picker" msgid="8721012448931226323">"Bluetooth-enhetsväljare"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Begäran om Bluetooth-behörighet"</string>
+    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Ett program i telefonen begär tillåtelse att aktivera Bluetooth. Vill du tillåta det?"</string>
+    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Ett program i telefonen begär tillåtelse att göra telefonen synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta det?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Ett program i telefonen begär tillåtelse att aktivera Bluetooth och göra telefonen synlig för andra enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta det?"</string>
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Aktiverar Bluetooth …"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Inställningar för datum och tid"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"Kl. 13:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
     <string name="date_time_changeTime_text" msgid="7037437020000867740">"Byt tid"</string>
     <string name="date_time_changeDate_text" msgid="5259762626498028057">"Datum"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Välj tidszon"</string>
-    <!-- no translation found for normal_date_format (1982904221918374153) -->
-    <skip />
+    <string name="normal_date_format" msgid="1982904221918374153">"Normalt (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Förhandsgranska:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Teckenstorlek:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -192,33 +205,23 @@
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy-inställningar"</string>
     <string name="cancel" msgid="6859253417269739139">"Avbryt"</string>
     <string name="settings_label" msgid="1626402585530130914">"Inställningar"</string>
-    <!-- no translation found for settings_shortcut (3672145147925639262) -->
-    <skip />
+    <string name="settings_shortcut" msgid="3672145147925639262">"Inställningar"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Flygplansläge"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Inaktivera alla trådlösa anslutningar"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Inaktiverar trådlösa anslutningar…"</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Aktivera trådlösa anslutningar..."</string>
-    <string name="radio_controls_title" msgid="8356991079873437337">"Trådlösa styrenheter"</string>
-    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
-    <skip />
-    <!-- no translation found for roaming (3596055926335478572) -->
-    <skip />
-    <!-- no translation found for roaming_enable (3737380951525303961) -->
-    <skip />
-    <!-- no translation found for roaming_disable (1295279574370898378) -->
-    <skip />
-    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
-    <skip />
-    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
-    <skip />
-    <!-- no translation found for roaming_warning (1269870211689178511) -->
-    <skip />
-    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
-    <skip />
-    <!-- no translation found for networks (6333316876545927039) -->
-    <skip />
-    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
-    <skip />
+    <string name="radio_controls_title" msgid="5868688473587168882">"Trådlöst och nätverk"</string>
+    <string name="wireless_networks_settings_title" msgid="149274247949769551">"Inställningar för trådlöst och nätverk"</string>
+    <string name="radio_controls_summary" msgid="2998818677094465517">"Hantera Wi-Fi, Bluetooth, flygplansläge, mobila nätverk och VPN"</string>
+    <string name="roaming" msgid="3596055926335478572">"Dataroaming"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Anslut till datatjänster vid roaming"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Anslut till datatjänster vid roaming"</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"Du förlorade dataanslutningen eftersom du lämnade ditt hemnätverk utan att aktivera roaming."</string>
+    <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Aktivera"</string>
+    <string name="roaming_warning" msgid="1269870211689178511">"Tillåta roaming? Observera att detta kan leda till höga kostnader!"</string>
+    <string name="roaming_reenable_title" msgid="7626425894611573131">"Obs!"</string>
+    <string name="networks" msgid="6333316876545927039">"Val av operatör"</string>
+    <string name="sum_carrier_select" msgid="6648929373316748020">"Välj en nätverksoperatör"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum och tid"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Ange datum, tidszon och format"</string>
     <string name="date_time_auto" msgid="3086083265745944725">"Automatiskt"</string>
@@ -226,30 +229,36 @@
     <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Använd värden som tillhandahålls av nätverket"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Använd 24-timmarsformat"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Ange tid"</string>
-    <string name="date_time_set_timezone" msgid="5045627174274377814">"Välja tidszon"</string>
+    <string name="date_time_set_timezone" msgid="5045627174274377814">"Välj tidszon"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Ange datum"</string>
     <string name="date_time_date_format" msgid="436706100255870967">"Välj datumformat"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sortera i bokstavsordning"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sortera efter tidszon"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"Säkerhet och plats"</string>
-    <!-- no translation found for security_settings_summary (967393342537986570) -->
-    <skip />
+    <string name="security_settings_title" msgid="5168491784222013179">"Plats och säkerhet"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"Inställningar för plats och säkerhet"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"Ställ in Min plats, skärmupplåsning, lås för SIM-kort och lås för uppgiftslagring"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ställ in Min plats, skärmupplåsning, lås för uppgiftslagring"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Lösenord"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Aktivera Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth-inställningar"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth-inställningar"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Hantera anslutningar, ange inställningar för enhetens namn och synlighet"</string>
-    <string name="bluetooth_pin_entry" msgid="5627349871303455279">"Begäran om Bluetooth-parkoppling"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Begäran om Bluetooth-parkoppling"</string>
     <string name="bluetooth_device_info" msgid="6644515376523965073">"Information om Bluetooth-enhet"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="7551139612735632370">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n" Ange PIN-kod för parkoppling."\n" (Försök med 0000 eller 1234.)"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Ange PIN-koden om du vill koppla ihop med \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (testa 0000 eller 1234.)"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Ange nyckel för parkoppling med \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Om du vill parkoppla med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>bekräftar du att rätt nyckel visas: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"vill kopplas ihop."</string>
+    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Ange <xliff:g id="PASSKEY">%2$s</xliff:g> i \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" om du vill parkoppla."</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Parkoppling"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Parkoppla inte"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"Bluetooth-enhet"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Obs!"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Ett problem inträffade när <xliff:g id="DEVICE_NAME">%1$s</xliff:g> parkopplades."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="6938408362011024289">"Det gick inte att parkoppla <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eftersom den angivna PIN-koden är fel."</string>
-    <!-- no translation found for bluetooth_pairing_device_down_error_message (6688215193824686741) -->
-    <skip />
-    <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
-    <skip />
+    <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Det gick inte att parkoppla <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eftersom PIN-koden eller nyckeln inte stämmer."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"Det gick inte att upprätta kommunikation med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Parkoppling avvisad av <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Det gick inte att ansluta till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Sök efter enheter"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Anslut"</string>
@@ -261,6 +270,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Anslut till…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Media"</string>
     <string name="bluetooth_profile_headset" msgid="1874975688666658946">"Telefon"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Överför"</string>
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Ansluten till medialjud"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Ansluten till telefonens ljud"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Ansluten till telefon- och medialjud"</string>
@@ -270,8 +280,11 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profiler"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ansluten till medialjud"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ansluten till telefonens ljud"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ansluten till filöverföringsserver"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Inte ansluten till filöverföringsserver"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Använd för medialjud"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Använd för telefonens ljud"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Använd för filöverföring"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Aktivera Wi-Fi"</string>
@@ -288,25 +301,13 @@
     <string name="security" msgid="1040691896987225267">"Säkerhet"</string>
     <string name="wifi_security_open" msgid="3513305614048816607">"Öppna"</string>
     <string name="wifi_security_wep" msgid="7082604129842065776">"WEP"</string>
-    <string name="wifi_security_wpa" msgid="8980169410565477162">"WPA"</string>
-    <string name="wifi_security_wpa2" msgid="5780665935088930524">"WPA2"</string>
-    <!-- no translation found for wifi_security_wpa_eap (7485687331651751101) -->
-    <skip />
-    <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
-    <skip />
+    <string name="wifi_security_psk" msgid="3392399380570381452">"WPA/WPA2 PSK"</string>
+    <string name="wifi_security_eap" msgid="8309434150934969132">"Enterprise(802.1x)"</string>
     <string name="wifi_security_unknown" msgid="4564208312073060668">"Okänd"</string>
-    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
-    <skip />
+    <string name="wifi_security_verbose_open" msgid="8117878112088901945">"öppet nätverk"</string>
+    <string name="wifi_security_verbose_wep" msgid="9220757688700421508">"skyddad med WEP"</string>
+    <string name="wifi_security_verbose_psk" msgid="1110130025330416225">"skyddad med WPA/WPA2 PSK"</string>
+    <string name="wifi_security_verbose_eap" msgid="586632662086063">"skyddad med 802.1x EAP"</string>
     <string name="ip_address" msgid="850672263358989449">"IP-adress"</string>
     <string name="signal" msgid="1947969631626413228">"Signalstyrka"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"Aktiverar…"</string>
@@ -319,28 +320,19 @@
     <string name="error_saving" msgid="8294279443961615302">"Det gick inte att spara nätverket"</string>
     <string name="connect" msgid="3079076576295839400">"Anslut"</string>
     <string name="connect_to_blank" msgid="6950910074058025378">"Anslut till <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for please_select_eap (4488240331626456338) -->
-    <skip />
-    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
-    <skip />
-    <!-- no translation found for please_type_identity (7061261155499513089) -->
-    <skip />
-    <!-- no translation found for please_type_anonymous_identity (835061562079965048) -->
-    <skip />
-    <!-- no translation found for please_select_client_certificate (2137906961594663234) -->
-    <skip />
-    <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
-    <skip />
-    <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
-    <skip />
+    <string name="please_select_eap" msgid="4488240331626456338">"EAP-metod"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Autentisering för fas 2"</string>
+    <string name="please_type_identity" msgid="7061261155499513089">"Identitet"</string>
+    <string name="please_type_anonymous_identity" msgid="835061562079965048">"Anonym identitet"</string>
+    <string name="please_select_client_certificate" msgid="2137906961594663234">"Klientcertifikat"</string>
+    <string name="please_select_ca_certificate" msgid="5010815181914420677">"CA-certifikat"</string>
     <string name="please_type_passphrase" msgid="8256017704131522462">"Lösenord för trådlöst"</string>
     <string name="please_type_hex_key" msgid="8751224390407867551">"WEP-hextangent (0-9, A-F)"</string>
     <string name="wifi_show_password" msgid="4235237470701732009">"Visa lösenord."</string>
     <string name="scan_wifi" msgid="2459901725350542606">"Skanna"</string>
     <string name="summary_not_in_range" msgid="3926674700733548684">"Inte i intervall"</string>
-    <!-- no translation found for summary_remembered (6079941090549401742) -->
-    <skip />
-    <string name="summary_connection_failed" msgid="7610394657613410489">"Det gick inte att ansluta. Välj om du vill försöka igen."</string>
+    <string name="summary_remembered" msgid="6079941090549401742">"sparad"</string>
+    <string name="summary_connection_failed" msgid="2351885658101671413">"Det gick inte att ansluta. Tryck om du vill försöka igen."</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-nätverk"</string>
     <string name="wifi_type_ssid" msgid="1326839657083292017">"Nätverks-SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Säkerhet"</string>
@@ -391,6 +383,7 @@
     <string name="status_disconnected" msgid="7561688569905126046">"Frånkopplad"</string>
     <string name="status_failed" msgid="610462050405904601">"Misslyckades"</string>
     <string name="sound_and_display_settings" msgid="349770582993029003">"Ljud och skärm"</string>
+    <string name="sound_and_display_settings_title" msgid="5036144539683697330">"Inställningar för ljud och skärm"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Ljudinställningar"</string>
     <string name="sound_and_display_settings_summary" msgid="1433943789593286064">"Ställ in ringsignaler, aviseringar, skärmens ljusstryka"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Tyst läge"</string>
@@ -412,21 +405,20 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Ställ in volym för musik och video"</string>
     <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Knappljud"</string>
     <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Spela upp signaler när knappsatsen används"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Spela upp signaler när knappsatsen används"</string>
+    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Spela signaler när knappsatsen används"</string>
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"Välj ljud"</string>
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Spela upp ljud när du väljer på skärmen"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Spela upp ljud när du väljer något på skärmen"</string>
+    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Spela ljud när du väljer något på skärmen"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Haptisk återkoppling"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrera när funktionsknappar trycks ned och vid vissa gränssnittshändelser"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrera när funktionsknappar trycks ned och vid vissa gränssnittshändelser"</string>
     <string name="play_media_notification_sounds_enable_title" msgid="1008791464029179529">"Aviseringar för SD-kort"</string>
-    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
-    <skip />
-    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
-    <skip />
-    <string name="sync_settings" msgid="2212736205476453234">"Datasynkronisering"</string>
-    <string name="sync_settings_summary" msgid="6480534906375217074">"Välj vilka program som ska synkroniseras"</string>
-    <!-- no translation found for search_settings (1910951467596035063) -->
-    <skip />
-    <!-- no translation found for search_settings_summary (9205656546570654169) -->
-    <skip />
+    <string name="play_media_notification_sounds_enable_summary_on" msgid="7675466959375667370">"Spela ljud vid aviseringar för SD-kort"</string>
+    <string name="play_media_notification_sounds_enable_summary_off" msgid="8672617597028744693">"Spela ljud vid aviseringar för SD-kort"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Konton och synkronisering"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"Lägg till eller ta bort konton och ändra kontoinställningar"</string>
+    <string name="search_settings" msgid="1910951467596035063">"Sök"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Hantera sökinställningar och historik"</string>
     <string name="display_settings" msgid="3912042046350078328">"Visa inställningar"</string>
     <string name="animations_title" msgid="1062189037402346023">"Animering"</string>
     <string name="animations_summary_on" msgid="8843613112130484436">"Visa animering när fönster öppnas och stängs"</string>
@@ -438,6 +430,7 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ändra skärmens ljusstyrka"</string>
     <string name="screen_timeout" msgid="4882669461447531301">"Skärmens tidsgräns"</string>
     <string name="screen_timeout_summary" msgid="2905757633140605334">"Justera fördröjningen innan skärmen stängs av automatiskt"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk ljusstyrka"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Låsinställningar för SIM-kort"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Ställ in lås för SIM-kort"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Lås för SIM-kort"</string>
@@ -470,18 +463,14 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Inte tillgänglig"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
-    <!-- no translation found for device_status_summary (2599162787451519618) -->
-    <skip />
-    <string name="storage_settings_title" msgid="8461515684514801302">"SD-kort och telefonlagr."</string>
+    <string name="device_status_summary" msgid="2599162787451519618">"Telefonnummer, signal osv."</string>
+    <string name="storage_settings" msgid="6681164315506788024">"SD-kort och telefonlagr."</string>
+    <string name="storage_settings_title" msgid="5379463509034022773">"Inställningar för lagring på SD-kort och i telefonen"</string>
     <string name="storage_settings_summary" msgid="9176693537325988610">"Montera bort SD-kort, visa tillgängligt lagringsutrymme"</string>
-    <!-- no translation found for status_number (5123197324870153205) -->
-    <skip />
-    <!-- no translation found for status_min_number (3519504522179420597) -->
-    <skip />
-    <!-- no translation found for status_prl_version (8499039751817386529) -->
-    <skip />
-    <!-- no translation found for status_meid_number (1751442889111731088) -->
-    <skip />
+    <string name="status_number" msgid="5123197324870153205">"Mitt telefonnummer"</string>
+    <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_prl_version" msgid="8499039751817386529">"PRL-version"</string>
+    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Mobil nätverkstyp"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Status för mobilt nätverk"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Tjänststatus"</string>
@@ -520,6 +509,11 @@
     <string name="apn_mms_port" msgid="4074188088199243040">"MMS-port"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"Autentiseringstyp"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Inga"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP eller CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN-typ"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Ta bort APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nytt APN"</string>
@@ -533,13 +527,11 @@
     <string name="restore_default_apn" msgid="2724583218635739913">"Återställer standardinställning för APN"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Återställ standardinst."</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Återställning av standardinställningar för APN har slutförts"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Återställ standardinställn."</string>
+    <string name="master_clear_title" msgid="5907939616087039756">"Återställ standardinst."</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Raderar alla data på telefonen"</string>
-    <!-- no translation found for master_clear_desc (7823268823499739178) -->
-    <skip />
+    <string name="master_clear_desc" msgid="7823268823499739178">"Detta tar bort alla data från telefonen, inklusive: "\n<li>"Ditt Google-konto"</li>\n<li>"Data och inställningar för system och program"</li>\n<li>"Hämtade program"</li>\n"Det tar inte bort:"\n<li>"Aktuell systemprogramvara och medföljande program"</li>\n<li>"Filer på SD-kortet, som musik eller bilder"</li></string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Återställ telefonen"</string>
-    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
-    <skip />
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"Vill du ta bort all personlig information och alla hämtade program? Det går inte att ångra åtgärden!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Radera allt"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Rita ditt grafiska lösenord"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Du måste rita ditt grafiska lösenord om du vill återställa telefonen."</string>
@@ -556,20 +548,19 @@
     <string name="call_settings_summary" msgid="7291195704801002886">"Ställ in röstbrevlåda, vidarebefordra samtal, samtal väntar, nummerpres."</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobila nätverk"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Ställ in alternativ för roaming, nätverk, APN:er"</string>
-    <!-- no translation found for location_title (1029961368397484576) -->
-    <skip />
+    <string name="location_title" msgid="1029961368397484576">"Min plats"</string>
     <string name="location_network_based" msgid="8815705866861993344">"Använd trådlösa nätverk"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Se plats i programmen (till exempel kartor) med hjälp av trådlösa nätverk"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Plats fastställs av Wi-Fi och/eller mobila nätverk"</string>
-    <string name="location_gps" msgid="375912731641377120">"Aktivera GPS-satelliter"</string>
-    <string name="location_street_level" msgid="5899941752252356344">"När du söker, korrekt till gatunivå (avmarkera om du vill spara batteri)"</string>
+    <string name="location_gps" msgid="6296125378829097831">"Använd GPS-satelliter"</string>
+    <string name="location_street_level" msgid="6460740847018275745">"När du söker, korrekt till gatunivå (avmarkera om du vill spara batteri)"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Hitta till gatunivå (kräver mer batteri och fungerar endast utomhus)"</string>
-    <!-- no translation found for use_location_title (7585990952633568732) -->
-    <skip />
-    <!-- no translation found for use_location_summary (4411467143899877395) -->
-    <skip />
-    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
-    <skip />
+    <string name="assisted_gps" msgid="4649317129586736885">"Använd assisterad GPS"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Använd servern för att förbättra GPS-funktionen (avmarkera om du vill minska nätverksbelastningen)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Använd servern för att förbättra GPS-funktionen (avmarkera om du vill förbättra GPS-funktionen)"</string>
+    <string name="use_location_title" msgid="5447030582538504247">"Använd Min plats"</string>
+    <string name="use_location_summary" msgid="1816849484040070431">"Använd Min plats för Google-sökresultat och andra Google-tjänster"</string>
+    <string name="use_location_warning_message" msgid="1420184860518262439">"Vill du tillåta att Google använder plats för förbättrade sökresultat och andra tjänster?"</string>
     <string name="agree" msgid="6288718671527758326">"Jag godkänner"</string>
     <string name="disagree" msgid="6221069272309799230">"Godkänn inte"</string>
     <string name="about_settings" msgid="1743378368185371685">"Om telefonen"</string>
@@ -579,12 +570,15 @@
     <string name="copyright_title" msgid="865906688917260647">"Upphovsrätt"</string>
     <string name="license_title" msgid="1990487604356037871">"Licens"</string>
     <string name="terms_title" msgid="7697580845616764642">"Användarvillkor"</string>
-    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
-    <skip />
+    <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Systemets självstudie"</string>
     <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Lär dig hur du använder din telefon"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Öppen källkodslicens"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Ett problem inträffade när licenserna lästes in."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Läser in…"</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Säkerhetsinformation"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Säkerhetsinformation"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Din telefon är inte ansluten till en datatjänst. Besök %s på en dator som är ansluten till Internet om du vill visa informationen nu."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Läser in …"</string>
     <string name="lock_settings_title" msgid="5828348303971852121">"Skärmens grafiska lösenord"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Byt grafiskt lösenord"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bekräfta sparat grafiskt lösenord"</string>
@@ -613,9 +607,9 @@
     <string name="skip_button_label" msgid="8680422740354436943">"Avbryt"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Nästa"</string>
     <string name="lock_title" msgid="4059246467204273930">"Skydda din telefon"</string>
-    <string name="lock_intro_message" msgid="5352897389718432077"><font size="17">"Skydda din telefon från obehörig användning genom att skapa ett personligt grafiskt lösenord på skärmen. "\n<font height="17">\n</font>"1"<b></b>"  Se hur ett grafiskt lösenord ritas på nästa skärm. "\n<font height="17">\n</font><b>"2"</b>" Rita ditt eget grafiska lösenord. Experimentera med olika grafiska lösenord men anslut minst fyra punkter. "\n<font height="17">\n</font><b>"3"</b>"  Rita ditt grafiska lösenord igen för att bekräfta. "\n<font height="17">\n</font><b>" Är du redo att börja? Välj Nästa"</b>". "\n<font height="3">\n</font>"Välj Avbryt om du vill lämna telefonen oskyddad."</font></string>
+    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Skydda din telefon från obehörig användning genom att skapa ett personligt grafiskt lösenord på skärmen. "\n<font height="17">\n</font>"1"<b></b>"  Se hur ett grafiskt lösenord ritas på nästa skärm. "\n<font height="17">\n</font><b>"2"</b>" Rita ditt eget grafiska lösenord. Experimentera med olika grafiska lösenord men anslut minst fyra punkter. "\n<font height="17">\n</font><b>"3"</b>"  Rita ditt grafiska lösenord igen för att bekräfta. "\n<font height="17">\n</font><b>" Är du redo att börja? Tryck på Nästa"</b>". "\n<font height="3">\n</font>"Tryck på Avbryt om du vill lämna telefonen oskyddad."</font></string>
     <string name="lock_example_title" msgid="8052305554017485410">"Exempel på grafiskt lösenord"</string>
-    <string name="lock_example_message" msgid="7431982730914254881">"Anslut minst fyra punkter."\n" "\n"Välj Nästa när du vill rita ditt eget grafiska lösenord."</string>
+    <string name="lock_example_message" msgid="1838650097090632706">"Anslut minst fyra punkter."\n" "\n"Tryck på Nästa när du vill rita ditt eget grafiska lösenord."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Hantera program"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Hantera och ta bort installerade program"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Program"</string>
@@ -638,8 +632,7 @@
     <string name="data_size_label" msgid="8679376373625710107">"Data"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Avinstallera"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Rensa data"</string>
-    <!-- no translation found for app_factory_reset (6635744722502563022) -->
-    <skip />
+    <string name="app_factory_reset" msgid="6635744722502563022">"Avinstallera uppdateringar"</string>
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Du har valt att starta detta program som standard för vissa åtgärder."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Inga standardinställningar har angetts."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Rensa standardinställn."</string>
@@ -650,32 +643,41 @@
     <string name="filter" msgid="2018011724373033887">"Filtrera"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Välj filteralternativ"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Alla"</string>
-    <string name="filter_apps_third_party" msgid="1096017647285183437">"Tredje part"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Hämtade"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Kör"</string>
     <string name="loading" msgid="3200408047793887917">"Läser in…"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Räknar om storlek…"</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Radera"</string>
-    <string name="clear_data_dlg_text" msgid="8796694785488630642">"All information som du har sparat i detta program tas bort permanent."</string>
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"Alla programmets data tas bort permanent. Det inkluderar alla filer, inställningar, konton, databaser och så vidare."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Avbryt"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"Programmet hittades inte"</string>
     <string name="app_not_found_dlg_text" msgid="2980271680333341554">"Programmet fanns inte med i listan över installerade program."</string>
     <string name="clear_data_failed" msgid="581956197586913865">"Det gick inte att rensa programdata."</string>
-    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
-    <skip />
-    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
-    <skip />
-    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
-    <skip />
-    <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
-    <skip />
+    <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Avinstallera uppdateringar"</string>
+    <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Vill du avinstallera alla uppdateringar av det här Android-programmet?"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Ta bort data"</string>
+    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Det gick inte att ta bort data för programmet"</string>
     <string name="security_settings_desc" msgid="3116027624526915561">"Med det här programmet kommer du åt följande på din telefon:"</string>
-    <string name="computing_size" msgid="1599186977475211186">"Beräkningar…"</string>
+    <string name="computing_size" msgid="1599186977475211186">"Beräknar…"</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Det gick inte att räkna ut paketstorlek"</string>
-    <string name="empty_list_msg" msgid="1883660401486953588">"Du har inte installerat några program från tredje part."</string>
-    <!-- no translation found for version_text (9189073826278676425) -->
-    <skip />
-    <string name="language_settings" msgid="2939555761536357092">"Språkkod och text"</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"Du har inte installerat några program från tredje part."</string>
+    <string name="version_text" msgid="9189073826278676425">"version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"Aktiva tjänster"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Visa och styra aktiva tjänster"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"Startar om"</string>
+    <string name="no_running_services" msgid="6981216347270280598">"Det finns inga aktiva tjänster"</string>
+    <string name="confirm_stop_service" msgid="5700448757318301681">"Vill du avbryta tjänsten?"</string>
+    <string name="confirm_stop_service_msg" msgid="1202118456282395730">"Den här tjänsten körs inte igen förrän du startar om den. Det kan ha oönskad effekt på programmet <xliff:g id="APPLICATION">%1$s</xliff:g>."</string>
+    <string name="confirm_stop_stop" msgid="7382363913280993331">"Stopp"</string>
+    <string name="confirm_stop_cancel" msgid="206495326622692381">"Avbryt"</string>
+    <string name="service_started_by_app" msgid="8432097226392386802">"Startades av ett program: tryck om du vill avbryta"</string>
+    <string name="service_client_name" msgid="2337664610975074717">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: tryck om du vill hantera"</string>
+    <string name="service_background_processes" msgid="5158600475629177758">"Tillg.: <xliff:g id="FREE">%2$s</xliff:g>+<xliff:g id="MEMORY">%3$s</xliff:g> i <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_foreground_processes" msgid="4013890350284680796">"Övriga: <xliff:g id="MEMORY">%2$s</xliff:g> i <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_process_name" msgid="8630408984456958400">"Process: <xliff:g id="PROCESS">%1$s</xliff:g>"</string>
+    <string name="language_settings" msgid="502219872342167227">"Språk och tangentbord"</string>
+    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Inställningar för språk och tangentbord"</string>
     <string name="language_settings_summary" msgid="595647729475399987">"Ställ in alternativ för språkkod (land och område), textinmatning och autokorrigering"</string>
     <string name="language_category" msgid="3391756582724541530">"Språkkodsinställningar"</string>
     <string name="text_category" msgid="6342540511465136739">"Textinställningar"</string>
@@ -690,12 +692,12 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Tryck på blanksteg två gånger om du vill infoga \".\""</string>
     <string name="show_password" msgid="2198798062604049206">"Synliga lösenord"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Visa lösenord när du skriver"</string>
-    <string name="ime_security_warning" msgid="3458652708716006477">"Den här inmatningsmetoden kan samla all text som du anger, inklusive personliga uppgifter som lösenord och kreditkortsnummer. Den kommer från programmet <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Ska inmatningsmetoden aktiveras?"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"Den här inmatningsmetoden kan samla all text som du anger, inklusive personliga uppgifter som lösenord och kreditkortsnummer. Den kommer från programmet <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Ska inmatningsmetoden aktiveras?"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Användarens ordlista"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"Användarens ordlista"</string>
     <string name="user_dict_settings_summary" msgid="2460427065601355471">"Lägg till och ta bort ord från användarens ordlista"</string>
-    <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Lägga till"</string>
-    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Lägga till i ordlista"</string>
+    <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Lägg till"</string>
+    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Lägg till i ordlista"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Redigera ord"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Redigera"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Radera"</string>
@@ -718,7 +720,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Textinmatning"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Hantera textinmatningsalternativ"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>-inställningar"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="4919680715154885028">"Inställningar för skärmtangentbord"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Inställningar för tangentbordet på skärmen"</string>
     <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Enhetens knappsats"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Inställningar för inbyggt tangentbord"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Utveckling"</string>
@@ -729,13 +731,11 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skärmen vilar aldrig när laddning pågår"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Tillåt skenplatser"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillåt skenplatser"</string>
-    <!-- no translation found for adb_warning_title (1756027479229533250) -->
-    <skip />
-    <!-- no translation found for adb_warning_message (5352555112049663033) -->
-    <skip />
+    <string name="adb_warning_title" msgid="6234463310896563253">"Ska USB-felsökning tillåtas?"</string>
+    <string name="adb_warning_message" msgid="5352555112049663033">"USB-felsökning ska endast användas i utvecklingssyfte. Felsökningen kan användas för att kopiera data mellan datorn och enheten, installera program på enheten utan avisering och läsa loggdata."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Välj gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Välj widget"</string>
-    <string name="battery_history_details_for" msgid="5189636461798594740">"Information för användar-id %d"</string>
+    <string name="battery_history_details_for" msgid="5924639922153109669">"Information för användar-ID <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="battery_history_uid" msgid="1016606150528436298">"Användar-id <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage" msgid="8010852371665217020">"Information om nätverksanvändning för <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
     <string name="battery_history_bytes_received" msgid="980307569180518302">"Mottagna bytes: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
@@ -746,14 +746,10 @@
     <string name="battery_history_system_time" msgid="2015862072724507547">"Systemtid:"</string>
     <string name="battery_history_total_time" msgid="3618703970098556104">"Total tid:"</string>
     <string name="battery_history_starts" msgid="9137453931978571696">"Startar: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
-    <!-- no translation found for battery_history_days (7110262897769622564) -->
-    <skip />
-    <!-- no translation found for battery_history_hours (7525170329826274999) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
-    <skip />
-    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
-    <skip />
+    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
+    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
+    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
+    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
     <string name="battery_history_packages_sharing_this_uid" msgid="4101596071379250050">"Paket som delar denna UID:"</string>
     <string name="battery_history_no_data" msgid="1177238743237067617">"Ingen information om batterianvändning är tillgänglig"</string>
     <string name="battery_history_sensor" msgid="2333488996028993982">"Sensor:"</string>
@@ -775,400 +771,209 @@
     <string name="app_name_label" msgid="2000949925256858308">"Program"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"Räkneverk"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Användningstid"</string>
-    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
-    <skip />
-    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
-    <skip />
-    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
-    <skip />
-    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
-    <skip />
-    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
-    <skip />
-    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
-    <skip />
-    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
-    <skip />
-    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
-    <skip />
-    <!-- no translation found for power_usage_summary (7237084831082848168) -->
-    <skip />
-    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
-    <skip />
-    <!-- no translation found for battery_since_reset (7464546661121187045) -->
-    <skip />
-    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
-    <skip />
+    <string name="accessibility_settings" msgid="3975902491934816215">"Tillgänglighet"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Tillgänglighetsinställningar"</string>
+    <string name="accessibility_settings_summary" msgid="8185181964847149507">"Hantera tillgänglighetsalternativ"</string>
+    <string name="toggle_accessibility_title" msgid="650839277066574497">"Tillgänglighet"</string>
+    <string name="accessibility_services_category" msgid="8127851026323672607">"Tjänster för tillgänglighet"</string>
+    <string name="no_accessibility_services_summary" msgid="694578333333808159">"Inga installerade tillgänglighetstjänster."</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Tillgänglighetstjänsten kan samla in all text du skriver, inklusive personliga uppgifter som kreditkortsnummer, men inte lösenord. Den kan även logga din kommunikation med användargränssnittet. Den kommer från programmet <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Vill du aktivera tillgänglighetstjänsten?"</string>
+    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Vill du inaktivera tillgänglighet?"</string>
+    <string name="power_usage_summary_title" msgid="5180282911164282324">"Batteriförbrukning"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"Program som har förbrukat batteriet"</string>
+    <string name="battery_since_unplugged" msgid="338073389740738437">"Batteriförbrukning sedan bortkoppling"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"Batteriförbrukning sedan återställning"</string>
+    <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> sedan bortkoppling"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <!-- no translation found for awake (387122265874485088) -->
-    <skip />
-    <!-- no translation found for wifi_on_time (4630925382578609056) -->
-    <skip />
-    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
-    <skip />
-    <!-- no translation found for usage_name_percent (1899151069711662289) -->
-    <skip />
-    <!-- no translation found for details_title (7564809986329021063) -->
-    <skip />
-    <!-- no translation found for details_subtitle (32593908269911734) -->
-    <skip />
-    <!-- no translation found for controls_subtitle (390468421138288702) -->
-    <skip />
-    <!-- no translation found for packages_subtitle (4736416171658062768) -->
-    <skip />
-    <!-- no translation found for power_screen (2353149143338929583) -->
-    <skip />
-    <!-- no translation found for power_wifi (2382791137776486974) -->
-    <skip />
-    <!-- no translation found for power_bluetooth (4373329044379008289) -->
-    <skip />
-    <!-- no translation found for power_cell (6596471490976003056) -->
-    <skip />
-    <!-- no translation found for power_phone (5392641106474567277) -->
-    <skip />
-    <!-- no translation found for power_idle (9055659695602194990) -->
-    <skip />
-    <!-- no translation found for usage_type_cpu (715162150698338714) -->
-    <skip />
-    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
-    <skip />
-    <!-- no translation found for usage_type_gps (7989688715128160790) -->
-    <skip />
-    <!-- no translation found for usage_type_phone (9108247984998041853) -->
-    <skip />
-    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
-    <skip />
-    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
-    <skip />
-    <!-- no translation found for usage_type_audio (6957269406840886290) -->
-    <skip />
-    <!-- no translation found for usage_type_video (4295357792078579944) -->
-    <skip />
-    <!-- no translation found for usage_type_on_time (3351200096173733159) -->
-    <skip />
-    <!-- no translation found for usage_type_no_coverage (3797004252954385053) -->
-    <skip />
-    <!-- no translation found for battery_action_stop (649958863744041872) -->
-    <skip />
-    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
-    <skip />
-    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
-    <skip />
-    <!-- no translation found for battery_action_display (5302763261448580102) -->
-    <skip />
-    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
-    <skip />
-    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
-    <skip />
-    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
-    <skip />
-    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
-    <skip />
-    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
-    <skip />
-    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
-    <skip />
-    <!-- no translation found for battery_desc_display (5432795282958076557) -->
-    <skip />
-    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
-    <skip />
-    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
-    <skip />
-    <!-- no translation found for battery_sugg_wifi (7542345142282261691) -->
-    <skip />
-    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
-    <skip />
-    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
-    <skip />
-    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
-    <skip />
-    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_gps (4145005297393800223) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
-    <skip />
-    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
-    <skip />
-    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
-    <skip />
-    <!-- no translation found for menu_stats_total (8973377864854807854) -->
-    <skip />
-    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
-    <skip />
-    <!-- no translation found for process_kernel_label (3916858646836739323) -->
-    <skip />
-    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
-    <skip />
-    <!-- no translation found for tts_settings (6454363854545277027) -->
-    <skip />
-    <!-- no translation found for tts_settings_summary (2627715231944602766) -->
-    <skip />
-    <!-- no translation found for tts_settings_title (5064947197040356736) -->
-    <skip />
-    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
-    <skip />
-    <!-- no translation found for use_default_tts_settings_summary (4253502106159206276) -->
-    <skip />
-    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
-    <skip />
-    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
-    <skip />
-    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
-    <skip />
-    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
-    <skip />
-    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
-    <skip />
-    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
-    <skip />
-    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
-    <skip />
-    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
-    <skip />
-    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
-    <skip />
-    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
-    <skip />
-    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
-    <skip />
-    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
-    <skip />
-    <!-- no translation found for tts_demo (405357591189935876) -->
-    <skip />
-    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
-    <skip />
-    <!-- no translation found for gadget_title (7455548605888590466) -->
-    <skip />
-    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
-    <skip />
-    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
-    <skip />
-    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
-    <skip />
-    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
-    <skip />
-    <!-- no translation found for vpn_a_username (6664733641993968692) -->
-    <skip />
-    <!-- no translation found for vpn_a_password (1537213632501483753) -->
-    <skip />
-    <!-- no translation found for vpn_save_username (1408415289165970790) -->
-    <skip />
-    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
-    <skip />
-    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
-    <skip />
-    <!-- no translation found for vpn_no_button (7620339571187119107) -->
-    <skip />
-    <!-- no translation found for vpn_back_button (192036339792734970) -->
-    <skip />
-    <!-- no translation found for vpn_mistake_button (1683383660912491270) -->
-    <skip />
-    <!-- no translation found for vpn_menu_done (93528279226907926) -->
-    <skip />
-    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
-    <skip />
-    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
-    <skip />
-    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
-    <skip />
-    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
-    <skip />
-    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
-    <skip />
-    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
-    <skip />
-    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
-    <skip />
-    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
-    <skip />
-    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
-    <skip />
-    <!-- no translation found for vpn_reconnect_from_lost (2442844155623372118) -->
-    <skip />
-    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
-    <skip />
-    <!-- no translation found for vpn_challenge_error_dialog_msg (6174901754230038601) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set_dialog_msg (8013052814131532765) -->
-    <skip />
-    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
-    <skip />
-    <!-- no translation found for vpn_remote_hung_up_error_dialog_msg (1566946015052633150) -->
-    <skip />
-    <!-- no translation found for vpn_type_title (6392933604218676224) -->
-    <skip />
-    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
-    <skip />
-    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
-    <skip />
-    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
-    <skip />
-    <!-- no translation found for vpns (3148141862835492816) -->
-    <skip />
-    <!-- no translation found for vpn_connecting (8039521381692090116) -->
-    <skip />
-    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
-    <skip />
-    <!-- no translation found for vpn_connected (7641723116362845781) -->
-    <skip />
-    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
-    <skip />
-    <!-- no translation found for vpn_name (1550918148476193076) -->
-    <skip />
-    <!-- no translation found for vpn_a_name (8445736942405283509) -->
-    <skip />
-    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
-    <skip />
-    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
-    <skip />
-    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
-    <skip />
-    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
-    <skip />
-    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
-    <skip />
-    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
-    <skip />
-    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
-    <skip />
-    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
-    <skip />
-    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
-    <skip />
-    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
-    <skip />
-    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
-    <skip />
-    <!-- no translation found for vpn_pptp_encryption_title (2236795167467896499) -->
-    <skip />
-    <!-- no translation found for vpn_pptp_encryption (2602329949737259686) -->
-    <skip />
-    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
-    <skip />
-    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
-    <skip />
-    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
-    <skip />
-    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
-    <skip />
-    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
-    <skip />
-    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
-    <skip />
-    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
-    <skip />
-    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
-    <skip />
-    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
-    <skip />
-    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
-    <skip />
-    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
-    <skip />
-    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
-    <skip />
-    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
-    <skip />
-    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
-    <skip />
-    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
-    <skip />
-    <!-- no translation found for vpn_secret_unchanged (8700613973594154529) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set (1037792636371641845) -->
-    <skip />
-    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
-    <skip />
-    <!-- no translation found for cstor_access_title (1739505390736236717) -->
-    <skip />
-    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
-    <skip />
-    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
-    <skip />
-    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
-    <skip />
-    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
-    <skip />
-    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
-    <skip />
-    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
-    <skip />
-    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
-    <skip />
-    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
-    <skip />
-    <!-- no translation found for cstor_credential_password (7187440553141199409) -->
-    <skip />
-    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
-    <skip />
-    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
-    <skip />
-    <!-- no translation found for cstor_old_password (979282118063084561) -->
-    <skip />
-    <!-- no translation found for cstor_new_password (6218562692435670047) -->
-    <skip />
-    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
-    <skip />
-    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
-    <skip />
-    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
-    <skip />
-    <!-- no translation found for cstor_password_error (2917326097260402464) -->
-    <skip />
-    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
-    <skip />
-    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
-    <skip />
-    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
-    <skip />
-    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
-    <skip />
-    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
-    <skip />
-    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
-    <skip />
-    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
-    <skip />
-    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
-    <skip />
-    <!-- no translation found for cstor_storage_error (7140697503172458161) -->
-    <skip />
-    <!-- no translation found for cstor_unable_to_save_cert (1631402544447196406) -->
-    <skip />
-    <!-- no translation found for cstor_cert_not_saved (6318149789449538491) -->
-    <skip />
-    <!-- no translation found for cstor_is_reset (449870501126790589) -->
-    <skip />
-    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
-    <skip />
-    <!-- no translation found for cstor_is_added (794788474010251572) -->
-    <skip />
-    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
-    <skip />
-    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <string name="awake" msgid="387122265874485088">"Aktiv tid för enheten"</string>
+    <string name="wifi_on_time" msgid="4630925382578609056">"WiFi på sedan"</string>
+    <string name="bluetooth_on_time" msgid="4478515071957280711">"WiFi på sedan"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
+    <string name="details_title" msgid="7564809986329021063">"Information om batteriförbrukning"</string>
+    <string name="details_subtitle" msgid="32593908269911734">"Information om användning"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"Justera strömförbrukningen"</string>
+    <string name="packages_subtitle" msgid="4736416171658062768">"Inkluderade paket"</string>
+    <string name="power_screen" msgid="2353149143338929583">"Skärm"</string>
+    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
+    <string name="power_cell" msgid="6596471490976003056">"Mobilens viloläge"</string>
+    <string name="power_phone" msgid="5392641106474567277">"Röstsamtal"</string>
+    <string name="power_idle" msgid="9055659695602194990">"Telefonen är inaktiv"</string>
+    <string name="usage_type_cpu" msgid="715162150698338714">"CPU totalt"</string>
+    <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU i förgrunden"</string>
+    <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
+    <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</string>
+    <string name="usage_type_data_send" msgid="2857401966985425427">"Skickade data"</string>
+    <string name="usage_type_data_recv" msgid="7251090882025234185">"Mottagna data"</string>
+    <string name="usage_type_audio" msgid="6957269406840886290">"Ljud"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"Tid som funktionen varit på"</string>
+    <string name="usage_type_no_coverage" msgid="3797004252954385053">"Tid utan täckning"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"Tvingad avslutning"</string>
+    <string name="battery_action_app_details" msgid="3275013531871113681">"Programinformation"</string>
+    <string name="battery_action_app_settings" msgid="350562653472577250">"Programinställningar"</string>
+    <string name="battery_action_display" msgid="5302763261448580102">"Skärminställningar"</string>
+    <string name="battery_action_wifi" msgid="5452076674659927993">"WiFi-inställningar"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-inställningar"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"Batteri som förbrukats av röstsamtal"</string>
+    <string name="battery_desc_standby" msgid="3009080001948091424">"Batteri som förbrukas när telefonen är inaktiv"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"Batteri som förbrukats av radion"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"Växla till flygplansläge om du vill spara batteri när du är i ett område utan täckning"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"Batteri som förbrukats av skärm och bakgrundsbelysning"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"Minska skärmens ljusstyrka och/eller skärmens tidsgräns"</string>
+    <string name="battery_desc_wifi" msgid="1702486494565080431">"Batteri som förbrukats av Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="7542345142282261691">"Inaktivera Wi-Fi när det inte används eller när det inte är tillgängligt"</string>
+    <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Batteri som förbrukats av Bluetooth"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Inaktivera Bluetooth när du inte använder funktionen"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Försök ansluta till en annan Bluetooth-enhet"</string>
+    <string name="battery_desc_apps" msgid="8123202939321333639">"Batteri som förbrukats av program som körs"</string>
+    <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Avsluta eller avinstallera programmet"</string>
+    <string name="battery_sugg_apps_gps" msgid="4145005297393800223">"Inaktivera GPS när det inte används"</string>
+    <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"Programmet erbjuder eventuellt inställningar som minskar batteriförbrukningen"</string>
+    <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sedan bortkoppling"</string>
+    <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Sedan senaste bortkoppling <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_total" msgid="8973377864854807854">"Total förbrukning"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"Uppdatera"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"Operativsystemet Android"</string>
+    <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
+    <string name="tts_settings" msgid="3348626948015962987">"Text-till-tal"</string>
+    <string name="tts_settings_summary" msgid="2627715231944602766">"Ange alternativ för text-till-tal"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Text-till-tal-inställningar"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Använd alltid mina inställningar"</string>
+    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Standardinställningarna nedan åsidosätter programinställningarna"</string>
+    <string name="tts_default_settings_section" msgid="5787915620218907443">"Standardinställningar"</string>
+    <string name="tts_default_rate_title" msgid="6030550998379310088">"Talhastighet"</string>
+    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Talhastighet för texten"</string>
+    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ton"</string>
+    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Påverkar den talade textens ton"</string>
+    <string name="tts_default_lang_title" msgid="8018087612299820556">"Språk"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Ange språkspecifik röst för den talade texten"</string>
+    <string name="tts_play_example_title" msgid="7094780383253097230">"Lyssna på ett exempel"</string>
+    <string name="tts_play_example_summary" msgid="8029071615047894486">"Spela upp en kort demonstration av talsyntes"</string>
+    <string name="tts_install_data_title" msgid="4264378440508149986">"Installera röstdata"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"Installera de ljuddata som krävs för talsyntes"</string>
+    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Rösterna som krävs för talsyntes är redan installerade"</string>
+    <string name="tts_demo" msgid="405357591189935876">"Detta är ett exempel på talsyntes."</string>
+    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Dina inställningar har ändrats. Detta är ett exempel på hur de låter."</string>
+    <string name="gadget_title" msgid="7455548605888590466">"Strömkontroll"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Uppdaterar Wi-Fi-inställningar"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Uppdatera Bluetooth-inställningar"</string>
+    <string name="credential_installer_activity_title" msgid="7600661521831762521">"Installerare för användaruppgifter"</string>
+    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN-inställningar"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"Anslut till <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpn_username_colon" msgid="7854930370861306247">"Användarnamn:"</string>
+    <string name="vpn_password_colon" msgid="5716278710848606626">"Lösenord:"</string>
+    <string name="vpn_a_username" msgid="6664733641993968692">"ett användarnamn"</string>
+    <string name="vpn_a_password" msgid="1537213632501483753">"ett lösenord"</string>
+    <string name="vpn_save_username" msgid="1408415289165970790">"Kom ihåg användarnamnet"</string>
+    <string name="vpn_connect_button" msgid="1699007212602470655">"Anslut"</string>
+    <string name="vpn_yes_button" msgid="8034531001149843119">"Ja"</string>
+    <string name="vpn_no_button" msgid="7620339571187119107">"Nej"</string>
+    <string name="vpn_back_button" msgid="192036339792734970">"Tillbaka"</string>
+    <string name="vpn_mistake_button" msgid="1683383660912491270">"Nej"</string>
+    <string name="vpn_menu_done" msgid="93528279226907926">"Spara"</string>
+    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Avbryt"</string>
+    <string name="vpn_menu_revert" msgid="4407762442281467659">"Återgå"</string>
+    <string name="vpn_menu_connect" msgid="1089399414463784218">"Anslut till nätverk"</string>
+    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Koppla ifrån nätverket"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Redigera nätverk"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Ta bort nätverk"</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Du måste ange <xliff:g id="CODE">%s</xliff:g>."</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Du måste välja <xliff:g id="OPTION">%s</xliff:g>."</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"VPN-namnet <xliff:g id="NAME">%s</xliff:g> finns redan. Använd ett annat namn."</string>
+    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Vill du ta bort detta VPN?"</string>
+    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Vill du inte skapa den här profilen?"</string>
+    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Vill du ignorera ändringarna som gjorts i profilen?"</string>
+    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Det går inte att ansluta till nätverket. Vill du försöka igen?"</string>
+    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Anslutningen avbröts. Vill du ansluta igen?"</string>
+    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Servernamnet kunde inte matchas. Vill du kontrollera inställningarna för servernamn?"</string>
+    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Fel vid anrop. Vill du kontrollera hemlighetsinställningen?"</string>
+    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Det saknas en eller flera hemligheter i VPN-konfigurationen. Vill du kontrollera hemlighetsinställningen?"</string>
+    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Användarnamnet eller lösenordet som du angav var felaktigt. Vill du försöka igen?"</string>
+    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Servern kopplade ifrån. Du kanske angav fel användarnamn eller lösenord. Vill du försöka igen?"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Servern avbröt kommunikationen. Du kanske befinner dig bakom en brandvägg som förhindrar att du ansluter till servern. Vill du försöka igen?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Serveranslutningen misslyckades. Servern kanske inte accepterar ditt krypteringsval. Vill du kontrollera krypteringsinställningen?"</string>
+    <string name="vpn_type_title" msgid="6392933604218676224">"Lägg till VPN"</string>
+    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Lägg till VPN"</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Lägg till <xliff:g id="NAME">%s</xliff:g> VPN"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Information om <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpns" msgid="3148141862835492816">"VPN"</string>
+    <string name="vpn_connecting" msgid="8039521381692090116">"Ansluter..."</string>
+    <string name="vpn_disconnecting" msgid="7748050200708257066">"Kopplar ifrån..."</string>
+    <string name="vpn_connected" msgid="7641723116362845781">"Ansluten"</string>
+    <string name="vpn_connect_hint" msgid="7442898962925875181">"Anslut till nätverk"</string>
+    <string name="vpn_name" msgid="1550918148476193076">"VPN-namn"</string>
+    <string name="vpn_a_name" msgid="8445736942405283509">"ett VPN-namn"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"\"<xliff:g id="NAME">%s</xliff:g>\" har lagts till"</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"Ändringar har gjorts i \"<xliff:g id="NAME">%s</xliff:g>\""</string>
+    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Ange användarcertifikat"</string>
+    <string name="vpn_user_certificate" msgid="949322691686938888">"Användarcertifikat"</string>
+    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"ett användarcertifikat"</string>
+    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Ange CA-certifikat"</string>
+    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certifikat från certifikatutfärdare"</string>
+    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"ett CA-certifikat"</string>
+    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Ange L2TP-hemlighet"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP-hemlighet"</string>
+    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"en L2TP-hemlighet"</string>
+    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"kryptering"</string>
+    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"PPTP-kryptering"</string>
+    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Ange i förväg delad IPSec-nyckel"</string>
+    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"I förväg delad IPSec-nyckel"</string>
+    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"en i förväg delad IPsec-nyckel"</string>
+    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Ange VPN-server"</string>
+    <string name="vpn_vpn_server" msgid="1141754908824209260">"VPN-server"</string>
+    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"en VPN-server"</string>
+    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"VPN-serverns namn"</string>
+    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS-sökdomäner"</string>
+    <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS-sökdomäner"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> har angetts"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> ej angivet"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> har inte angetts (valfritt)"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"Aktivera <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"Inaktivera <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> är aktiverad"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> är inaktiverat"</string>
+    <string name="vpn_settings_title" msgid="7327468307909556719">"VPN-inställningar"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"Konfigurera och hantera virtuella privata nätverk (VPN)"</string>
+    <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(oförändrat)"</string>
+    <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ej angivet)"</string>
+    <string name="credentials_category" msgid="8536992056377271234">"Uppgiftslagring"</string>
+    <string name="credentials_access" msgid="4843187230913860492">"Använd säkra uppgifter"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"Tillåt att program får åtkomst till säkra certifikat och andra uppgifter"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"Ange lösenord"</string>
+    <string name="credentials_unlock_hint" msgid="594679530407918031">"Ange lösenord för lagring av uppgifter."</string>
+    <string name="credentials_install_certificates" msgid="177337517568022236">"Installera från SD-kort"</string>
+    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Installera krypterade certifikat från SD-kort"</string>
+    <string name="credentials_set_password" msgid="9104473585811899989">"Ange lösenord"</string>
+    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Ange eller ändra lösenord för uppgiftslagring"</string>
+    <string name="credentials_reset" msgid="9170150870552453457">"Rensa lagring"</string>
+    <string name="credentials_reset_summary" msgid="1530388094693731636">"Ta bort uppgiftslagring för allt innehåll och återställ lösenordet"</string>
+    <string name="credentials_reset_hint" msgid="819990295796804516">"Vill du ta bort alla uppgifter och återställa lösenordet för uppgiftslagring?"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"Nuvarande lösenord:"</string>
+    <string name="credentials_new_password" msgid="267487774686796938">"Nytt lösenord:"</string>
+    <string name="credentials_confirm_password" msgid="4732250000633424345">"Bekräfta det nya lösenordet:"</string>
+    <string name="credentials_first_time_hint" msgid="1567821077545346039">"Ange ett lösenord för uppgiftslagring (minst 8 tecken)."</string>
+    <string name="credentials_wrong_password" msgid="7525192410790152041">"Ange rätt lösenord."</string>
+    <string name="credentials_reset_warning" msgid="6392481296673345268">"Ange rätt lösenord. Du har ett försök på dig att ange rätt lösenord, därefter raderas uppgiftslagringen."</string>
+    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Ange rätt lösenord. Du har <xliff:g id="NUMBER">%1$d</xliff:g> försök på dig att ange rätt lösenord, därefter raderas uppgiftslagringen."</string>
+    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Lösenorden stämmer inte överens."</string>
+    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Du måste ange och bekräfta ett lösenord."</string>
+    <string name="credentials_password_empty" msgid="8292138152983330473">"Ange lösenordet."</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"Lösenordet måste innehålla minst 8 tecken."</string>
+    <string name="credentials_erased" msgid="7700309135582200849">"Uppgiftslagringen raderades."</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"Uppgiftslagring är aktiverat."</string>
+    <string name="credentials_disabled" msgid="7453188089059045380">"Uppgiftslagring har inaktiverats."</string>
+    <string name="emergency_tone_title" msgid="1055954530111587114">"Nödsignal"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"Ange beteende vid nödsamtal"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Sekretess"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Sekretessinställningar"</string>
+    <string name="location_section_title" msgid="6072558684044939786">"Plats"</string>
+    <string name="settings_section_title" msgid="7413252428447723032">"Inställningar"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Personliga data"</string>
+    <string name="backup_settings_title" msgid="2968262658155327829">"Säkerhetskopiera mina inställningar"</string>
+    <string name="backup_erase_dialog_title" msgid="6028429904055779443">"Säkerhetskopiering av inställningar"</string>
+    <string name="backup_erase_dialog_message" msgid="9096433810456900531">"Vill du avbryta säkerhetskopiering av dina inställningar och radera alla kopior på Googles servrar?"</string>
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
     <skip />
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 04e79bded24..b64ad881913 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -24,38 +24,59 @@
     <item msgid="5345178126174698955">"Pasifik"</item>
     <item msgid="8392017019801393511">"Tümü"</item>
   </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"Canlandırma yok"</item>
+    <item msgid="6291186755504776720">"Bazı canlandırmalar"</item>
+    <item msgid="3856065399819979491">"Tüm canlandırmalar"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"Hiçbir pencere animasyonu gösterilmiyor"</item>
+    <item msgid="4460915688877708508">"Bazı pencere animasyonları gösterilir"</item>
+    <item msgid="488968798204105119">"Tüm pencere animasyonları gösterilir"</item>
+  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 saniye"</item>
     <item msgid="8881760709354815449">"30 saniye"</item>
     <item msgid="7589406073232279088">"1 dakika"</item>
     <item msgid="7001195990902244174">"2 dakika"</item>
     <item msgid="5721688686241190620">"10 dakika"</item>
-    <item msgid="1781492122915870416">"Asla zaman aşımına uğrama"</item>
+    <item msgid="7156442995039264948">"30 dakika"</item>
+  </string-array>
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Çok yavaş"</item>
+    <item msgid="2361722960903353554">"Yavaş"</item>
+    <item msgid="1145554631248513562">"Normal"</item>
+    <item msgid="7553665153391107454">"Hızlı"</item>
+    <item msgid="2538100882620724753">"Çok hızlı"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item msgid="7526050907652687351">"Çok düşük"</item>
+    <item msgid="2692137425242433765">"Düşük"</item>
+    <item msgid="3332408460740717754">"Normal"</item>
+    <item msgid="4907380534957572531">"Yüksek"</item>
+    <item msgid="4699640516390840297">"Çok yüksek"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item msgid="478030717868306353">"Amerikan İngilizcesi"</item>
+    <item msgid="5192284521396794598">"İngiliz İngilizcesi"</item>
+    <item msgid="3000262452051711991">"Fransızca"</item>
+    <item msgid="9214080387341763401">"Almanca"</item>
+    <item msgid="5972100016440094433">"İtalyanca"</item>
+    <item msgid="5811378076054402537">"İspanyolca"</item>
+  </string-array>
+  <string-array name="wifi_security_entries">
+    <item msgid="2923732046112398627">"Otomatik"</item>
+    <item msgid="5434666299123318296">"Hiçbiri"</item>
+    <item msgid="3159594845889645948">"WEP"</item>
+    <item msgid="1687348101566181433">"WPA/WPA2 PSK"</item>
+    <item msgid="329777238762866787">"802.1x Enterprise"</item>
+  </string-array>
+  <string-array name="wifi_security_without_auto_entries">
+    <item msgid="4402120432904877907">"Hiçbiri"</item>
+    <item msgid="2329148995431627488">"WEP"</item>
+    <item msgid="6903317668294332381">"WPA/WPA2 PSK"</item>
+    <item msgid="7280821339307729710">"802.1x Enterprise"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
-    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
-    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
-    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
-    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
-    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
-    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
-    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
-    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
-    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
-    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
-    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
-    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
-    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
-    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
-    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
-    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
-    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
-    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
-    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
-    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
-    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
-    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
-    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
   <string-array name="wifi_wep_type">
     <item msgid="1497433962958697183">"Otomatik"</item>
     <item msgid="7182335713815377158">"WEP ASCII"</item>
@@ -75,8 +96,8 @@
     <item msgid="4832254146664706277">"Diğer kullanım"</item>
   </string-array>
   <string-array name="battery_history_which_spinner">
-    <item msgid="3451981114763440074">"Fişten son çıkarmadan bu yana"</item>
-    <item msgid="166936313535197598">"Açılıştan bu yana toplam"</item>
+    <item msgid="3451981114763440074">"Fişten son çıkarmadan itibaren"</item>
+    <item msgid="166936313535197598">"Açılıştan itibaren toplam"</item>
     <item msgid="4793941382744963893">"Tüm zamanlardaki toplam"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
@@ -84,15 +105,27 @@
     <item msgid="1908750532762193304">"Sayımı Başlat"</item>
     <item msgid="1213951670006606353">"Uygulama Adı"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
-    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
-    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
-    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
-    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
-    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
-    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
-    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
-    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
-    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
-    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="1818786254010764570">"Yok"</item>
+    <item msgid="6189918678874123056">"PAP"</item>
+    <item msgid="1524112260493662517">"MSCHAP"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
+    <item msgid="8651992560135239389">"GTC"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Kapalı"</item>
+    <item msgid="3165868966179561687">"Uyarı"</item>
+    <item msgid="6038758039030476855">"Titret"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"Yok"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP veya CHAP"</item>
+  </string-array>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 503280c34bf..45d7d71b9ca 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -15,6 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"Evet"</string>
+    <string name="no" msgid="6731231425810196216">"Hayır"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Bilinmiyor"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Radyoyu aç"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Radyoyu kapat"</string>
@@ -56,6 +58,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"Tamam"</string>
     <string name="sdcard_setting" msgid="5922637503871474866">"SD kart"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Pil durumu:"</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"Güç fişi:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Pil skalası:"</string>
     <string name="battery_info_level_label" msgid="8706526709307788737">"Pil düzeyi:"</string>
     <string name="battery_info_health_label" msgid="6416051542741886958">"Pil gücü:"</string>
@@ -75,6 +78,11 @@
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"Boşaltılıyor"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Şarj etmiyor"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Dolu"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Prize takılı değil"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"Bilinmiyor"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Bilinmiyor"</string>
     <string name="battery_info_health_good" msgid="8070356565806711806">"İyi"</string>
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"Aşırı ısınma"</string>
@@ -104,14 +112,19 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth eşleşme isteği"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Eşleşme isteği"</string>
     <string name="bluetooth_notif_message" msgid="5381418499788668724">"Eşleşmek için seç "</string>
+    <string name="device_picker" msgid="8721012448931226323">"Bluetooth cihazı seçicisi"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth izin isteği"</string>
+    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Telefonunuzdaki bir uygulama, Bluetooth\'u açmak için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
+    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Telefonunuzdaki bir uygulama telefonunuzu <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca diğer Bluetooth cihazları tarafından bulunabilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Telefonunuzdaki bir uygulama, <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca Bluetooth\'u açmak ve telefonunuzu diğer cihazlar tarafından bulunabilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Bluetooth açılıyor..."</string>
     <string name="date_and_time" msgid="4114084177056654663">"Tarih ve saat ayarları"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
     <string name="date_time_changeTime_text" msgid="7037437020000867740">"Saati değiştir"</string>
     <string name="date_time_changeDate_text" msgid="5259762626498028057">"Tarih"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Saat dilimini seç"</string>
-    <!-- no translation found for normal_date_format (1982904221918374153) -->
-    <skip />
+    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Önizleme:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Yazı tipi boyutu:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -192,33 +205,23 @@
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy ayarları"</string>
     <string name="cancel" msgid="6859253417269739139">"İptal"</string>
     <string name="settings_label" msgid="1626402585530130914">"Ayarlar"</string>
-    <!-- no translation found for settings_shortcut (3672145147925639262) -->
-    <skip />
+    <string name="settings_shortcut" msgid="3672145147925639262">"Ayarlar"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Uçak modu"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Tüm kablosuz bağlantıları devre dışı bırak"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Kablosuz bağlantılar devre dışı bırakılıyor…"</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Kablosuz bağlantılar etkinleştiriliyor…"</string>
-    <string name="radio_controls_title" msgid="8356991079873437337">"Kablosuz denetimler"</string>
-    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
-    <skip />
-    <!-- no translation found for roaming (3596055926335478572) -->
-    <skip />
-    <!-- no translation found for roaming_enable (3737380951525303961) -->
-    <skip />
-    <!-- no translation found for roaming_disable (1295279574370898378) -->
-    <skip />
-    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
-    <skip />
-    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
-    <skip />
-    <!-- no translation found for roaming_warning (1269870211689178511) -->
-    <skip />
-    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
-    <skip />
-    <!-- no translation found for networks (6333316876545927039) -->
-    <skip />
-    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
-    <skip />
+    <string name="radio_controls_title" msgid="5868688473587168882">"Kablosuz özelliği ve ağlar"</string>
+    <string name="wireless_networks_settings_title" msgid="149274247949769551">"Kablosuz ve ağ ayarları"</string>
+    <string name="radio_controls_summary" msgid="2998818677094465517">"Kablosuz, Bluetooth, uçak modu, mobil ağ ve VPN özelliklerini yönet"</string>
+    <string name="roaming" msgid="3596055926335478572">"Veri dolaşımı"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Dolaşırken veri hizmetlerine bağlan"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Dolaşırken veri hizmetlerine bağlan"</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"Veri dolaşımı kapalıyken ana ağınızdan ayrıldığınız için veri bağlantısını kaybettiniz."</string>
+    <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Açın"</string>
+    <string name="roaming_warning" msgid="1269870211689178511">"Veri dolaşımına izin verilsin mi? Kayda değer dolaşım ücretleri ödeyebilirsiniz!"</string>
+    <string name="roaming_reenable_title" msgid="7626425894611573131">"Dikkat"</string>
+    <string name="networks" msgid="6333316876545927039">"Operatör seçimi"</string>
+    <string name="sum_carrier_select" msgid="6648929373316748020">"Bir ağ operatörü seçin"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Tarih ve saat"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Tarihi, saati, saat dilimini ve biçimleri ayarla"</string>
     <string name="date_time_auto" msgid="3086083265745944725">"Otomatik"</string>
@@ -231,25 +234,31 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Tarih biçimini seç"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Alfabetik olarak sırala"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Saat dilimine göre sırala"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"Güvenlik ve konum"</string>
-    <!-- no translation found for security_settings_summary (967393342537986570) -->
-    <skip />
+    <string name="security_settings_title" msgid="5168491784222013179">"Konum ve güvenlik"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"Konum ve güvenlik ayarları"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"Konumum, ekran kil. açma, SIM kart kil., kim. bilg. dep.kilidini ayarla"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Konumum, ekran kilidi açma, kimlik bilgileri deposunun kilidi özelliklerini ayarla"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Şifreler"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth\'u aç"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth ayarları"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth ayarları"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Bağlantıları yönet, cihaz adını gir ve keşfedilebilirlik ayarını yap"</string>
-    <string name="bluetooth_pin_entry" msgid="5627349871303455279">"Bluetooth eşleşme isteği"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth eşleşme isteği"</string>
     <string name="bluetooth_device_info" msgid="6644515376523965073">"Bluetooth cihaz bilgileri"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="7551139612735632370">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Eşleşmek için PIN kodunu yazın."\n"(0000 ve 1234\'ü deneyin.)"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ile eşleşmesi için PIN kodunu yazın. (0000 veya 1234\'ü deneyin.)"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ile eşleştirmek için passkey kodunu yazın."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ile eşleştirmek için, şu passkey kodunu gösterdiğini doğrulayın: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"eşleşme istiyor."</string>
+    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Eşleştirmek için \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" cihazına <xliff:g id="PASSKEY">%2$s</xliff:g> kodunu girin."</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Çift"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Eşleştirme"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"bluetooth cihazı"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Dikkat"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşleşmede bir sorun oluştu."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="6938408362011024289">"Yazılan PIN kodu yanlış olduğundan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşleşmede bir sorun oldu."</string>
-    <!-- no translation found for bluetooth_pairing_device_down_error_message (6688215193824686741) -->
-    <skip />
-    <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
-    <skip />
+    <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"PIN veya Passkey kodu yanlış olduğundan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşleşmede bir sorun oldu."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile bağlantı kurulamıyor."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Eşleştirme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tarafından reddedildi."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> noktasına bağlanırken bir sorun oluştu."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Cihazları tara"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Bağlan"</string>
@@ -261,6 +270,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Bağlan…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Medya"</string>
     <string name="bluetooth_profile_headset" msgid="1874975688666658946">"Telefon"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Aktar"</string>
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Medya sesine bağlanıldı"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Telefon sesine bağlandı"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Telefon ve medya sesine bağlandı"</string>
@@ -270,8 +280,11 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profiller"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Medya sesine bağlanıldı"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Telefon sesine bağlandı"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Dosya aktarım sunucusuna bağlandı"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Dosya aktarım sunucusuna bağlanmadı"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Medya sesi için kullan"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Telefon sesi için kullan"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Dosya aktarımı için kullan"</string>
     <string name="wifi" msgid="1081550856200013637">"Kablosuz"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Kablosuz"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Kablosuzu aç"</string>
@@ -288,25 +301,13 @@
     <string name="security" msgid="1040691896987225267">"Güvenlik"</string>
     <string name="wifi_security_open" msgid="3513305614048816607">"Aç"</string>
     <string name="wifi_security_wep" msgid="7082604129842065776">"WEP"</string>
-    <string name="wifi_security_wpa" msgid="8980169410565477162">"WPA"</string>
-    <string name="wifi_security_wpa2" msgid="5780665935088930524">"WPA2"</string>
-    <!-- no translation found for wifi_security_wpa_eap (7485687331651751101) -->
-    <skip />
-    <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
-    <skip />
+    <string name="wifi_security_psk" msgid="3392399380570381452">"WPA/WPA2 PSK"</string>
+    <string name="wifi_security_eap" msgid="8309434150934969132">"Enterprise(802.1x)"</string>
     <string name="wifi_security_unknown" msgid="4564208312073060668">"Bilinmiyor"</string>
-    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
-    <skip />
+    <string name="wifi_security_verbose_open" msgid="8117878112088901945">"güvensiz ağ"</string>
+    <string name="wifi_security_verbose_wep" msgid="9220757688700421508">"WEP ile güvenlik altına alındı"</string>
+    <string name="wifi_security_verbose_psk" msgid="1110130025330416225">"WPA/WPA2 PSK ile güvenlik altına alındı"</string>
+    <string name="wifi_security_verbose_eap" msgid="586632662086063">"802.1x EAP ile güvenlik altına alındı"</string>
     <string name="ip_address" msgid="850672263358989449">"IP adresi"</string>
     <string name="signal" msgid="1947969631626413228">"Sinyal gücü"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"Açılıyor…"</string>
@@ -319,28 +320,19 @@
     <string name="error_saving" msgid="8294279443961615302">"Ağ kaydedilemiyor"</string>
     <string name="connect" msgid="3079076576295839400">"Bağlan"</string>
     <string name="connect_to_blank" msgid="6950910074058025378">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ağına bağlan"</string>
-    <!-- no translation found for please_select_eap (4488240331626456338) -->
-    <skip />
-    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
-    <skip />
-    <!-- no translation found for please_type_identity (7061261155499513089) -->
-    <skip />
-    <!-- no translation found for please_type_anonymous_identity (835061562079965048) -->
-    <skip />
-    <!-- no translation found for please_select_client_certificate (2137906961594663234) -->
-    <skip />
-    <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
-    <skip />
-    <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
-    <skip />
+    <string name="please_select_eap" msgid="4488240331626456338">"EAP yöntemi"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Aşama 2 için kimlik doğrulaması"</string>
+    <string name="please_type_identity" msgid="7061261155499513089">"Kimlik"</string>
+    <string name="please_type_anonymous_identity" msgid="835061562079965048">"Bilinmeyen kimlik"</string>
+    <string name="please_select_client_certificate" msgid="2137906961594663234">"İstemci sertifikası"</string>
+    <string name="please_select_ca_certificate" msgid="5010815181914420677">"CA sertifikası"</string>
     <string name="please_type_passphrase" msgid="8256017704131522462">"Kablosuz şifresi"</string>
     <string name="please_type_hex_key" msgid="8751224390407867551">"Onaltılık WEP anahtarı (0-9, A-F)"</string>
     <string name="wifi_show_password" msgid="4235237470701732009">"Şifreyi göster."</string>
     <string name="scan_wifi" msgid="2459901725350542606">"Tara"</string>
     <string name="summary_not_in_range" msgid="3926674700733548684">"Menzil dışında"</string>
-    <!-- no translation found for summary_remembered (6079941090549401742) -->
-    <skip />
-    <string name="summary_connection_failed" msgid="7610394657613410489">"Bağlantı kurulamadı, yeniden denemek için seçin"</string>
+    <string name="summary_remembered" msgid="6079941090549401742">"anımsandı"</string>
+    <string name="summary_connection_failed" msgid="2351885658101671413">"Bağlantı kurulamadı, tekrar denemek için dokunun"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Kablosuz ağlar"</string>
     <string name="wifi_type_ssid" msgid="1326839657083292017">"Ağ SSID\'si"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Güvenlik"</string>
@@ -391,6 +383,7 @@
     <string name="status_disconnected" msgid="7561688569905126046">"Bağlantı kesildi"</string>
     <string name="status_failed" msgid="610462050405904601">"Başarısız"</string>
     <string name="sound_and_display_settings" msgid="349770582993029003">"Ses ve görüntü"</string>
+    <string name="sound_and_display_settings_title" msgid="5036144539683697330">"Ses ve görüntü ayarları"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Ses ayarları"</string>
     <string name="sound_and_display_settings_summary" msgid="1433943789593286064">"Zil seslerini, bildirimleri, ekran parlaklığını ayarla"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Sessiz mod"</string>
@@ -416,17 +409,16 @@
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"Duyulabilir seçim"</string>
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Ekran seçimi yaparken ses çal"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Ekran seçimi yaparken ses çal"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Dokunsal geribildirim"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Yumuşak tuşlara basarken ve belirli UI (Kullanıcı Arayüzü) etkileşimleri sırasında titret"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Yumuşak tuşlara basarken ve belirli UI (Kullanıcı Arayüzü) etkileşimleri sırasında titret"</string>
     <string name="play_media_notification_sounds_enable_title" msgid="1008791464029179529">"SD kart bildirimleri"</string>
-    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
-    <skip />
-    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
-    <skip />
-    <string name="sync_settings" msgid="2212736205476453234">"Veri senkronizasyonu"</string>
-    <string name="sync_settings_summary" msgid="6480534906375217074">"Senkronize edilecek uygulamaları seç"</string>
-    <!-- no translation found for search_settings (1910951467596035063) -->
-    <skip />
-    <!-- no translation found for search_settings_summary (9205656546570654169) -->
-    <skip />
+    <string name="play_media_notification_sounds_enable_summary_on" msgid="7675466959375667370">"SD kart bildirimleri için ses yürüt"</string>
+    <string name="play_media_notification_sounds_enable_summary_off" msgid="8672617597028744693">"SD kart bildirimleri için ses yürüt"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Hesaplar ve senkronizasyon"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"Hesapları ekle veya kaldır ve hesap ayarlarını değiştir"</string>
+    <string name="search_settings" msgid="1910951467596035063">"Ara"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Arama ayarlarını ve geçmişi yönet"</string>
     <string name="display_settings" msgid="3912042046350078328">"Ekran ayarları"</string>
     <string name="animations_title" msgid="1062189037402346023">"Animasyon"</string>
     <string name="animations_summary_on" msgid="8843613112130484436">"Pencereleri açıp kapatırken animasyon kullan"</string>
@@ -438,6 +430,7 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ekranın parlaklığını ayarla"</string>
     <string name="screen_timeout" msgid="4882669461447531301">"Ekran zaman aşımı"</string>
     <string name="screen_timeout_summary" msgid="2905757633140605334">"Ekran otomatik olarak kapanmadan önceki gecikmeyi ayarla"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"Otomatik parlaklık"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kart kilit ayarları"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM kart kilidini ayarla"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM kart kilidi"</string>
@@ -470,18 +463,14 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Uygun değil"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Durum"</string>
     <string name="device_status" msgid="607405385799807324">"Durum"</string>
-    <!-- no translation found for device_status_summary (2599162787451519618) -->
-    <skip />
-    <string name="storage_settings_title" msgid="8461515684514801302">"SD kart ve telefon depolama alanı"</string>
+    <string name="device_status_summary" msgid="2599162787451519618">"Telefon numarası, sinyal vb."</string>
+    <string name="storage_settings" msgid="6681164315506788024">"SD kart ve telefon depolama alanı"</string>
+    <string name="storage_settings_title" msgid="5379463509034022773">"SD kart ve telefon depolama alanı ayarları"</string>
     <string name="storage_settings_summary" msgid="9176693537325988610">"SD kartın bağlantısını kes, kull. Depolama alanını görüntüle"</string>
-    <!-- no translation found for status_number (5123197324870153205) -->
-    <skip />
-    <!-- no translation found for status_min_number (3519504522179420597) -->
-    <skip />
-    <!-- no translation found for status_prl_version (8499039751817386529) -->
-    <skip />
-    <!-- no translation found for status_meid_number (1751442889111731088) -->
-    <skip />
+    <string name="status_number" msgid="5123197324870153205">"Telefon numaram"</string>
+    <string name="status_min_number" msgid="3519504522179420597">"MİN"</string>
+    <string name="status_prl_version" msgid="8499039751817386529">"PRL Sürümü"</string>
+    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Mobil ağ türü"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Mobil ağ durumu"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Hizmet durumu"</string>
@@ -520,6 +509,11 @@
     <string name="apn_mms_port" msgid="4074188088199243040">"MMS bağlantı noktası"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"Kimlik doğrulama türü"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Yok"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP veya CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN türü"</string>
     <string name="menu_delete" msgid="6981294422841124659">"APN\'yi sil"</string>
     <string name="menu_new" msgid="3014205883303921729">"Yeni APN"</string>
@@ -535,11 +529,9 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Varsayılan APN ayarlarını sıfırlama tamamlandı"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrika verilerine sıfırla"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Telefondaki tüm verileri siler"</string>
-    <!-- no translation found for master_clear_desc (7823268823499739178) -->
-    <skip />
+    <string name="master_clear_desc" msgid="7823268823499739178">"Bu, şunlar da dahil olmak üzere telefonunuzdaki tüm verileri silecektir:"\n<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verisi ve ayarları"</li>\n<li>"İndirilmiş uygulamalar"</li>\n"Şunlar silinmeyecektir:"\n<li>"Geçerli sistem yazılımı ve donanımla gelen uygulamalar"</li>\n<li>"Müzik veya resim gibi SD kart dosyaları"</li></string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Telefonu sıfırla"</string>
-    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
-    <skip />
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"Tüm kişisel bilgilerinizi ve indirilen tüm uygulamaları silmek istiyor musunuz? Bu işlem geri döndürülemez!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Her şeyi sil"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Kilit açma deseninizi çizin"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Telefon sıfırlamayı onaylamak için kilit açma deseninizi çizmelisiniz."</string>
@@ -556,20 +548,19 @@
     <string name="call_settings_summary" msgid="7291195704801002886">"Sesli mesaj, çağrı yönlendirme ve bekletme, arayan kimliğini ayarla"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobil ağlar"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Dolaşım, şebeke, APN seçeneklerini ayarla"</string>
-    <!-- no translation found for location_title (1029961368397484576) -->
-    <skip />
+    <string name="location_title" msgid="1029961368397484576">"Konumum"</string>
     <string name="location_network_based" msgid="8815705866861993344">"Kablosuz ağ kullan"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Konumu, kablosuz ağlar kullanan (Google Haritalar gibi) uygulamalarda gör"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Konum kablosuz ve/veya cep telefonu ağları tarafından belirlenir"</string>
-    <string name="location_gps" msgid="375912731641377120">"GPS uydularını etkinleştir"</string>
-    <string name="location_street_level" msgid="5899941752252356344">"Yer bulunurken sokak düzeyinde kesinlik (pilden tasarruf etmek için seçimi kaldırın)"</string>
+    <string name="location_gps" msgid="6296125378829097831">"GPS uydularını kullan"</string>
+    <string name="location_street_level" msgid="6460740847018275745">"Konum bulunurken sokak düzeyinde kesinliğe ayarlayın (pilden tasarruf etmek için onay işaretini kaldırın)"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Sokak düzeyinde yer bul (daha fazla pil ve gökyüzü görünümü gerektirir)"</string>
-    <!-- no translation found for use_location_title (7585990952633568732) -->
-    <skip />
-    <!-- no translation found for use_location_summary (4411467143899877395) -->
-    <skip />
-    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
-    <skip />
+    <string name="assisted_gps" msgid="4649317129586736885">"Desteklenen GPS kullan"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"GPS\'ye destek olmak için sunucu kullan (ağ kullanımını azaltmak için onay işaretini kaldırın)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"GPS\'ye yardımcı olmak için sunucu kullan (GPS performansını iyileştirmek için onay işaretini kaldırın)"</string>
+    <string name="use_location_title" msgid="5447030582538504247">"Konumum\'u Kullan"</string>
+    <string name="use_location_summary" msgid="1816849484040070431">"Google arama sonuçları ve diğer Google hizmetleri için Konumum\'u kullan"</string>
+    <string name="use_location_warning_message" msgid="1420184860518262439">"Google\'a gelişmiş arama sonuçları ve diğer hizmetler için konum kullanma izni vermek istiyor musunuz?"</string>
     <string name="agree" msgid="6288718671527758326">"Kabul ediyorum"</string>
     <string name="disagree" msgid="6221069272309799230">"Kabul etmiyorum"</string>
     <string name="about_settings" msgid="1743378368185371685">"Telefon hakkında"</string>
@@ -579,12 +570,15 @@
     <string name="copyright_title" msgid="865906688917260647">"Telif Hakkı"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisans"</string>
     <string name="terms_title" msgid="7697580845616764642">"Şartlar ve koşullar"</string>
-    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
-    <skip />
+    <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Sistem eğiticisi"</string>
     <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Telefonunuzu nasıl kullanacağınızı öğrenin"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Açık kaynak lisansları"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Lisanslar yüklenirken bir sorun oluştu."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Yükleniyor…"</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Güvenlik bilgileri"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Güvenlik bilgileri"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Telefonunuz bir veri hizmetine bağlı değil. Bu bilgiyi şimdi görüntülemek için İnternet\'e bağlı herhangi bir bilgisayardan %s adresine gidin."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Yükleniyor…"</string>
     <string name="lock_settings_title" msgid="5828348303971852121">"Ekran kilidi açma deseni"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Kilit açma desenini değiştir"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Kaydedilen deseni onayla"</string>
@@ -613,9 +607,9 @@
     <string name="skip_button_label" msgid="8680422740354436943">"İptal"</string>
     <string name="next_button_label" msgid="8890792540116568321">"İleri"</string>
     <string name="lock_title" msgid="4059246467204273930">"Telefonunuz güvenlik altına alınıyor"</string>
-    <string name="lock_intro_message" msgid="5352897389718432077"><font size="17">"Kişisel bir ekran kilidi açma deseni oluşturarak telefonunuzu yetkisiz kullanımdan koruyun. "\n<font height="17">\n</font><b>"1"</b>"  Bir sonraki ekranda örnek bir desenin çizilişini izleyin. "\n<font height="17">\n</font><b>"2"</b>"  Hazır olduğunuzda, kendi kişisel kilit açma deseninizi çizin. Değişik desenleri deneyebilirsiniz ancak en az dört noktayı birleştirin. "\n<font height="17">\n</font><b>"3"</b>"  Onaylamak için deseninizi yeniden çizin. "\n<font height="17">\n</font><b>"Başlamaya hazır mısınız? \"İleri\"yi seçin"</b>". "\n<font height="3">\n</font>"Telefonunuzu korumasız bırakmak için \"İptal\"i seçin."</font></string>
+    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Kişisel bir ekran kilidi açma deseni oluşturarak telefonunuzu yetkisiz kullanımdan koruyun. "\n<font height="17">\n</font><b>"1"</b>"  Bir sonraki ekranda örnek bir desenin çizilişini izleyin. "\n<font height="17">\n</font><b>"2"</b>"  Hazır olduğunuzda, kendi kişisel kilit açma deseninizi çizin. Değişik desenleri deneyebilirsiniz ancak en az dört noktayı birleştirin. "\n<font height="17">\n</font><b>"3"</b>"  Onaylamak için deseninizi yeniden çizin. "\n<font height="17">\n</font><b>"Başlamaya hazır mısınız? \"İleri\"ye dokunun"</b>". "\n<font height="3">\n</font>"Telefonunuzu korumasız bırakmak için \"İptal\"e dokunun."</font></string>
     <string name="lock_example_title" msgid="8052305554017485410">"Örnek desen"</string>
-    <string name="lock_example_message" msgid="7431982730914254881">"En az dört noktayı birleştirin."\n" "\n"Kendi deseninizi çizmeye hazır olduğunuzda \"İleri\"yi seçin."</string>
+    <string name="lock_example_message" msgid="1838650097090632706">"En az dört noktayı birleştirin."\n" "\n"Kendi deseninizi çizmeye hazır olduğunuzda \"İleri\"ye dokunun."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Uygulamaları yönet"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Yüklü uygulamaları yönet ve kaldır"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Uygulamalar"</string>
@@ -638,8 +632,7 @@
     <string name="data_size_label" msgid="8679376373625710107">"Veri"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Kaldır"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Verileri temizle"</string>
-    <!-- no translation found for app_factory_reset (6635744722502563022) -->
-    <skip />
+    <string name="app_factory_reset" msgid="6635744722502563022">"Güncellemeleri kaldır"</string>
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Bu uygulamayı bazı işlemler için varsayılan olarak başlatmayı seçtiniz."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Hiçbir varsayılan ayarlanmadı."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Varsayılanları temizle"</string>
@@ -650,32 +643,41 @@
     <string name="filter" msgid="2018011724373033887">"Filtre"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Filtre seçeneklerini belirle"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Tümü"</string>
-    <string name="filter_apps_third_party" msgid="1096017647285183437">"Üçüncü taraf"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"İndirilen"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Çalışıyor"</string>
     <string name="loading" msgid="3200408047793887917">"Yükleniyor…"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Boyut yeniden hesaplanıyor…"</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Sil"</string>
-    <string name="clear_data_dlg_text" msgid="8796694785488630642">"Bu uygulamaya kaydettiğiniz tüm bilgiler kalıcı olarak silinecek."</string>
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"Bu uygulamanın tüm verileri kalıcı olarak silinecek. Bu veriler arasında tüm dosyalar, ayarlar, hesaplar, veritabanları vs. yer alıyor."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"Tamam"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"İptal"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"Uygulama bulunamadı"</string>
     <string name="app_not_found_dlg_text" msgid="2980271680333341554">"Uygulama yüklü uygulamalar listesinde bulunamadı."</string>
     <string name="clear_data_failed" msgid="581956197586913865">"Uygulama verileri silinemiyor."</string>
-    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
-    <skip />
-    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
-    <skip />
-    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
-    <skip />
-    <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
-    <skip />
+    <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Güncellemeleri kaldır"</string>
+    <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Bu Android sistem uygulamasıyla ilgili tüm güncellemeleri kaldırmak istiyor musunuz?"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Verileri temizle"</string>
+    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Veriler uygulama için temizlenemedi"</string>
     <string name="security_settings_desc" msgid="3116027624526915561">"Bu uygulama telefonunuzda aşağıdakilere erişebilir:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Hesaplanıyor…"</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Paket boyutu hesaplanamıyor"</string>
-    <string name="empty_list_msg" msgid="1883660401486953588">"Yüklü üçüncü taraf uygulamanız yok."</string>
-    <!-- no translation found for version_text (9189073826278676425) -->
-    <skip />
-    <string name="language_settings" msgid="2939555761536357092">"Yerel ayar ve metin"</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"Yüklenmiş hiçbir üçüncü taraf uygulamalarınız yok."</string>
+    <string name="version_text" msgid="9189073826278676425">"sürüm <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"Çalışan hizmetler"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Şu anda çalışan hizmetleri görüntüleyin ve denetleyin"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"Yeniden başlatılıyor"</string>
+    <string name="no_running_services" msgid="6981216347270280598">"Çalışan hizmet yok"</string>
+    <string name="confirm_stop_service" msgid="5700448757318301681">"Hizmet durdurulsun mu?"</string>
+    <string name="confirm_stop_service_msg" msgid="1202118456282395730">"Bu hizmet, yeniden başlatılana kadar çalışmayacak. Bu durum, <xliff:g id="APPLICATION">%1$s</xliff:g> uygulamasında istenmeyen sonuçlara yol açabilir."</string>
+    <string name="confirm_stop_stop" msgid="7382363913280993331">"Durdur"</string>
+    <string name="confirm_stop_cancel" msgid="206495326622692381">"İptal"</string>
+    <string name="service_started_by_app" msgid="8432097226392386802">"Uygulama tarafından başlatıldı: durdurmak için dokunun"</string>
+    <string name="service_client_name" msgid="2337664610975074717">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: yönetmek için dokunun"</string>
+    <string name="service_background_processes" msgid="5158600475629177758">"Kullanılabilir: <xliff:g id="COUNT">%1$d</xliff:g> hesabında <xliff:g id="FREE">%2$s</xliff:g>+<xliff:g id="MEMORY">%3$s</xliff:g>"</string>
+    <string name="service_foreground_processes" msgid="4013890350284680796">"Diğer: <xliff:g id="COUNT">%1$d</xliff:g> hesabında <xliff:g id="MEMORY">%2$s</xliff:g>"</string>
+    <string name="service_process_name" msgid="8630408984456958400">"İşlem: <xliff:g id="PROCESS">%1$s</xliff:g>"</string>
+    <string name="language_settings" msgid="502219872342167227">"Dil ve klavye"</string>
+    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Dil ve klavye ayarları"</string>
     <string name="language_settings_summary" msgid="595647729475399987">"Yer (dil ve bölge), metin girişi ve ot. düzeltme seçeneklerini ayarla"</string>
     <string name="language_category" msgid="3391756582724541530">"Yerel ayar"</string>
     <string name="text_category" msgid="6342540511465136739">"Metin ayarları"</string>
@@ -690,7 +692,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"“.” karakterini girmek için Boşluk tuşuna iki kez basın"</string>
     <string name="show_password" msgid="2198798062604049206">"Görünür şifreler"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Yazarken şifreyi göster"</string>
-    <string name="ime_security_warning" msgid="3458652708716006477">"Bu giriş yöntemi, şifre ve kredi kartı numarası gibi kişisel veriler dahil olmak üzere yazdığınız tüm metni toplayabilir. <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> uygulamasından gelir. Bu giriş yöntemi etkinleştirilsin mi?"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"Bu giriş yöntemi, şifreler ve kredi kartı numaraları gibi kişisel veriler de dahil olmak üzere yazdığınız tüm metni toplayabilir. <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> uygulamasından gelmektedir. Bu giriş yöntemini kullanmak istiyor musunuz?"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kullanıcı sözlüğü"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"Kullanıcı sözlüğü"</string>
     <string name="user_dict_settings_summary" msgid="2460427065601355471">"Kullanıcı sözlüğüne kelime ekleyip sözlükten kelime çıkar"</string>
@@ -718,7 +720,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Metin girişi"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Metin giriş seçeneklerini yönet"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> ayarları"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="4919680715154885028">"Dokunmatik klavye ayarları"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ekran klavyesi ayarları"</string>
     <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Cihaz klavyesi"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Yerleşik klavye ayarları"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Geliştirme"</string>
@@ -729,13 +731,11 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Şarj edilirken ekran hiçbir zaman uykuya geçmez"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Sahte konumlara izin ver"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Sahte konumlara izin ver"</string>
-    <!-- no translation found for adb_warning_title (1756027479229533250) -->
-    <skip />
-    <!-- no translation found for adb_warning_message (5352555112049663033) -->
-    <skip />
+    <string name="adb_warning_title" msgid="6234463310896563253">"USB hata ayıklamasına izin verilsin mi?"</string>
+    <string name="adb_warning_message" msgid="5352555112049663033">"USB hata ayıklaması yalnızca geliştirme amaçlıdır. Verileri bilgisayarınızla cihazınız arasında kopyalamak, bildirim göndermeksizin uygulamaları cihazınıza yüklemek ve günlük verilerini okumak için kullanılabilir."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Gadget seç"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Widget seç"</string>
-    <string name="battery_history_details_for" msgid="5189636461798594740">"UID %d ayrıntıları"</string>
+    <string name="battery_history_details_for" msgid="5924639922153109669">"UID <xliff:g id="NUMBER">%d</xliff:g> ayrıntıları"</string>
     <string name="battery_history_uid" msgid="1016606150528436298">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage" msgid="8010852371665217020">"<xliff:g id="APP_NAME">%1$s</xliff:g> için ağ kullanım ayrıntıları:"</string>
     <string name="battery_history_bytes_received" msgid="980307569180518302">"Alınan bayt: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
@@ -746,14 +746,10 @@
     <string name="battery_history_system_time" msgid="2015862072724507547">"Sistem saati:"</string>
     <string name="battery_history_total_time" msgid="3618703970098556104">"Toplam süre:"</string>
     <string name="battery_history_starts" msgid="9137453931978571696">"Başlama: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
-    <!-- no translation found for battery_history_days (7110262897769622564) -->
-    <skip />
-    <!-- no translation found for battery_history_hours (7525170329826274999) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
-    <skip />
-    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
-    <skip />
+    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>g <xliff:g id="HOURS">%2$d</xliff:g>s <xliff:g id="MINUTES">%3$d</xliff:g>d <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
+    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>s <xliff:g id="MINUTES">%2$d</xliff:g>d <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
+    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>d <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
+    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
     <string name="battery_history_packages_sharing_this_uid" msgid="4101596071379250050">"Bu UID\'yi paylaşan paketler:"</string>
     <string name="battery_history_no_data" msgid="1177238743237067617">"Pil kullanım verisi yok"</string>
     <string name="battery_history_sensor" msgid="2333488996028993982">"Algılayıcı:"</string>
@@ -775,400 +771,209 @@
     <string name="app_name_label" msgid="2000949925256858308">"Uygulama"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"Sayım"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Kullanım süresi"</string>
-    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
-    <skip />
-    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
-    <skip />
-    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
-    <skip />
-    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
-    <skip />
-    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
-    <skip />
-    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
-    <skip />
-    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
-    <skip />
-    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
-    <skip />
-    <!-- no translation found for power_usage_summary (7237084831082848168) -->
-    <skip />
-    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
-    <skip />
-    <!-- no translation found for battery_since_reset (7464546661121187045) -->
-    <skip />
-    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
-    <skip />
+    <string name="accessibility_settings" msgid="3975902491934816215">"Erişilebilirlik"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Erişebilirlik ayarları"</string>
+    <string name="accessibility_settings_summary" msgid="8185181964847149507">"Erişilebilirlik seçeneklerini yönet"</string>
+    <string name="toggle_accessibility_title" msgid="650839277066574497">"Erişilebilirlik"</string>
+    <string name="accessibility_services_category" msgid="8127851026323672607">"Erişilebilirlik hizmetleri"</string>
+    <string name="no_accessibility_services_summary" msgid="694578333333808159">"Yüklenmiş erişilebilirlik hizmeti yok."</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Bu erişebilirlik hizmeti, şifreler hariç ve kişisel veriler, kredi kartı numaraları dahil olmak üzere yazdığınız tüm metinleri toplayabilir. Kullanıcı arayüzü etkileşimlerinizin kaydını da tutabilir. <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> uygulamasından gelmektedir. Bu erişebilirlik hizmetini kullanmak istiyor musunuz?"</string>
+    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Erişilebilirlik devre dışı bırakılsın mı?"</string>
+    <string name="power_usage_summary_title" msgid="5180282911164282324">"Pil kullanımı"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"Pili ne kullanıyor?"</string>
+    <string name="battery_since_unplugged" msgid="338073389740738437">"Fişten çekildikten itibaren pil kullanımı"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"Sıfırlamadan itibaren pil kullanımı"</string>
+    <string name="battery_stats_duration" msgid="7464501326709469282">"Fişten çekildikten itibaren <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <!-- no translation found for awake (387122265874485088) -->
-    <skip />
-    <!-- no translation found for wifi_on_time (4630925382578609056) -->
-    <skip />
-    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
-    <skip />
-    <!-- no translation found for usage_name_percent (1899151069711662289) -->
-    <skip />
-    <!-- no translation found for details_title (7564809986329021063) -->
-    <skip />
-    <!-- no translation found for details_subtitle (32593908269911734) -->
-    <skip />
-    <!-- no translation found for controls_subtitle (390468421138288702) -->
-    <skip />
-    <!-- no translation found for packages_subtitle (4736416171658062768) -->
-    <skip />
-    <!-- no translation found for power_screen (2353149143338929583) -->
-    <skip />
-    <!-- no translation found for power_wifi (2382791137776486974) -->
-    <skip />
-    <!-- no translation found for power_bluetooth (4373329044379008289) -->
-    <skip />
-    <!-- no translation found for power_cell (6596471490976003056) -->
-    <skip />
-    <!-- no translation found for power_phone (5392641106474567277) -->
-    <skip />
-    <!-- no translation found for power_idle (9055659695602194990) -->
-    <skip />
-    <!-- no translation found for usage_type_cpu (715162150698338714) -->
-    <skip />
-    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
-    <skip />
-    <!-- no translation found for usage_type_gps (7989688715128160790) -->
-    <skip />
-    <!-- no translation found for usage_type_phone (9108247984998041853) -->
-    <skip />
-    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
-    <skip />
-    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
-    <skip />
-    <!-- no translation found for usage_type_audio (6957269406840886290) -->
-    <skip />
-    <!-- no translation found for usage_type_video (4295357792078579944) -->
-    <skip />
-    <!-- no translation found for usage_type_on_time (3351200096173733159) -->
-    <skip />
-    <!-- no translation found for usage_type_no_coverage (3797004252954385053) -->
-    <skip />
-    <!-- no translation found for battery_action_stop (649958863744041872) -->
-    <skip />
-    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
-    <skip />
-    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
-    <skip />
-    <!-- no translation found for battery_action_display (5302763261448580102) -->
-    <skip />
-    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
-    <skip />
-    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
-    <skip />
-    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
-    <skip />
-    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
-    <skip />
-    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
-    <skip />
-    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
-    <skip />
-    <!-- no translation found for battery_desc_display (5432795282958076557) -->
-    <skip />
-    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
-    <skip />
-    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
-    <skip />
-    <!-- no translation found for battery_sugg_wifi (7542345142282261691) -->
-    <skip />
-    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
-    <skip />
-    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
-    <skip />
-    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
-    <skip />
-    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_gps (4145005297393800223) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
-    <skip />
-    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
-    <skip />
-    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
-    <skip />
-    <!-- no translation found for menu_stats_total (8973377864854807854) -->
-    <skip />
-    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
-    <skip />
-    <!-- no translation found for process_kernel_label (3916858646836739323) -->
-    <skip />
-    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
-    <skip />
-    <!-- no translation found for tts_settings (6454363854545277027) -->
-    <skip />
-    <!-- no translation found for tts_settings_summary (2627715231944602766) -->
-    <skip />
-    <!-- no translation found for tts_settings_title (5064947197040356736) -->
-    <skip />
-    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
-    <skip />
-    <!-- no translation found for use_default_tts_settings_summary (4253502106159206276) -->
-    <skip />
-    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
-    <skip />
-    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
-    <skip />
-    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
-    <skip />
-    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
-    <skip />
-    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
-    <skip />
-    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
-    <skip />
-    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
-    <skip />
-    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
-    <skip />
-    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
-    <skip />
-    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
-    <skip />
-    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
-    <skip />
-    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
-    <skip />
-    <!-- no translation found for tts_demo (405357591189935876) -->
-    <skip />
-    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
-    <skip />
-    <!-- no translation found for gadget_title (7455548605888590466) -->
-    <skip />
-    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
-    <skip />
-    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
-    <skip />
-    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
-    <skip />
-    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
-    <skip />
-    <!-- no translation found for vpn_a_username (6664733641993968692) -->
-    <skip />
-    <!-- no translation found for vpn_a_password (1537213632501483753) -->
-    <skip />
-    <!-- no translation found for vpn_save_username (1408415289165970790) -->
-    <skip />
-    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
-    <skip />
-    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
-    <skip />
-    <!-- no translation found for vpn_no_button (7620339571187119107) -->
-    <skip />
-    <!-- no translation found for vpn_back_button (192036339792734970) -->
-    <skip />
-    <!-- no translation found for vpn_mistake_button (1683383660912491270) -->
-    <skip />
-    <!-- no translation found for vpn_menu_done (93528279226907926) -->
-    <skip />
-    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
-    <skip />
-    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
-    <skip />
-    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
-    <skip />
-    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
-    <skip />
-    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
-    <skip />
-    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
-    <skip />
-    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
-    <skip />
-    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
-    <skip />
-    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
-    <skip />
-    <!-- no translation found for vpn_reconnect_from_lost (2442844155623372118) -->
-    <skip />
-    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
-    <skip />
-    <!-- no translation found for vpn_challenge_error_dialog_msg (6174901754230038601) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set_dialog_msg (8013052814131532765) -->
-    <skip />
-    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
-    <skip />
-    <!-- no translation found for vpn_remote_hung_up_error_dialog_msg (1566946015052633150) -->
-    <skip />
-    <!-- no translation found for vpn_type_title (6392933604218676224) -->
-    <skip />
-    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
-    <skip />
-    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
-    <skip />
-    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
-    <skip />
-    <!-- no translation found for vpns (3148141862835492816) -->
-    <skip />
-    <!-- no translation found for vpn_connecting (8039521381692090116) -->
-    <skip />
-    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
-    <skip />
-    <!-- no translation found for vpn_connected (7641723116362845781) -->
-    <skip />
-    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
-    <skip />
-    <!-- no translation found for vpn_name (1550918148476193076) -->
-    <skip />
-    <!-- no translation found for vpn_a_name (8445736942405283509) -->
-    <skip />
-    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
-    <skip />
-    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
-    <skip />
-    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
-    <skip />
-    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
-    <skip />
-    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
-    <skip />
-    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
-    <skip />
-    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
-    <skip />
-    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
-    <skip />
-    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
-    <skip />
-    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
-    <skip />
-    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
-    <skip />
-    <!-- no translation found for vpn_pptp_encryption_title (2236795167467896499) -->
-    <skip />
-    <!-- no translation found for vpn_pptp_encryption (2602329949737259686) -->
-    <skip />
-    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
-    <skip />
-    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
-    <skip />
-    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
-    <skip />
-    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
-    <skip />
-    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
-    <skip />
-    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
-    <skip />
-    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
-    <skip />
-    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
-    <skip />
-    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
-    <skip />
-    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
-    <skip />
-    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
-    <skip />
-    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
-    <skip />
-    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
-    <skip />
-    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
-    <skip />
-    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
-    <skip />
-    <!-- no translation found for vpn_secret_unchanged (8700613973594154529) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set (1037792636371641845) -->
-    <skip />
-    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
-    <skip />
-    <!-- no translation found for cstor_access_title (1739505390736236717) -->
-    <skip />
-    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
-    <skip />
-    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
-    <skip />
-    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
-    <skip />
-    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
-    <skip />
-    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
-    <skip />
-    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
-    <skip />
-    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
-    <skip />
-    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
-    <skip />
-    <!-- no translation found for cstor_credential_password (7187440553141199409) -->
-    <skip />
-    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
-    <skip />
-    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
-    <skip />
-    <!-- no translation found for cstor_old_password (979282118063084561) -->
-    <skip />
-    <!-- no translation found for cstor_new_password (6218562692435670047) -->
-    <skip />
-    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
-    <skip />
-    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
-    <skip />
-    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
-    <skip />
-    <!-- no translation found for cstor_password_error (2917326097260402464) -->
-    <skip />
-    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
-    <skip />
-    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
-    <skip />
-    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
-    <skip />
-    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
-    <skip />
-    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
-    <skip />
-    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
-    <skip />
-    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
-    <skip />
-    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
-    <skip />
-    <!-- no translation found for cstor_storage_error (7140697503172458161) -->
-    <skip />
-    <!-- no translation found for cstor_unable_to_save_cert (1631402544447196406) -->
-    <skip />
-    <!-- no translation found for cstor_cert_not_saved (6318149789449538491) -->
-    <skip />
-    <!-- no translation found for cstor_is_reset (449870501126790589) -->
-    <skip />
-    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
-    <skip />
-    <!-- no translation found for cstor_is_added (794788474010251572) -->
-    <skip />
-    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
-    <skip />
-    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <string name="awake" msgid="387122265874485088">"Cihazın açılma zamanı"</string>
+    <string name="wifi_on_time" msgid="4630925382578609056">"Kablosuz özelliğinin açık olduğu süre"</string>
+    <string name="bluetooth_on_time" msgid="4478515071957280711">"Kablosuz özelliğinin açık olduğu süre"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
+    <string name="details_title" msgid="7564809986329021063">"Pil kullanım bilgileri"</string>
+    <string name="details_subtitle" msgid="32593908269911734">"Ayrıntıları kullan"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"Pil kullanımını ayarla"</string>
+    <string name="packages_subtitle" msgid="4736416171658062768">"Dahil olan paketler"</string>
+    <string name="power_screen" msgid="2353149143338929583">"Ekran"</string>
+    <string name="power_wifi" msgid="2382791137776486974">"Kablosuz"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
+    <string name="power_cell" msgid="6596471490976003056">"Telefon beklemesi"</string>
+    <string name="power_phone" msgid="5392641106474567277">"Sesli aramalar"</string>
+    <string name="power_idle" msgid="9055659695602194990">"Telefon boşta"</string>
+    <string name="usage_type_cpu" msgid="715162150698338714">"Toplam CPU"</string>
+    <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ön planı"</string>
+    <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
+    <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</string>
+    <string name="usage_type_data_send" msgid="2857401966985425427">"Gönderilen veriler"</string>
+    <string name="usage_type_data_recv" msgid="7251090882025234185">"Alınan veriler"</string>
+    <string name="usage_type_audio" msgid="6957269406840886290">"Ses"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"Açma zamanı"</string>
+    <string name="usage_type_no_coverage" msgid="3797004252954385053">"Kapsama alanı dışındaki zaman"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"Durmaya zorla"</string>
+    <string name="battery_action_app_details" msgid="3275013531871113681">"Uygulama bilgileri"</string>
+    <string name="battery_action_app_settings" msgid="350562653472577250">"Uygulama ayarları"</string>
+    <string name="battery_action_display" msgid="5302763261448580102">"Ekran ayarları"</string>
+    <string name="battery_action_wifi" msgid="5452076674659927993">"Kablosuz ayarları"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth ayarları"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"Sesli aramalar tarafından kullanılan pil"</string>
+    <string name="battery_desc_standby" msgid="3009080001948091424">"Telefon boştayken kullanılan pil"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"Telefon radyosu tarafından kullanılan pil"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"Cep telefonunun kapsama alanı dışında olduğu yerlerde pilden tasarruf etmek için uçak moduna geçin"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"Ekran ve arka aydınlatma ışığı tarafından kullanılan pil"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"Ekran parlaklığını ve/veya ekranın zaman aşımını azaltın"</string>
+    <string name="battery_desc_wifi" msgid="1702486494565080431">"Kablosuz özellik tarafından kullanılan pil"</string>
+    <string name="battery_sugg_wifi" msgid="7542345142282261691">"Kullanmadığınız veya kullanılamadığı zaman Kablosuz özelliğini kapatın"</string>
+    <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Bluetooth tarafından kullanılan pil"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Bluetooth\'u kullanmadığınız zamanlarda kapatın"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Farklı bir Bluetooth cihazına bağlanmaya çalış"</string>
+    <string name="battery_desc_apps" msgid="8123202939321333639">"Çalışan uygulamalar tarafından kullanılan pil"</string>
+    <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Uygulamayı durdur veya kaldır"</string>
+    <string name="battery_sugg_apps_gps" msgid="4145005297393800223">"Kullanmadığınız zamanlarda GPS\'yi kapatın"</string>
+    <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"Uygulama, pil kullanımını azaltmak için ayarlar önerebilir"</string>
+    <string name="menu_stats_unplugged" msgid="8296577130840261624">"Fişten çekildikten itibaren <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> için fişten son çekilmesinden itibaren"</string>
+    <string name="menu_stats_total" msgid="8973377864854807854">"Kullanım toplamı"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"Yenile"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"Android İS"</string>
+    <string name="process_mediaserver_label" msgid="6500382062945689285">"Medya sunucusu"</string>
+    <string name="tts_settings" msgid="3348626948015962987">"Metin-konuşma"</string>
+    <string name="tts_settings_summary" msgid="2627715231944602766">"Metni konuşma seçeneklerine göre ayarla"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Metin-konuşma ayarları"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Her zaman benim ayarlarımı kullan"</string>
+    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Aşağıdaki varsayılan ayarlar, uygulama ayarlarını geçersiz kılıyor"</string>
+    <string name="tts_default_settings_section" msgid="5787915620218907443">"Varsayılan ayarlar"</string>
+    <string name="tts_default_rate_title" msgid="6030550998379310088">"Konuşma hızı"</string>
+    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Metnin konuşulduğu hız"</string>
+    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Perde"</string>
+    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Konuşulan metnin sesini etkiler"</string>
+    <string name="tts_default_lang_title" msgid="8018087612299820556">"Dil"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Dil tanımlı sesi, konuşulan metin için ayarlar"</string>
+    <string name="tts_play_example_title" msgid="7094780383253097230">"Bir örnek dinleyin"</string>
+    <string name="tts_play_example_summary" msgid="8029071615047894486">"Konuşma sentezinin kısa bir sunumunu yürüt"</string>
+    <string name="tts_install_data_title" msgid="4264378440508149986">"Ses verilerini yükle"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"Konuşma sentezi için gereken ses verilerini yükle"</string>
+    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Konuşma sentezi için gereken sesler zaten düzgün bir şekilde yüklendi"</string>
+    <string name="tts_demo" msgid="405357591189935876">"Bu bir konuşma sentezi örneğidir."</string>
+    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Ayarlarınız değişti. Bu nasıl duyulacakları ile ilgili bir örnektir."</string>
+    <string name="gadget_title" msgid="7455548605888590466">"Güç Denetimi"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Kablosuz ayarı güncelleniyor"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth ayarları güncelleniyor"</string>
+    <string name="credential_installer_activity_title" msgid="7600661521831762521">"Kimlik bilgisi yükleyici"</string>
+    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN ayarları"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"Şuna bağlan: <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpn_username_colon" msgid="7854930370861306247">"Kullanıcı adı:"</string>
+    <string name="vpn_password_colon" msgid="5716278710848606626">"Şifre:"</string>
+    <string name="vpn_a_username" msgid="6664733641993968692">"bir kullanıcı adı"</string>
+    <string name="vpn_a_password" msgid="1537213632501483753">"bir şifre"</string>
+    <string name="vpn_save_username" msgid="1408415289165970790">"Kullanıcı adını hatırla"</string>
+    <string name="vpn_connect_button" msgid="1699007212602470655">"Bağlan"</string>
+    <string name="vpn_yes_button" msgid="8034531001149843119">"Evet"</string>
+    <string name="vpn_no_button" msgid="7620339571187119107">"Hayır"</string>
+    <string name="vpn_back_button" msgid="192036339792734970">"Geri"</string>
+    <string name="vpn_mistake_button" msgid="1683383660912491270">"Hayır"</string>
+    <string name="vpn_menu_done" msgid="93528279226907926">"Kaydet"</string>
+    <string name="vpn_menu_cancel" msgid="7234451214611202868">"İptal"</string>
+    <string name="vpn_menu_revert" msgid="4407762442281467659">"Geri Döndür"</string>
+    <string name="vpn_menu_connect" msgid="1089399414463784218">"Ağa bağlan"</string>
+    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Ağ bağlantısını kes"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Ağı düzenle"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Ağı sil"</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Şunu girmelisiniz: <xliff:g id="CODE">%s</xliff:g>"</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Şunu seçmelisiniz: <xliff:g id="OPTION">%s</xliff:g>."</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"\'<xliff:g id="NAME">%s</xliff:g>\' VPN adı zaten var. Başka bir ad bulun."</string>
+    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Bu VPN\'yi silmek istediğinizden emin misiniz?"</string>
+    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Bu profili oluşturmak istemediğinizden emin misiniz?"</string>
+    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Bu profilde yapılan değişiklikleri silmek istediğinizden emin misiniz?"</string>
+    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Ağa bağlanılamıyor. Tekrar denemek ister misiniz?"</string>
+    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Bağlantı kaybedildi. Tekrar bağlanmak istiyor musunuz?"</string>
+    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Sunucu adı çözümlenemiyor. Sunucu adı ayarınızı kontrol etmek ister misiniz?"</string>
+    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Hataya itiraz edin. Gizli bilgi ayarınızı kontrol etmek ister misiniz?"</string>
+    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Bu VPN yapılandırmasında bir veya birden fazla gizli bilgi eksik. Gizli ayarınızı kontrol etmek ister misiniz?"</string>
+    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Girdiğiniz kullanıcı adı veya şifre yanlış. Tekrar denemek istiyor musunuz?"</string>
+    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Sunucu bağlantısı kesildi. Girdiğiniz kullanıcı adı veya şifre yanlış olabilir. Tekrar denemek istiyor musunuz?"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Sunucu engellendi. Sunucuya bağlanmanıza engel olan bir güvenlik duvarının ardında bulunuyor olabilirsiniz. Tekrar denemek ister misiniz?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Sunucu anlaşması başarısız oldu. Sunucu şifreleme seçeneğiniz ile uyuşmuyor olabilir. Şifreleme ayarınızı kontrol etmek istiyor musunuz?"</string>
+    <string name="vpn_type_title" msgid="6392933604218676224">"VPN ekle"</string>
+    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"VPN ekle"</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"<xliff:g id="NAME">%s</xliff:g> VPN\'si ekle"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"<xliff:g id="NAME">%s</xliff:g> ayrıntıları"</string>
+    <string name="vpns" msgid="3148141862835492816">"VPN\'ler"</string>
+    <string name="vpn_connecting" msgid="8039521381692090116">"Bağlanıyor..."</string>
+    <string name="vpn_disconnecting" msgid="7748050200708257066">"Bağlantı kesiliyor..."</string>
+    <string name="vpn_connected" msgid="7641723116362845781">"Bağlandı"</string>
+    <string name="vpn_connect_hint" msgid="7442898962925875181">"Ağa bağlan"</string>
+    <string name="vpn_name" msgid="1550918148476193076">"VPN adı"</string>
+    <string name="vpn_a_name" msgid="8445736942405283509">"bir VPN adı"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"\'<xliff:g id="NAME">%s</xliff:g>\' eklendi"</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"\'<xliff:g id="NAME">%s</xliff:g>\' üzerinde değişiklikler yapıldı"</string>
+    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Kullanıcı sertifikasını ayarla"</string>
+    <string name="vpn_user_certificate" msgid="949322691686938888">"Kullanıcı sertifikası"</string>
+    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"bir kullanıcı sertifikası"</string>
+    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"CA sertifikasını ayarla"</string>
+    <string name="vpn_ca_certificate" msgid="465085144064264742">"Sertifika yetkilisi (CA) sertifikası"</string>
+    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"bir CA sertifikası"</string>
+    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"L2TP gizli bilgisini ayarla"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP gizli bilgisi"</string>
+    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"bir L2TP gizli bilgisi"</string>
+    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"şifreleme"</string>
+    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"PPTP şifreleme"</string>
+    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"IPSec önceden paylaşılan anahtarı ayarla"</string>
+    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"IPSec önceden paylaşılan anahtar"</string>
+    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"bir IPSec önceden paylaşılan anahtar"</string>
+    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"VPN sunucusunu ayarla"</string>
+    <string name="vpn_vpn_server" msgid="1141754908824209260">"VPN sunucusu"</string>
+    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"bir VPN sunucusu"</string>
+    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"VPN sunucu adı"</string>
+    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS arama alanları"</string>
+    <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS arama alanları"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> ayarlandı"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> ayarlanmadı"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> ayarlanmadı (isteğe bağlı)"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"<xliff:g id="OPTION">%s</xliff:g> seçeneğini etkinleştir"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"<xliff:g id="OPTION">%s</xliff:g> seçeneğini devre dışı bırak"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> etkinleştirildi"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> devre dışı bırakıldı"</string>
+    <string name="vpn_settings_title" msgid="7327468307909556719">"VPN ayarları"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"Sanal Özel Ağlar (VPN\'ler) kur ve yönet"</string>
+    <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(değişmedi)"</string>
+    <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ayarlanmadı)"</string>
+    <string name="credentials_category" msgid="8536992056377271234">"Kimlik bilgileri deposu"</string>
+    <string name="credentials_access" msgid="4843187230913860492">"Güvenli kimlik bilgilerini kullan"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"Uygulamaların güvenli sertifikalara ve diğer kimlik bilgilerine erişmesine izin verin"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"Şifreyi girin"</string>
+    <string name="credentials_unlock_hint" msgid="594679530407918031">"Kimlik bilgileri deposunun şifresini girin."</string>
+    <string name="credentials_install_certificates" msgid="177337517568022236">"SD karttan yükle"</string>
+    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"SD karttan şifrelenmiş sertifikaları yükleyin"</string>
+    <string name="credentials_set_password" msgid="9104473585811899989">"Şifreyi ayarla"</string>
+    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Kimlik bilgileri deposunun şifresini ayarlayın veya değiştirin"</string>
+    <string name="credentials_reset" msgid="9170150870552453457">"Depoyu temizle"</string>
+    <string name="credentials_reset_summary" msgid="1530388094693731636">"Tüm içeriklerin kimlik bilgileri deposunu temizleyin ve bu depolama alanının şifresini sıfırlayın"</string>
+    <string name="credentials_reset_hint" msgid="819990295796804516">"Tüm kimlik bilgilerini silmek ve kimlik bilgileri deposunun şifresini sıfırlamak istediğinizden emin misiniz?"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"Geçerli şifre:"</string>
+    <string name="credentials_new_password" msgid="267487774686796938">"Yeni şifre:"</string>
+    <string name="credentials_confirm_password" msgid="4732250000633424345">"Yeni şifreyi doğrulayın:"</string>
+    <string name="credentials_first_time_hint" msgid="1567821077545346039">"Kimlik bilgileri deposu için bir şifre belirleyin (en az 8 karakter)."</string>
+    <string name="credentials_wrong_password" msgid="7525192410790152041">"Lütfen doğru şifreyi girin."</string>
+    <string name="credentials_reset_warning" msgid="6392481296673345268">"Lütfen doğru şifreyi girin. Kimlik bilgileri deposu silinmeden önce doğru şifreyi girmek için son bir deneme hakkınız var."</string>
+    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Lütfen doğru şifreyi girin. Kimlik bilgileri deposu silinmeden önce doğru şifreyi girmek için <xliff:g id="NUMBER">%1$d</xliff:g> deneme hakkınız daha var."</string>
+    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Şifreler eşleşmiyor."</string>
+    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Bir şifre girip doğrulamanız gerekiyor."</string>
+    <string name="credentials_password_empty" msgid="8292138152983330473">"Lütfen şifreyi girin."</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"Şifre, en az 8 karakterden oluşmalıdır."</string>
+    <string name="credentials_erased" msgid="7700309135582200849">"Kimlik bilgileri deposu silindi."</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"Kimlik bilgileri deposu etkin."</string>
+    <string name="credentials_disabled" msgid="7453188089059045380">"Kimlik bilgileri deposu devre dışı."</string>
+    <string name="emergency_tone_title" msgid="1055954530111587114">"Acil sesi"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"Acil bir arama yapıldığında nasıl işlev göreceğini ayarlayın"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Gizlilik"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Gizlilik ayarları"</string>
+    <string name="location_section_title" msgid="6072558684044939786">"Konum"</string>
+    <string name="settings_section_title" msgid="7413252428447723032">"Ayarlar"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Kişisel veriler"</string>
+    <string name="backup_settings_title" msgid="2968262658155327829">"Ayarlarımı yedekle"</string>
+    <string name="backup_erase_dialog_title" msgid="6028429904055779443">"Ayarlar yedeği"</string>
+    <string name="backup_erase_dialog_message" msgid="9096433810456900531">"Ayarlarınızın yedeklemesini durdurmak ve Google sunucularındaki tüm kopyaları silmek istediğinizden emin misiniz?"</string>
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
     <skip />
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index aec3523262d..80782592e4d 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -24,38 +24,59 @@
     <item msgid="5345178126174698955">"太平洋"</item>
     <item msgid="8392017019801393511">"全部"</item>
   </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"无动画"</item>
+    <item msgid="6291186755504776720">"部分动画"</item>
+    <item msgid="3856065399819979491">"所有动画"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"未显示窗口动画"</item>
+    <item msgid="4460915688877708508">"显示部分窗口动画"</item>
+    <item msgid="488968798204105119">"显示所有窗口动画"</item>
+  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 秒"</item>
     <item msgid="8881760709354815449">"30 秒"</item>
     <item msgid="7589406073232279088">"1 分钟"</item>
     <item msgid="7001195990902244174">"2 分钟"</item>
     <item msgid="5721688686241190620">"10 分钟"</item>
-    <item msgid="1781492122915870416">"从不待机"</item>
+    <item msgid="7156442995039264948">"30 分钟"</item>
+  </string-array>
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"很慢"</item>
+    <item msgid="2361722960903353554">"慢"</item>
+    <item msgid="1145554631248513562">"正常"</item>
+    <item msgid="7553665153391107454">"快"</item>
+    <item msgid="2538100882620724753">"很快"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item msgid="7526050907652687351">"很低"</item>
+    <item msgid="2692137425242433765">"低"</item>
+    <item msgid="3332408460740717754">"正常"</item>
+    <item msgid="4907380534957572531">"高"</item>
+    <item msgid="4699640516390840297">"很高"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item msgid="478030717868306353">"美国英语"</item>
+    <item msgid="5192284521396794598">"英国英语"</item>
+    <item msgid="3000262452051711991">"法语"</item>
+    <item msgid="9214080387341763401">"德语"</item>
+    <item msgid="5972100016440094433">"意大利语"</item>
+    <item msgid="5811378076054402537">"西班牙语"</item>
+  </string-array>
+  <string-array name="wifi_security_entries">
+    <item msgid="2923732046112398627">"自动"</item>
+    <item msgid="5434666299123318296">"无"</item>
+    <item msgid="3159594845889645948">"WEP"</item>
+    <item msgid="1687348101566181433">"WPA/WPA2 PSK"</item>
+    <item msgid="329777238762866787">"802.1x Enterprise"</item>
+  </string-array>
+  <string-array name="wifi_security_without_auto_entries">
+    <item msgid="4402120432904877907">"无"</item>
+    <item msgid="2329148995431627488">"WEP"</item>
+    <item msgid="6903317668294332381">"WPA/WPA2 PSK"</item>
+    <item msgid="7280821339307729710">"802.1x Enterprise"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
-    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
-    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
-    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
-    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
-    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
-    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
-    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
-    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
-    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
-    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
-    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
-    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
-    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
-    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
-    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
-    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
-    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
-    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
-    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
-    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
-    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
-    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
-    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
   <string-array name="wifi_wep_type">
     <item msgid="1497433962958697183">"自动"</item>
     <item msgid="7182335713815377158">"WEP ASCII"</item>
@@ -70,12 +91,12 @@
     <item msgid="2193799199027871385">"CPU 使用率"</item>
     <item msgid="6401018715947316517">"网络使用率"</item>
     <item msgid="188092590354892392">"GPS 使用率"</item>
-    <item msgid="8414109131222049141">"传感器使用率"</item>
-    <item msgid="1327904325081257093">"部分激活使用率"</item>
-    <item msgid="4832254146664706277">"其他使用率"</item>
+    <item msgid="8414109131222049141">"传感器使用情况"</item>
+    <item msgid="1327904325081257093">"部分唤醒使用情况"</item>
+    <item msgid="4832254146664706277">"其他使用情况"</item>
   </string-array>
   <string-array name="battery_history_which_spinner">
-    <item msgid="3451981114763440074">"自上次拔出后"</item>
+    <item msgid="3451981114763440074">"自上次拔下电源后"</item>
     <item msgid="166936313535197598">"自启动以来的总时间"</item>
     <item msgid="4793941382744963893">"所有时间总计"</item>
   </string-array>
@@ -84,15 +105,27 @@
     <item msgid="1908750532762193304">"启动次数"</item>
     <item msgid="1213951670006606353">"应用程序名称"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
-    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
-    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
-    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
-    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
-    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
-    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
-    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
-    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
-    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
-    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="1818786254010764570">"无"</item>
+    <item msgid="6189918678874123056">"PAP"</item>
+    <item msgid="1524112260493662517">"MSCHAP"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
+    <item msgid="8651992560135239389">"GTC"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"关"</item>
+    <item msgid="3165868966179561687">"警报"</item>
+    <item msgid="6038758039030476855">"振动"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"无"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP 或 CHAP"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 461f198976e..fbb8a9bc2f0 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -15,6 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"是"</string>
+    <string name="no" msgid="6731231425810196216">"无"</string>
     <string name="device_info_default" msgid="7847265875578739287">"未知"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"打开收音机"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"关闭收音机"</string>
@@ -56,6 +58,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"确定"</string>
     <string name="sdcard_setting" msgid="5922637503871474866">"SD 卡"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"电池状态："</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"是否已插电："</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"电池电量："</string>
     <string name="battery_info_level_label" msgid="8706526709307788737">"电池电量："</string>
     <string name="battery_info_health_label" msgid="6416051542741886958">"电池运行状况："</string>
@@ -75,6 +78,11 @@
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"正在放电"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"未在充电"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"已满"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"未插电"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"交流电"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"交流电 + USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"未知"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"未知"</string>
     <string name="battery_info_health_good" msgid="8070356565806711806">"正常"</string>
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"过热"</string>
@@ -104,14 +112,19 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"蓝牙配对请求"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"配对请求"</string>
     <string name="bluetooth_notif_message" msgid="5381418499788668724">"选择要配对的对象 "</string>
+    <string name="device_picker" msgid="8721012448931226323">"蓝牙设备选择器"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"蓝牙权限请求"</string>
+    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"您手机上的某一应用程序正在请求相应权限以便打开蓝牙。是否要授予这种权限？"</string>
+    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"您手机上的某一应用程序正在请求相应权限以便打开蓝牙，从而使其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。是否要授予这种权限？"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"您手机上的某一应用程序正在请求相应权限以便打开蓝牙，从而使其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。是否要授予这种权限？"</string>
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"正在打开蓝牙…"</string>
     <string name="date_and_time" msgid="4114084177056654663">"日期和时间设置"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"下午 1:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
     <string name="date_time_changeTime_text" msgid="7037437020000867740">"更改时间"</string>
     <string name="date_time_changeDate_text" msgid="5259762626498028057">"日期"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"选择时区"</string>
-    <!-- no translation found for normal_date_format (1982904221918374153) -->
-    <skip />
+    <string name="normal_date_format" msgid="1982904221918374153">"普通 (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"预览："</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"字号："</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -192,33 +205,23 @@
     <string name="proxy_settings_label" msgid="3271174136184391743">"代理设置"</string>
     <string name="cancel" msgid="6859253417269739139">"取消"</string>
     <string name="settings_label" msgid="1626402585530130914">"设置"</string>
-    <!-- no translation found for settings_shortcut (3672145147925639262) -->
-    <skip />
+    <string name="settings_shortcut" msgid="3672145147925639262">"设置"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"飞行模式"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"停用所有无线连接"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"正在停用无线连接..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"正在启用无线连接..."</string>
-    <string name="radio_controls_title" msgid="8356991079873437337">"无线控件"</string>
-    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
-    <skip />
-    <!-- no translation found for roaming (3596055926335478572) -->
-    <skip />
-    <!-- no translation found for roaming_enable (3737380951525303961) -->
-    <skip />
-    <!-- no translation found for roaming_disable (1295279574370898378) -->
-    <skip />
-    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
-    <skip />
-    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
-    <skip />
-    <!-- no translation found for roaming_warning (1269870211689178511) -->
-    <skip />
-    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
-    <skip />
-    <!-- no translation found for networks (6333316876545927039) -->
-    <skip />
-    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
-    <skip />
+    <string name="radio_controls_title" msgid="5868688473587168882">"无线和网络设置"</string>
+    <string name="wireless_networks_settings_title" msgid="149274247949769551">"无线和网络设置"</string>
+    <string name="radio_controls_summary" msgid="2998818677094465517">"管理 Wi-Fi、蓝牙、飞行模式、移动网络和虚拟专用网"</string>
+    <string name="roaming" msgid="3596055926335478572">"数据漫游"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"漫游时连接到数据服务"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"漫游时连接到数据服务"</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"数据连接已断，因为您已离开本地网络并已关闭数据漫游。"</string>
+    <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"将其启用"</string>
+    <string name="roaming_warning" msgid="1269870211689178511">"是否允许数据漫游？这可能产生大量漫游费！"</string>
+    <string name="roaming_reenable_title" msgid="7626425894611573131">"注意"</string>
+    <string name="networks" msgid="6333316876545927039">"运营商选择"</string>
+    <string name="sum_carrier_select" msgid="6648929373316748020">"选择网络运营商"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"日期和时间"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"设置日期、时间、时区和格式"</string>
     <string name="date_time_auto" msgid="3086083265745944725">"自动"</string>
@@ -231,25 +234,31 @@
     <string name="date_time_date_format" msgid="436706100255870967">"选择日期格式"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"按字母顺序排序"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"按时区排序"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"安全性和位置"</string>
-    <!-- no translation found for security_settings_summary (967393342537986570) -->
-    <skip />
+    <string name="security_settings_title" msgid="5168491784222013179">"地点和安全"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"位置和安全设置"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM 卡锁定和凭据存储锁定"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"设置我的位置、屏幕解锁和凭据存储锁定"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密码"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"蓝牙"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"打开蓝牙"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"蓝牙设置"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"蓝牙设置"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"管理连接，设置设备名称和可检测性"</string>
-    <string name="bluetooth_pin_entry" msgid="5627349871303455279">"蓝牙配对请求"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"蓝牙配对请求"</string>
     <string name="bluetooth_device_info" msgid="6644515376523965073">"蓝牙设备信息"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="7551139612735632370">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"输入 PIN 进行配对。"\n"（尝试一下 0000 或 1234。）"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"键入 PIN 与“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”进行配对。（尝试键入 0000 或 1234。）"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"键入匹配密钥可与“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”进行配对。"</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"要与“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”配对，请核实其中是否显示匹配密钥：<xliff:g id="PASSKEY">%2$s</xliff:g>。"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"想要配对。"</string>
+    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"在“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”中输入<xliff:g id="PASSKEY">%2$s</xliff:g>可进行配对。"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"配对"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"不要配对"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"蓝牙设备"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"注意"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对时出现问题。"</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="6938408362011024289">"与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对时出现问题，因为输入的 PIN 不正确。"</string>
-    <!-- no translation found for bluetooth_pairing_device_down_error_message (6688215193824686741) -->
-    <skip />
-    <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
-    <skip />
+    <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"与 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 配对时出现问题，因为 PIN 或匹配密钥不正确。"</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"无法与 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 建立通信连接。"</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 已拒绝配对。"</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"连接到<xliff:g id="DEVICE_NAME">%1$s</xliff:g>时出现问题。"</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"扫描查找设备"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"连接"</string>
@@ -261,6 +270,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"连接到..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"媒体"</string>
     <string name="bluetooth_profile_headset" msgid="1874975688666658946">"手机"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"传输"</string>
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"已连接到媒体音频"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"已连接到手机音频"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"已连接到手机和媒体音频"</string>
@@ -270,8 +280,11 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"个人资料"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"已连接到媒体音频"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"已连接到手机音频"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"已连接到文件传输服务器"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"未连接到文件传输服务器"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"用于媒体音频"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"用于手机音频"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"用于文件传输"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"打开 Wi-Fi"</string>
@@ -286,27 +299,15 @@
     <string name="wifi_signal_1" msgid="8623690413812290642">"较强"</string>
     <string name="wifi_signal_0" msgid="3862211184991511432">"弱"</string>
     <string name="security" msgid="1040691896987225267">"安全性"</string>
-    <string name="wifi_security_open" msgid="3513305614048816607">"打开"</string>
+    <string name="wifi_security_open" msgid="3513305614048816607">"开放"</string>
     <string name="wifi_security_wep" msgid="7082604129842065776">"WEP"</string>
-    <string name="wifi_security_wpa" msgid="8980169410565477162">"WPA"</string>
-    <string name="wifi_security_wpa2" msgid="5780665935088930524">"WPA2"</string>
-    <!-- no translation found for wifi_security_wpa_eap (7485687331651751101) -->
-    <skip />
-    <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
-    <skip />
+    <string name="wifi_security_psk" msgid="3392399380570381452">"WPA/WPA2 PSK"</string>
+    <string name="wifi_security_eap" msgid="8309434150934969132">"Enterprise (802.1x)"</string>
     <string name="wifi_security_unknown" msgid="4564208312073060668">"未知"</string>
-    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
-    <skip />
+    <string name="wifi_security_verbose_open" msgid="8117878112088901945">"开放网络"</string>
+    <string name="wifi_security_verbose_wep" msgid="9220757688700421508">"通过 WEP 保护"</string>
+    <string name="wifi_security_verbose_psk" msgid="1110130025330416225">"通过 WPA/WPA2 PSK 保护"</string>
+    <string name="wifi_security_verbose_eap" msgid="586632662086063">"通过 802.1x EAP 保护"</string>
     <string name="ip_address" msgid="850672263358989449">"IP 地址"</string>
     <string name="signal" msgid="1947969631626413228">"信号强度"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"正在打开..."</string>
@@ -319,28 +320,19 @@
     <string name="error_saving" msgid="8294279443961615302">"无法保存网络"</string>
     <string name="connect" msgid="3079076576295839400">"连接"</string>
     <string name="connect_to_blank" msgid="6950910074058025378">"连接到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for please_select_eap (4488240331626456338) -->
-    <skip />
-    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
-    <skip />
-    <!-- no translation found for please_type_identity (7061261155499513089) -->
-    <skip />
-    <!-- no translation found for please_type_anonymous_identity (835061562079965048) -->
-    <skip />
-    <!-- no translation found for please_select_client_certificate (2137906961594663234) -->
-    <skip />
-    <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
-    <skip />
-    <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
-    <skip />
+    <string name="please_select_eap" msgid="4488240331626456338">"EAP 方式"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Phase 2 身份验证"</string>
+    <string name="please_type_identity" msgid="7061261155499513089">"身份"</string>
+    <string name="please_type_anonymous_identity" msgid="835061562079965048">"匿名身份"</string>
+    <string name="please_select_client_certificate" msgid="2137906961594663234">"客户端证书"</string>
+    <string name="please_select_ca_certificate" msgid="5010815181914420677">"CA 证书"</string>
     <string name="please_type_passphrase" msgid="8256017704131522462">"无线密码"</string>
-    <string name="please_type_hex_key" msgid="8751224390407867551">"WEP 十六进制键（0-9、A-F）"</string>
+    <string name="please_type_hex_key" msgid="8751224390407867551">"WEP 十六进制密钥（0-9、A-F）"</string>
     <string name="wifi_show_password" msgid="4235237470701732009">"显示密码。"</string>
     <string name="scan_wifi" msgid="2459901725350542606">"扫描"</string>
     <string name="summary_not_in_range" msgid="3926674700733548684">"不在范围内"</string>
-    <!-- no translation found for summary_remembered (6079941090549401742) -->
-    <skip />
-    <string name="summary_connection_failed" msgid="7610394657613410489">"连接失败，请选择重试"</string>
+    <string name="summary_remembered" msgid="6079941090549401742">"已记住"</string>
+    <string name="summary_connection_failed" msgid="2351885658101671413">"连接失败，请触摸重试"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi 网络"</string>
     <string name="wifi_type_ssid" msgid="1326839657083292017">"网络 SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"安全性"</string>
@@ -350,7 +342,7 @@
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"网络通知"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"附近有开放网络时通知我"</string>
     <string name="wifi_password_incorrect_error" msgid="5429305767166704803">"您输入的网络密码不正确，请重试。"</string>
-    <string name="wifi_generic_connection_error" msgid="8240172247986220199">"连接网络时出现问题，请重试。"</string>
+    <string name="wifi_generic_connection_error" msgid="8240172247986220199">"连接到网络时出现问题，请重试。"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"高级"</string>
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP 设置"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"保存"</string>
@@ -391,6 +383,7 @@
     <string name="status_disconnected" msgid="7561688569905126046">"已断开连接"</string>
     <string name="status_failed" msgid="610462050405904601">"失败"</string>
     <string name="sound_and_display_settings" msgid="349770582993029003">"声音和显示"</string>
+    <string name="sound_and_display_settings_title" msgid="5036144539683697330">"声音和显示设置"</string>
     <string name="sound_settings" msgid="5007659014828162881">"声音设置"</string>
     <string name="sound_and_display_settings_summary" msgid="1433943789593286064">"设置铃声、通知和屏幕亮度"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"静音模式"</string>
@@ -414,19 +407,18 @@
     <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"使用拨号键盘时发出声音"</string>
     <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"使用拨号键盘时发出声音"</string>
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"操作音选择"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"进行屏幕选择时发出声音"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"进行屏幕选择时发出声音"</string>
+    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"在屏幕上进行选择时发出声音"</string>
+    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"在屏幕上进行选择时发出声音"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"触感反馈"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"按软键以及进行某些 UI 交互时振动"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"按软键以及进行某些 UI 交互时振动"</string>
     <string name="play_media_notification_sounds_enable_title" msgid="1008791464029179529">"SD 卡通知"</string>
-    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
-    <skip />
-    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
-    <skip />
-    <string name="sync_settings" msgid="2212736205476453234">"数据同步"</string>
-    <string name="sync_settings_summary" msgid="6480534906375217074">"选择要同步的应用程序"</string>
-    <!-- no translation found for search_settings (1910951467596035063) -->
-    <skip />
-    <!-- no translation found for search_settings_summary (9205656546570654169) -->
-    <skip />
+    <string name="play_media_notification_sounds_enable_summary_on" msgid="7675466959375667370">"提示 SD 卡通知时发出声音"</string>
+    <string name="play_media_notification_sounds_enable_summary_off" msgid="8672617597028744693">"弹出 SD 卡通知时发出声音"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"帐户与同步"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"添加或删除帐户和更改帐户设置"</string>
+    <string name="search_settings" msgid="1910951467596035063">"搜索"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"管理搜索设置和历史记录"</string>
     <string name="display_settings" msgid="3912042046350078328">"显示设置"</string>
     <string name="animations_title" msgid="1062189037402346023">"动画"</string>
     <string name="animations_summary_on" msgid="8843613112130484436">"打开和关闭窗口时显示动画"</string>
@@ -437,7 +429,8 @@
     <string name="brightness" msgid="2354961343555249270">"亮度"</string>
     <string name="brightness_summary" msgid="838917350127550703">"调整屏幕亮度"</string>
     <string name="screen_timeout" msgid="4882669461447531301">"屏幕待机"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"调整屏幕自动关闭前的延迟"</string>
+    <string name="screen_timeout_summary" msgid="2905757633140605334">"调整屏幕自动锁定前的延迟"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"自动亮度"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 卡锁定设置"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"设置 SIM 卡锁定"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM 卡锁定"</string>
@@ -470,18 +463,14 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"不可用"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"状态"</string>
     <string name="device_status" msgid="607405385799807324">"状态"</string>
-    <!-- no translation found for device_status_summary (2599162787451519618) -->
-    <skip />
-    <string name="storage_settings_title" msgid="8461515684514801302">"SD 卡和手机存储"</string>
+    <string name="device_status_summary" msgid="2599162787451519618">"电话号码、信号等"</string>
+    <string name="storage_settings" msgid="6681164315506788024">"SD 卡和手机存储"</string>
+    <string name="storage_settings_title" msgid="5379463509034022773">"SD 卡和手机存储设置"</string>
     <string name="storage_settings_summary" msgid="9176693537325988610">"卸下 SD 卡，查看可用的存储空间"</string>
-    <!-- no translation found for status_number (5123197324870153205) -->
-    <skip />
-    <!-- no translation found for status_min_number (3519504522179420597) -->
-    <skip />
-    <!-- no translation found for status_prl_version (8499039751817386529) -->
-    <skip />
-    <!-- no translation found for status_meid_number (1751442889111731088) -->
-    <skip />
+    <string name="status_number" msgid="5123197324870153205">"本机号码"</string>
+    <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_prl_version" msgid="8499039751817386529">"PRL 版本"</string>
+    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"手机网络类型"</string>
     <string name="status_data_state" msgid="5503181397066522950">"手机网络状态"</string>
     <string name="status_service_state" msgid="2323931627519429503">"服务状态"</string>
@@ -493,7 +482,7 @@
     <string name="status_unavailable" msgid="7862009036663793314">"不可用"</string>
     <string name="status_up_time" msgid="7294859476816760399">"开机时间"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"唤醒时间"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"手机内部存储"</string>
+    <string name="internal_memory" msgid="1130932766236387454">"手机内存"</string>
     <string name="sd_memory" msgid="151871913888051515">"SD 卡"</string>
     <string name="memory_available" msgid="418542433817289474">"可用空间"</string>
     <string name="memory_size" msgid="6629067715017232195">"总存储量"</string>
@@ -520,6 +509,11 @@
     <string name="apn_mms_port" msgid="4074188088199243040">"彩信端口"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"身份验证类型"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"无"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP 或 CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN 类型"</string>
     <string name="menu_delete" msgid="6981294422841124659">"删除 APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"新 APN"</string>
@@ -535,11 +529,9 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"重置默认 APN 设置已完成"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"恢复出厂设置"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"清除手机上的所有数据"</string>
-    <!-- no translation found for master_clear_desc (7823268823499739178) -->
-    <skip />
+    <string name="master_clear_desc" msgid="7823268823499739178">"这会从手机中删除以下数据："\n<li>"Google 帐户"</li>\n<li>"系统与应用程序的数据和设置"</li>\n<li>"下载的应用程序"</li>\n"这不会删除："\n<li>"当前系统软件和捆绑的应用程序"</li>\n<li>"SD 卡文件，如音乐或照片"</li></string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"重置手机"</string>
-    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
-    <skip />
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"是否删除所有个人信息和下载的所有应用程序？此操作无法还原！"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"清除全部内容"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"绘制您的解锁图案"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"您必须绘制解锁图案才能确认重置手机。"</string>
@@ -553,23 +545,22 @@
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"绘制您的解锁图案"</string>
     <string name="media_format_gesture_explanation" msgid="4239529439389660159">"您必须绘制解锁图案才能确认格式化 SD 卡。"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通话设置"</string>
-    <string name="call_settings_summary" msgid="7291195704801002886">"设置语音信箱、呼叫转接、呼叫等待和来电显示"</string>
+    <string name="call_settings_summary" msgid="7291195704801002886">"设置语音信箱、呼叫转接、呼叫等待和来电者信息"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"移动网络"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"设置漫游、网络、APN 选项"</string>
-    <!-- no translation found for location_title (1029961368397484576) -->
-    <skip />
+    <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
     <string name="location_network_based" msgid="8815705866861993344">"使用无线网络"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"使用无线网络在应用程序（例如 Google 地图）中查看位置"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"通过 Wi-Fi 和/或移动网络确定位置"</string>
-    <string name="location_gps" msgid="375912731641377120">"启用 GPS 卫星"</string>
-    <string name="location_street_level" msgid="5899941752252356344">"定位时可精确到街道级别（取消选中可节约电量）"</string>
+    <string name="location_gps" msgid="6296125378829097831">"使用 GPS 卫星"</string>
+    <string name="location_street_level" msgid="6460740847018275745">"定位级别可精确到街道（取消选中可节约电量）"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"定位到街道级别（需要消耗更多电量以及天气允许）"</string>
-    <!-- no translation found for use_location_title (7585990952633568732) -->
-    <skip />
-    <!-- no translation found for use_location_summary (4411467143899877395) -->
-    <skip />
-    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
-    <skip />
+    <string name="assisted_gps" msgid="4649317129586736885">"使用增强型 GPS"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"使用服务器来辅助 GPS（取消选中可降低网络使用率）"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"使用服务器来辅助 GPS（取消选中可提高 GPS 性能）"</string>
+    <string name="use_location_title" msgid="5447030582538504247">"使用“我的位置”"</string>
+    <string name="use_location_summary" msgid="1816849484040070431">"将“我的位置”用于 Google 搜索结果和其他 Google 服务"</string>
+    <string name="use_location_warning_message" msgid="1420184860518262439">"是否允许 Google 使用位置信息改善搜索结果和其他服务？"</string>
     <string name="agree" msgid="6288718671527758326">"同意"</string>
     <string name="disagree" msgid="6221069272309799230">"不同意"</string>
     <string name="about_settings" msgid="1743378368185371685">"关于手机"</string>
@@ -579,12 +570,15 @@
     <string name="copyright_title" msgid="865906688917260647">"版权"</string>
     <string name="license_title" msgid="1990487604356037871">"许可"</string>
     <string name="terms_title" msgid="7697580845616764642">"条款"</string>
-    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
-    <skip />
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"了解如何使用您的手机"</string>
+    <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"系统辅导手册"</string>
+    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"了解如何使用手机"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"开放源代码许可"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"载入许可时出现问题。"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"正在载入..."</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"安全信息"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"安全信息"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"您的手机未连接到数据服务。要立即查看此信息，请通过连接到互联网的任意计算机访问 %s。"</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"正在载入..."</string>
     <string name="lock_settings_title" msgid="5828348303971852121">"屏幕解锁图案"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"更改解锁图案"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"确认已保存的图案"</string>
@@ -613,9 +607,9 @@
     <string name="skip_button_label" msgid="8680422740354436943">"取消"</string>
     <string name="next_button_label" msgid="8890792540116568321">"下一步"</string>
     <string name="lock_title" msgid="4059246467204273930">"保护您的手机"</string>
-    <string name="lock_intro_message" msgid="5352897389718432077"><font size="17">"通过创建个人屏幕解锁图案，来保护您的手机不受未经授权的使用。"\n<font height="17">\n</font><b>"1"</b>"  在下一屏幕上，观看示例图案的绘制过程。"\n<font height="17">\n</font><b>"2"</b>"  准备就绪后，绘制您自己的个人解锁图案。可尝试不同的图案，但至少要连接四个点。"\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_intro_message" msgid="9100785646737118042"><font size="17">"通过创建个人屏幕解锁图案，防止他人未经授权使用您的手机。"\n<font height="17">\n</font><b>"1"</b>"  在下一屏幕上，观看示例图案的绘制过程。"\n<font height="17">\n</font><b>"2"</b>"  准备就绪后，绘制您自己的个人解锁图案。可尝试不同的图案，但至少要连接四个点。"\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" msgid="8052305554017485410">"示例图案"</string>
-    <string name="lock_example_message" msgid="7431982730914254881">"至少连接四个点。"\n\n"准备好后选择“下一步”绘制自己的图案。"</string>
+    <string name="lock_example_message" msgid="1838650097090632706">"至少连接四个点。"\n\n"准备就绪后，触摸“下一步”绘制自己的图案。"</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"管理应用程序"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"管理和删除安装的应用程序"</string>
     <string name="applications_settings" msgid="3736173521008476946">"应用程序"</string>
@@ -638,8 +632,7 @@
     <string name="data_size_label" msgid="8679376373625710107">"数据"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"卸载"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"清除数据"</string>
-    <!-- no translation found for app_factory_reset (6635744722502563022) -->
-    <skip />
+    <string name="app_factory_reset" msgid="6635744722502563022">"卸载更新"</string>
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"您已选择在默认情况下对某些操作启动此应用程序。"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"无默认设置。"</string>
     <string name="clear_activities" msgid="7408923511535174430">"清除默认设置"</string>
@@ -650,32 +643,41 @@
     <string name="filter" msgid="2018011724373033887">"过滤"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"选择过滤选项"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"全部"</string>
-    <string name="filter_apps_third_party" msgid="1096017647285183437">"第三方"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"已下载"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"正在运行"</string>
     <string name="loading" msgid="3200408047793887917">"正在载入..."</string>
     <string name="recompute_size" msgid="7722567982831691718">"正在重新计算大小..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"删除"</string>
-    <string name="clear_data_dlg_text" msgid="8796694785488630642">"您保存在此应用程序中的所有信息将会永久删除。"</string>
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"此应用程序的所有数据将被永久删除。删除的内容包括所有文件、设置、帐户、数据库等。"</string>
     <string name="dlg_ok" msgid="2402639055725653590">"确定"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"取消"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"找不到应用程序"</string>
     <string name="app_not_found_dlg_text" msgid="2980271680333341554">"在已安装应用程序的列表中找不到该应用程序。"</string>
     <string name="clear_data_failed" msgid="581956197586913865">"无法清除应用程序数据。"</string>
-    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
-    <skip />
-    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
-    <skip />
-    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
-    <skip />
-    <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
-    <skip />
+    <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"卸载更新"</string>
+    <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"是否要卸载此 Android 系统应用程序的所有更新？"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"清除数据"</string>
+    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"无法清除应用程序数据"</string>
     <string name="security_settings_desc" msgid="3116027624526915561">"此应用程序有权访问手机上的以下内容："</string>
     <string name="computing_size" msgid="1599186977475211186">"正在计算..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"无法计算包大小"</string>
-    <string name="empty_list_msg" msgid="1883660401486953588">"您没有安装任何第三方企业应用套件。"</string>
-    <!-- no translation found for version_text (9189073826278676425) -->
-    <skip />
-    <string name="language_settings" msgid="2939555761536357092">"语言区域和文字"</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"未安装任何第三方应用程序。"</string>
+    <string name="version_text" msgid="9189073826278676425">"版本 <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"正在运行的服务"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"查看与控制当前正在运行的服务"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"正在重新启动"</string>
+    <string name="no_running_services" msgid="6981216347270280598">"当前未运行任何服务"</string>
+    <string name="confirm_stop_service" msgid="5700448757318301681">"是否停止服务？"</string>
+    <string name="confirm_stop_service_msg" msgid="1202118456282395730">"服务只有在重新启动之后，才可以继续运行。但这可能会给 <xliff:g id="APPLICATION">%1$s</xliff:g> 应用程序带来意想不到的结果。"</string>
+    <string name="confirm_stop_stop" msgid="7382363913280993331">"停止"</string>
+    <string name="confirm_stop_cancel" msgid="206495326622692381">"取消"</string>
+    <string name="service_started_by_app" msgid="8432097226392386802">"由应用程序启动：触摸可停止"</string>
+    <string name="service_client_name" msgid="2337664610975074717">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>：触摸可进行管理"</string>
+    <string name="service_background_processes" msgid="5158600475629177758">"可用：<xliff:g id="FREE">%2$s</xliff:g>+<xliff:g id="MEMORY">%3$s</xliff:g>，合计 <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_foreground_processes" msgid="4013890350284680796">"其他：<xliff:g id="MEMORY">%2$s</xliff:g>，合计 <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="service_process_name" msgid="8630408984456958400">"进程：<xliff:g id="PROCESS">%1$s</xliff:g>"</string>
+    <string name="language_settings" msgid="502219872342167227">"语言和键盘"</string>
+    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"语言和键盘设置"</string>
     <string name="language_settings_summary" msgid="595647729475399987">"设置语言区域（语言和区域）、文字输入和自动更正选项"</string>
     <string name="language_category" msgid="3391756582724541530">"语言区域设置"</string>
     <string name="text_category" msgid="6342540511465136739">"文字设置"</string>
@@ -690,7 +692,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"按两次空格键可以插入句号"</string>
     <string name="show_password" msgid="2198798062604049206">"密码可见"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"输入时密码可见"</string>
-    <string name="ime_security_warning" msgid="3458652708716006477">"该输入法可能会收集您输入的所有文字，包括密码和信用卡号码等个人数据。它源自<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>应用程序。是否要启用该输入法？"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"该输入法可能会收集您输入的所有文字，包括密码和信用卡号码等个人数据。它源自 <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> 应用程序。是否要使用该输入法？"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"用户词典"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"用户词典"</string>
     <string name="user_dict_settings_summary" msgid="2460427065601355471">"向用户词典中添加字词以及从用户词典中删除字词"</string>
@@ -718,7 +720,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"文字输入"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"管理文字输入选项"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>设置"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="4919680715154885028">"屏幕键盘设置"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"屏幕键盘设置"</string>
     <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"设备键盘"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"内置键盘设置"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"开发"</string>
@@ -729,13 +731,11 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充电时屏幕不会休眠"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"允许模拟位置"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"允许模拟位置"</string>
-    <!-- no translation found for adb_warning_title (1756027479229533250) -->
-    <skip />
-    <!-- no translation found for adb_warning_message (5352555112049663033) -->
-    <skip />
+    <string name="adb_warning_title" msgid="6234463310896563253">"是否允许 USB 调试？"</string>
+    <string name="adb_warning_message" msgid="5352555112049663033">"USB 调试仅用于开发工作。使用该功能可在计算机和移动设备之间复制数据、在移动设备上安装应用程序而不进行通知，以及读取日志数据。"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"选择小工具"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"选择窗口小部件"</string>
-    <string name="battery_history_details_for" msgid="5189636461798594740">"有关用户 ID %d 的详情"</string>
+    <string name="battery_history_details_for" msgid="5924639922153109669">"有关用户 ID <xliff:g id="NUMBER">%d</xliff:g> 的详情"</string>
     <string name="battery_history_uid" msgid="1016606150528436298">"用户 ID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage" msgid="8010852371665217020">"有关<xliff:g id="APP_NAME">%1$s</xliff:g>的网络使用详情："</string>
     <string name="battery_history_bytes_received" msgid="980307569180518302">"收到的字节数：<xliff:g id="BYTES">%1$d</xliff:g>"</string>
@@ -746,14 +746,10 @@
     <string name="battery_history_system_time" msgid="2015862072724507547">"系统时间："</string>
     <string name="battery_history_total_time" msgid="3618703970098556104">"合计时间："</string>
     <string name="battery_history_starts" msgid="9137453931978571696">"启动次数：<xliff:g id="STARTS">%1$d</xliff:g>"</string>
-    <!-- no translation found for battery_history_days (7110262897769622564) -->
-    <skip />
-    <!-- no translation found for battery_history_hours (7525170329826274999) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
-    <skip />
-    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
-    <skip />
+    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> 天 <xliff:g id="HOURS">%2$d</xliff:g> 小时 <xliff:g id="MINUTES">%3$d</xliff:g> 分 <xliff:g id="SECONDS">%4$d</xliff:g> 秒"</string>
+    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> 小时 <xliff:g id="MINUTES">%2$d</xliff:g> 分 <xliff:g id="SECONDS">%3$d</xliff:g> 秒"</string>
+    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> 分 <xliff:g id="SECONDS">%2$d</xliff:g> 秒"</string>
+    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> 秒"</string>
     <string name="battery_history_packages_sharing_this_uid" msgid="4101596071379250050">"共享该用户 ID 的数据包："</string>
     <string name="battery_history_no_data" msgid="1177238743237067617">"没有可用的电池使用数据"</string>
     <string name="battery_history_sensor" msgid="2333488996028993982">"传感器："</string>
@@ -768,407 +764,216 @@
     <string name="battery_history_screen_on" msgid="1377240025275657277">"屏幕开启所花费的时间："</string>
     <string name="battery_history_phone_on" msgid="4891504401623839532">"手机处于开机状态的时间："</string>
     <string name="battery_history_screen_on_battery" msgid="536058210445081888">"正在使用电池："</string>
-    <string name="battery_history_screen_on_plugged" msgid="5019127390021871260">"已插入："</string>
+    <string name="battery_history_screen_on_plugged" msgid="5019127390021871260">"充电时间："</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"使用情况统计"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"使用情况统计数据"</string>
     <string name="display_order_text" msgid="8592776965827565271">"排序方式："</string>
     <string name="app_name_label" msgid="2000949925256858308">"应用程序"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"次数"</string>
     <string name="usage_time_label" msgid="295954901452833058">"使用时间"</string>
-    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
-    <skip />
-    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
-    <skip />
-    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
-    <skip />
-    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
-    <skip />
-    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
-    <skip />
-    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
-    <skip />
-    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
-    <skip />
-    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
-    <skip />
-    <!-- no translation found for power_usage_summary (7237084831082848168) -->
-    <skip />
-    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
-    <skip />
-    <!-- no translation found for battery_since_reset (7464546661121187045) -->
-    <skip />
-    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
-    <skip />
+    <string name="accessibility_settings" msgid="3975902491934816215">"辅助功能"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"辅助功能设置"</string>
+    <string name="accessibility_settings_summary" msgid="8185181964847149507">"管理辅助功能选项"</string>
+    <string name="toggle_accessibility_title" msgid="650839277066574497">"辅助功能"</string>
+    <string name="accessibility_services_category" msgid="8127851026323672607">"辅助功能服务"</string>
+    <string name="no_accessibility_services_summary" msgid="694578333333808159">"未安装辅助功能服务。"</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"此辅助服务能够收集键入的所有文字，包括除密码以外的个人资料，如信用卡号。该服务还会记录用户界面交互情况。该服务来自应用程序 <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>。是否使用此辅助服务？"</string>
+    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"是否停用辅助功能？"</string>
+    <string name="power_usage_summary_title" msgid="5180282911164282324">"电量使用情况"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"耗电情况"</string>
+    <string name="battery_since_unplugged" msgid="338073389740738437">"拔下电源后的电量消耗情况"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"重置后的电量消耗情况"</string>
+    <string name="battery_stats_duration" msgid="7464501326709469282">"拔下电源后已使用 <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <!-- no translation found for awake (387122265874485088) -->
-    <skip />
-    <!-- no translation found for wifi_on_time (4630925382578609056) -->
-    <skip />
-    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
-    <skip />
-    <!-- no translation found for usage_name_percent (1899151069711662289) -->
-    <skip />
-    <!-- no translation found for details_title (7564809986329021063) -->
-    <skip />
-    <!-- no translation found for details_subtitle (32593908269911734) -->
-    <skip />
-    <!-- no translation found for controls_subtitle (390468421138288702) -->
-    <skip />
-    <!-- no translation found for packages_subtitle (4736416171658062768) -->
-    <skip />
-    <!-- no translation found for power_screen (2353149143338929583) -->
-    <skip />
-    <!-- no translation found for power_wifi (2382791137776486974) -->
-    <skip />
-    <!-- no translation found for power_bluetooth (4373329044379008289) -->
-    <skip />
-    <!-- no translation found for power_cell (6596471490976003056) -->
-    <skip />
-    <!-- no translation found for power_phone (5392641106474567277) -->
-    <skip />
-    <!-- no translation found for power_idle (9055659695602194990) -->
-    <skip />
-    <!-- no translation found for usage_type_cpu (715162150698338714) -->
-    <skip />
-    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
-    <skip />
-    <!-- no translation found for usage_type_gps (7989688715128160790) -->
-    <skip />
-    <!-- no translation found for usage_type_phone (9108247984998041853) -->
-    <skip />
-    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
-    <skip />
-    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
-    <skip />
-    <!-- no translation found for usage_type_audio (6957269406840886290) -->
-    <skip />
-    <!-- no translation found for usage_type_video (4295357792078579944) -->
-    <skip />
-    <!-- no translation found for usage_type_on_time (3351200096173733159) -->
-    <skip />
-    <!-- no translation found for usage_type_no_coverage (3797004252954385053) -->
-    <skip />
-    <!-- no translation found for battery_action_stop (649958863744041872) -->
-    <skip />
-    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
-    <skip />
-    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
-    <skip />
-    <!-- no translation found for battery_action_display (5302763261448580102) -->
-    <skip />
-    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
-    <skip />
-    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
-    <skip />
-    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
-    <skip />
-    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
-    <skip />
-    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
-    <skip />
-    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
-    <skip />
-    <!-- no translation found for battery_desc_display (5432795282958076557) -->
-    <skip />
-    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
-    <skip />
-    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
-    <skip />
-    <!-- no translation found for battery_sugg_wifi (7542345142282261691) -->
-    <skip />
-    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
-    <skip />
-    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
-    <skip />
-    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
-    <skip />
-    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_gps (4145005297393800223) -->
-    <skip />
-    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
-    <skip />
-    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
-    <skip />
-    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
-    <skip />
-    <!-- no translation found for menu_stats_total (8973377864854807854) -->
-    <skip />
-    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
-    <skip />
-    <!-- no translation found for process_kernel_label (3916858646836739323) -->
-    <skip />
-    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
-    <skip />
-    <!-- no translation found for tts_settings (6454363854545277027) -->
-    <skip />
-    <!-- no translation found for tts_settings_summary (2627715231944602766) -->
-    <skip />
-    <!-- no translation found for tts_settings_title (5064947197040356736) -->
-    <skip />
-    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
-    <skip />
-    <!-- no translation found for use_default_tts_settings_summary (4253502106159206276) -->
-    <skip />
-    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
-    <skip />
-    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
-    <skip />
-    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
-    <skip />
-    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
-    <skip />
-    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
-    <skip />
-    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
-    <skip />
-    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
-    <skip />
-    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
-    <skip />
-    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
-    <skip />
-    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
-    <skip />
-    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
-    <skip />
-    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
-    <skip />
-    <!-- no translation found for tts_demo (405357591189935876) -->
-    <skip />
-    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
-    <skip />
-    <!-- no translation found for gadget_title (7455548605888590466) -->
-    <skip />
-    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
-    <skip />
-    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
-    <skip />
-    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
-    <skip />
-    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
-    <skip />
-    <!-- no translation found for vpn_a_username (6664733641993968692) -->
-    <skip />
-    <!-- no translation found for vpn_a_password (1537213632501483753) -->
-    <skip />
-    <!-- no translation found for vpn_save_username (1408415289165970790) -->
-    <skip />
-    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
-    <skip />
-    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
-    <skip />
-    <!-- no translation found for vpn_no_button (7620339571187119107) -->
-    <skip />
-    <!-- no translation found for vpn_back_button (192036339792734970) -->
-    <skip />
-    <!-- no translation found for vpn_mistake_button (1683383660912491270) -->
-    <skip />
-    <!-- no translation found for vpn_menu_done (93528279226907926) -->
-    <skip />
-    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
-    <skip />
-    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
-    <skip />
-    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
-    <skip />
-    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
-    <skip />
-    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
-    <skip />
-    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
-    <skip />
-    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
-    <skip />
-    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
-    <skip />
-    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
-    <skip />
-    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
-    <skip />
-    <!-- no translation found for vpn_reconnect_from_lost (2442844155623372118) -->
-    <skip />
-    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
-    <skip />
-    <!-- no translation found for vpn_challenge_error_dialog_msg (6174901754230038601) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set_dialog_msg (8013052814131532765) -->
-    <skip />
-    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
-    <skip />
-    <!-- no translation found for vpn_remote_hung_up_error_dialog_msg (1566946015052633150) -->
-    <skip />
-    <!-- no translation found for vpn_type_title (6392933604218676224) -->
-    <skip />
-    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
-    <skip />
-    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
-    <skip />
-    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
-    <skip />
-    <!-- no translation found for vpns (3148141862835492816) -->
-    <skip />
-    <!-- no translation found for vpn_connecting (8039521381692090116) -->
-    <skip />
-    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
-    <skip />
-    <!-- no translation found for vpn_connected (7641723116362845781) -->
-    <skip />
-    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
-    <skip />
-    <!-- no translation found for vpn_name (1550918148476193076) -->
-    <skip />
-    <!-- no translation found for vpn_a_name (8445736942405283509) -->
-    <skip />
-    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
-    <skip />
-    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
-    <skip />
-    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
-    <skip />
-    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
-    <skip />
-    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
-    <skip />
-    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
-    <skip />
-    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
-    <skip />
-    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
-    <skip />
-    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
-    <skip />
-    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
-    <skip />
-    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
-    <skip />
-    <!-- no translation found for vpn_pptp_encryption_title (2236795167467896499) -->
-    <skip />
-    <!-- no translation found for vpn_pptp_encryption (2602329949737259686) -->
-    <skip />
-    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
-    <skip />
-    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
-    <skip />
-    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
-    <skip />
-    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
-    <skip />
-    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
-    <skip />
-    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
-    <skip />
-    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
-    <skip />
-    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
-    <skip />
-    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
-    <skip />
-    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
-    <skip />
-    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
-    <skip />
-    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
-    <skip />
-    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
-    <skip />
-    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
-    <skip />
-    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
-    <skip />
-    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
-    <skip />
-    <!-- no translation found for vpn_secret_unchanged (8700613973594154529) -->
-    <skip />
-    <!-- no translation found for vpn_secret_not_set (1037792636371641845) -->
-    <skip />
-    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
-    <skip />
-    <!-- no translation found for cstor_access_title (1739505390736236717) -->
-    <skip />
-    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
-    <skip />
-    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
-    <skip />
-    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
-    <skip />
-    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
-    <skip />
-    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
-    <skip />
-    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
-    <skip />
-    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
-    <skip />
-    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
-    <skip />
-    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
-    <skip />
-    <!-- no translation found for cstor_credential_password (7187440553141199409) -->
-    <skip />
-    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
-    <skip />
-    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
-    <skip />
-    <!-- no translation found for cstor_old_password (979282118063084561) -->
-    <skip />
-    <!-- no translation found for cstor_new_password (6218562692435670047) -->
-    <skip />
-    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
-    <skip />
-    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
-    <skip />
-    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
-    <skip />
-    <!-- no translation found for cstor_password_error (2917326097260402464) -->
-    <skip />
-    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
-    <skip />
-    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
-    <skip />
-    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
-    <skip />
-    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
-    <skip />
-    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
-    <skip />
-    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
-    <skip />
-    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
-    <skip />
-    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
-    <skip />
-    <!-- no translation found for cstor_storage_error (7140697503172458161) -->
-    <skip />
-    <!-- no translation found for cstor_unable_to_save_cert (1631402544447196406) -->
-    <skip />
-    <!-- no translation found for cstor_cert_not_saved (6318149789449538491) -->
-    <skip />
-    <!-- no translation found for cstor_is_reset (449870501126790589) -->
-    <skip />
-    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
-    <skip />
-    <!-- no translation found for cstor_is_added (794788474010251572) -->
-    <skip />
-    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
-    <skip />
-    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <string name="awake" msgid="387122265874485088">"设备唤醒时间"</string>
+    <string name="wifi_on_time" msgid="4630925382578609056">"WiFi 开启时间"</string>
+    <string name="bluetooth_on_time" msgid="4478515071957280711">"WiFi 开启时间"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
+    <string name="details_title" msgid="7564809986329021063">"电量使用详情"</string>
+    <string name="details_subtitle" msgid="32593908269911734">"详细使用情况"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"调配电量"</string>
+    <string name="packages_subtitle" msgid="4736416171658062768">"包括的软件包"</string>
+    <string name="power_screen" msgid="2353149143338929583">"显示屏"</string>
+    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"蓝牙"</string>
+    <string name="power_cell" msgid="6596471490976003056">"手机待机"</string>
+    <string name="power_phone" msgid="5392641106474567277">"语音通话"</string>
+    <string name="power_idle" msgid="9055659695602194990">"手机待机"</string>
+    <string name="usage_type_cpu" msgid="715162150698338714">"CPU 总使用时间"</string>
+    <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU（前台）"</string>
+    <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
+    <string name="usage_type_phone" msgid="9108247984998041853">"手机"</string>
+    <string name="usage_type_data_send" msgid="2857401966985425427">"数据已发送"</string>
+    <string name="usage_type_data_recv" msgid="7251090882025234185">"数据已收到"</string>
+    <string name="usage_type_audio" msgid="6957269406840886290">"音频"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"视频"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"已运行时间"</string>
+    <string name="usage_type_no_coverage" msgid="3797004252954385053">"无信号的时间"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"强行停止"</string>
+    <string name="battery_action_app_details" msgid="3275013531871113681">"应用程序信息"</string>
+    <string name="battery_action_app_settings" msgid="350562653472577250">"应用程序设置"</string>
+    <string name="battery_action_display" msgid="5302763261448580102">"显示设置"</string>
+    <string name="battery_action_wifi" msgid="5452076674659927993">"WiFi 设置"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"蓝牙设置"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"语音通话所耗的电量"</string>
+    <string name="battery_desc_standby" msgid="3009080001948091424">"手机待机时所耗的电量"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"手机射频所耗的电量"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"不在信号覆盖范围内时切换到飞行模式，以节约电量"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"显示屏和背光所耗的电量"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"降低屏幕亮度，并且/或者缩短屏幕超时时间"</string>
+    <string name="battery_desc_wifi" msgid="1702486494565080431">"Wi-Fi 所耗的电量"</string>
+    <string name="battery_sugg_wifi" msgid="7542345142282261691">"不使用 Wi-Fi 或其不可用时将其关闭"</string>
+    <string name="battery_desc_bluetooth" msgid="7535520658674621902">"蓝牙所耗的电量"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"请在未使用蓝牙功能时将其关闭"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"正在尝试连接另一蓝牙设备"</string>
+    <string name="battery_desc_apps" msgid="8123202939321333639">"运行应用程序时所耗的电量"</string>
+    <string name="battery_sugg_apps_info" msgid="6065882899391322442">"停止或卸载应用程序"</string>
+    <string name="battery_sugg_apps_gps" msgid="4145005297393800223">"不使用 GPS 时将其关闭"</string>
+    <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"该应用程序中可能有用于减少耗电量的设置"</string>
+    <string name="menu_stats_unplugged" msgid="8296577130840261624">"拔下电源 <xliff:g id="UNPLUGGED">%1$s</xliff:g>后的电量消耗情况"</string>
+    <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g>前拔下电源时的电量消耗情况"</string>
+    <string name="menu_stats_total" msgid="8973377864854807854">"总使用量"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"刷新"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
+    <string name="process_mediaserver_label" msgid="6500382062945689285">"媒体服务器"</string>
+    <string name="tts_settings" msgid="3348626948015962987">"文字到语音转换"</string>
+    <string name="tts_settings_summary" msgid="2627715231944602766">"设置文字转语音选项"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"文字到语音转换设置"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"总是使用我的设置"</string>
+    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"使用以下默认设置代替应用程序设置"</string>
+    <string name="tts_default_settings_section" msgid="5787915620218907443">"默认设置"</string>
+    <string name="tts_default_rate_title" msgid="6030550998379310088">"语速"</string>
+    <string name="tts_default_rate_summary" msgid="4061815292287182801">"文字转换成语音后的播放速度"</string>
+    <string name="tts_default_pitch_title" msgid="6135942113172488671">"音高"</string>
+    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"更改所播放的文字的音调"</string>
+    <string name="tts_default_lang_title" msgid="8018087612299820556">"语言"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"为文字转语音功能设置所使用的语言"</string>
+    <string name="tts_play_example_title" msgid="7094780383253097230">"聆听示例"</string>
+    <string name="tts_play_example_summary" msgid="8029071615047894486">"播放简短的语音合成示例"</string>
+    <string name="tts_install_data_title" msgid="4264378440508149986">"安装语音数据"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"安装语音合成所需的语音数据"</string>
+    <string name="tts_data_installed_summary" msgid="9162111552859972809">"语音合成所需的语音已安装妥当"</string>
+    <string name="tts_demo" msgid="405357591189935876">"这是语音合成示例。"</string>
+    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"设置已发生变化。这是声音效果示例。"</string>
+    <string name="gadget_title" msgid="7455548605888590466">"电量控制"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"正在更新 Wi-Fi 设置"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"正在更新蓝牙设置"</string>
+    <string name="credential_installer_activity_title" msgid="7600661521831762521">"凭证安装程序"</string>
+    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"虚拟专用网设置"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"连接到 <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpn_username_colon" msgid="7854930370861306247">"用户名："</string>
+    <string name="vpn_password_colon" msgid="5716278710848606626">"密码："</string>
+    <string name="vpn_a_username" msgid="6664733641993968692">"用户名"</string>
+    <string name="vpn_a_password" msgid="1537213632501483753">"密码"</string>
+    <string name="vpn_save_username" msgid="1408415289165970790">"记住用户名"</string>
+    <string name="vpn_connect_button" msgid="1699007212602470655">"连接"</string>
+    <string name="vpn_yes_button" msgid="8034531001149843119">"是"</string>
+    <string name="vpn_no_button" msgid="7620339571187119107">"否"</string>
+    <string name="vpn_back_button" msgid="192036339792734970">"返回"</string>
+    <string name="vpn_mistake_button" msgid="1683383660912491270">"否"</string>
+    <string name="vpn_menu_done" msgid="93528279226907926">"保存"</string>
+    <string name="vpn_menu_cancel" msgid="7234451214611202868">"取消"</string>
+    <string name="vpn_menu_revert" msgid="4407762442281467659">"还原"</string>
+    <string name="vpn_menu_connect" msgid="1089399414463784218">"连接到网络"</string>
+    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"断开与网络的连接"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"修改网络"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"删除网络"</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"必须输入<xliff:g id="CODE">%s</xliff:g>。"</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"必须选择<xliff:g id="OPTION">%s</xliff:g>。"</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"VPN 名称“<xliff:g id="NAME">%s</xliff:g>”已存在。请换用其他名称。"</string>
+    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"确定要删除此虚拟专用网吗？"</string>
+    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"确定不想创建此个人资料吗？"</string>
+    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"确定要舍弃对此配置所做的更改吗？"</string>
+    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"无法连接到网络。是否要再试一次？"</string>
+    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"连接已断。是否要重新连接？"</string>
+    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"服务器名称无法解析。是否要核实服务器名称设置？"</string>
+    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"质询错误。是否要核实密钥设置？"</string>
+    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"此虚拟专用网配置中缺少一个或多个密钥。是否要检查密钥设置？"</string>
+    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"输入的用户名或密码不正确。是否要再试一次？"</string>
+    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"服务器已暂停。输入的用户名或密码可能不正确。是否要再试一次？"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"服务器已挂起。可能是防火墙阻止了您与服务器的连接。是否要重试？"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"服务器协商失败。该服务器可能不认可您的加密选项。是否要检查您的加密设置？"</string>
+    <string name="vpn_type_title" msgid="6392933604218676224">"添加虚拟专用网"</string>
+    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"添加虚拟专用网"</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"添加 VPN“<xliff:g id="NAME">%s</xliff:g>”"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"“<xliff:g id="NAME">%s</xliff:g>”详情"</string>
+    <string name="vpns" msgid="3148141862835492816">"虚拟专用网"</string>
+    <string name="vpn_connecting" msgid="8039521381692090116">"正在连接..."</string>
+    <string name="vpn_disconnecting" msgid="7748050200708257066">"正在断开连接..."</string>
+    <string name="vpn_connected" msgid="7641723116362845781">"已连接"</string>
+    <string name="vpn_connect_hint" msgid="7442898962925875181">"连接到网络"</string>
+    <string name="vpn_name" msgid="1550918148476193076">"虚拟专用网名称"</string>
+    <string name="vpn_a_name" msgid="8445736942405283509">"虚拟专用网名称"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"已添加“<xliff:g id="NAME">%s</xliff:g>”"</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"已更改“<xliff:g id="NAME">%s</xliff:g>”"</string>
+    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"设置用户证书"</string>
+    <string name="vpn_user_certificate" msgid="949322691686938888">"用户证书"</string>
+    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"用户证书"</string>
+    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"设置 CA 证书"</string>
+    <string name="vpn_ca_certificate" msgid="465085144064264742">"证书授权中心 (CA) 的证书"</string>
+    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"CA 证书"</string>
+    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"设置 L2TP 密钥"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP 密钥"</string>
+    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"L2TP 密钥"</string>
+    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"加密"</string>
+    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"PPTP 加密"</string>
+    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"设置 IPSec 预共享密钥"</string>
+    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"IPSec 预共享密钥"</string>
+    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"IPSec 预共享密钥"</string>
+    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"设置虚拟专用网服务器"</string>
+    <string name="vpn_vpn_server" msgid="1141754908824209260">"虚拟专用网服务器"</string>
+    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"虚拟专用网服务器"</string>
+    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"虚拟专用网服务器名称"</string>
+    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS 搜索范围"</string>
+    <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS 搜索范围"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"已设置 <xliff:g id="VALUE">%s</xliff:g>"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> 未设置"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"未设置 <xliff:g id="VALUE">%s</xliff:g>（可选）"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"启用<xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"停用<xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"已启用<xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"已停用<xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_settings_title" msgid="7327468307909556719">"虚拟专用网设置"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"设置和管理虚拟专用网"</string>
+    <string name="vpn_secret_unchanged" msgid="8700613973594154529">"（未更改）"</string>
+    <string name="vpn_secret_not_set" msgid="1037792636371641845">"（未设置）"</string>
+    <string name="credentials_category" msgid="8536992056377271234">"凭证存储"</string>
+    <string name="credentials_access" msgid="4843187230913860492">"使用安全凭证"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"允许应用程序访问安全凭证和其他凭证"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"输入密码"</string>
+    <string name="credentials_unlock_hint" msgid="594679530407918031">"输入凭证存储密码。"</string>
+    <string name="credentials_install_certificates" msgid="177337517568022236">"从 SD 卡安装"</string>
+    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"从 SD 卡安装加密的证书"</string>
+    <string name="credentials_set_password" msgid="9104473585811899989">"设置密码"</string>
+    <string name="credentials_set_password_summary" msgid="8287876917562085701">"设置或更改凭证存储密码"</string>
+    <string name="credentials_reset" msgid="9170150870552453457">"清除存储"</string>
+    <string name="credentials_reset_summary" msgid="1530388094693731636">"清除所有内容的凭证存储并重置其密码"</string>
+    <string name="credentials_reset_hint" msgid="819990295796804516">"确定要删除所有凭证，并且重置凭证存储密码吗？"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"当前密码："</string>
+    <string name="credentials_new_password" msgid="267487774686796938">"新密码："</string>
+    <string name="credentials_confirm_password" msgid="4732250000633424345">"确认新密码："</string>
+    <string name="credentials_first_time_hint" msgid="1567821077545346039">"设置凭证存储密码（至少 8 个字符）。"</string>
+    <string name="credentials_wrong_password" msgid="7525192410790152041">"请输入正确的密码。"</string>
+    <string name="credentials_reset_warning" msgid="6392481296673345268">"请输入正确的密码。在系统删除该凭证存储之前，您还有一次输入正确密码的机会。"</string>
+    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"请输入正确的密码。在系统删除该凭证存储之前，您还有 <xliff:g id="NUMBER">%1$d</xliff:g> 次输入正确密码的机会。"</string>
+    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"密码不匹配。"</string>
+    <string name="credentials_passwords_empty" msgid="8647631321684363549">"您需要输入并确认密码。"</string>
+    <string name="credentials_password_empty" msgid="8292138152983330473">"请输入密码。"</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"密码至少应包含 8 个字符。"</string>
+    <string name="credentials_erased" msgid="7700309135582200849">"该凭证存储已删除。"</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"凭证存储已启用。"</string>
+    <string name="credentials_disabled" msgid="7453188089059045380">"凭证存储已停用。"</string>
+    <string name="emergency_tone_title" msgid="1055954530111587114">"紧急提示音"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"设置进行紧急呼叫时的行为"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"隐私权"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"隐私权设置"</string>
+    <string name="location_section_title" msgid="6072558684044939786">"位置"</string>
+    <string name="settings_section_title" msgid="7413252428447723032">"设置"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"个人数据"</string>
+    <string name="backup_settings_title" msgid="2968262658155327829">"备份我的设置"</string>
+    <string name="backup_erase_dialog_title" msgid="6028429904055779443">"设置备份"</string>
+    <string name="backup_erase_dialog_message" msgid="9096433810456900531">"确定要停止备份您的设置并清除 Google 服务器上的所有副本吗？"</string>
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
     <skip />
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 0f3cb313264..aa59593f056 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -24,13 +24,23 @@
     <item msgid="5345178126174698955">"太平洋"</item>
     <item msgid="8392017019801393511">"全部"</item>
   </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"沒有動畫"</item>
+    <item msgid="6291186755504776720">"部分動畫"</item>
+    <item msgid="3856065399819979491">"全部動畫"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"不顯示視窗動畫"</item>
+    <item msgid="4460915688877708508">"顯示部分視窗動畫"</item>
+    <item msgid="488968798204105119">"顯示所有視窗動畫"</item>
+  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 秒"</item>
     <item msgid="8881760709354815449">"30 秒"</item>
     <item msgid="7589406073232279088">"1 分鐘"</item>
     <item msgid="7001195990902244174">"2 分鐘"</item>
     <item msgid="5721688686241190620">"10 分鐘"</item>
-    <item msgid="1781492122915870416">"從不逾時"</item>
+    <item msgid="7156442995039264948">"30 分鐘"</item>
   </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"非常慢"</item>
@@ -58,18 +68,14 @@
     <item msgid="2923732046112398627">"自動"</item>
     <item msgid="5434666299123318296">"無"</item>
     <item msgid="3159594845889645948">"WEP"</item>
-    <item msgid="6303607119537134095">"WPA Personal"</item>
-    <item msgid="1977424472734732392">"WPA2 Personal"</item>
-    <item msgid="5185669984217684689">"WPA-EAP"</item>
-    <item msgid="8643206823103498303">"IEEE 802.1x"</item>
+    <item msgid="1687348101566181433">"WPA/WPA2 PSK"</item>
+    <item msgid="329777238762866787">"802.1x Enterprise"</item>
   </string-array>
   <string-array name="wifi_security_without_auto_entries">
     <item msgid="4402120432904877907">"無"</item>
     <item msgid="2329148995431627488">"WEP"</item>
-    <item msgid="2296204649410509235">"WPA Personal"</item>
-    <item msgid="8928468573279595315">"WPA2 Personal"</item>
-    <item msgid="8319241197948974314">"WPA-EAP"</item>
-    <item msgid="2222409752754955757">"IEEE 802.1x"</item>
+    <item msgid="6903317668294332381">"WPA/WPA2 PSK"</item>
+    <item msgid="7280821339307729710">"802.1x Enterprise"</item>
   </string-array>
   <string-array name="wifi_wep_type">
     <item msgid="1497433962958697183">"自動"</item>
@@ -108,7 +114,7 @@
     <item msgid="1818786254010764570">"無"</item>
     <item msgid="6189918678874123056">"PAP"</item>
     <item msgid="1524112260493662517">"MSCHAP"</item>
-    <item msgid="1586767102985419413">"MSCHAP2"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
@@ -116,4 +122,10 @@
     <item msgid="3165868966179561687">"警示"</item>
     <item msgid="6038758039030476855">"震動"</item>
   </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"無"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP 或 CHAP"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 4ca76becb5c..ebf974e6547 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -15,6 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"是"</string>
+    <string name="no" msgid="6731231425810196216">"否"</string>
     <string name="device_info_default" msgid="7847265875578739287">"未知的"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"開啟無線通訊"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"關閉無線通訊"</string>
@@ -56,6 +58,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"確定"</string>
     <string name="sdcard_setting" msgid="5922637503871474866">"SD 卡"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"電池狀態："</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"電源插頭："</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"電池存量："</string>
     <string name="battery_info_level_label" msgid="8706526709307788737">"電池存量："</string>
     <string name="battery_info_health_label" msgid="6416051542741886958">"電池壽命："</string>
@@ -75,6 +78,11 @@
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"放電中"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"未充電"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"電力充足"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"未插入"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"不明"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"未知的"</string>
     <string name="battery_info_health_good" msgid="8070356565806711806">"好"</string>
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"過熱"</string>
@@ -104,6 +112,12 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"藍牙配對要求"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"配對要求"</string>
     <string name="bluetooth_notif_message" msgid="5381418499788668724">"選取要配對的裝置 "</string>
+    <string name="device_picker" msgid="8721012448931226323">"藍牙裝置選取器"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"藍牙權限要求"</string>
+    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"手機上的某個應用程式要求開啟藍牙裝置，您想要允許要求嗎？"</string>
+    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"手機上的某個應用程式要求開啟藍牙裝置，這表示您的藍牙連線將開放 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒，讓其他裝置可在時間內搜尋到您的手機。您想要允許要求嗎？"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"手機上的某個應用程式要求開啟藍牙裝置，這表示您的藍牙連線將開放 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒，讓其他裝置可在時間內搜尋到您的手機。您想要允許要求嗎？"</string>
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"正在開啟藍牙..."</string>
     <string name="date_and_time" msgid="4114084177056654663">"日期與時間設定"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"下午 1:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -196,7 +210,8 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"停用所有的無線網路連線"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"停用無線網路連線中..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"啟用無線網路連線中..."</string>
-    <string name="radio_controls_title" msgid="8356991079873437337">"無線網路控制"</string>
+    <string name="radio_controls_title" msgid="5868688473587168882">"無線與網路"</string>
+    <string name="wireless_networks_settings_title" msgid="149274247949769551">"無線裝置和網路設定"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"管理 Wi-Fi、藍牙、飛行模式、行動網路和 VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"漫游服務"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"漫遊時連線到資料傳輸服務"</string>
@@ -219,20 +234,29 @@
     <string name="date_time_date_format" msgid="436706100255870967">"選取日期格式"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"依照字母排序"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"依時區排序"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"安全性與位置"</string>
+    <string name="security_settings_title" msgid="5168491784222013179">"位置與安全性"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"位置與安全性設定"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"設定我的位置、解除鎖定畫面及鎖定認證儲存空間"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密碼"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"藍牙"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"開啟藍牙"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"藍牙設定"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"藍牙設定"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"管理連線、設定裝置名稱與可偵測性"</string>
-    <string name="bluetooth_pin_entry" msgid="5627349871303455279">"藍牙配對要求"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"藍牙配對要求"</string>
     <string name="bluetooth_device_info" msgid="6644515376523965073">"藍牙裝置資訊"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="7551139612735632370">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"輸入 PIN 進行配對。"\n"(請嘗試 0000 或 1234。)"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"請輸入 PIN 與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」進行配對 (建議嘗試輸入 0000 或 1234)。"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"請輸入密碼金鑰與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」進行配對。"</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"如要與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」配對，請確定裝置顯示以下密碼金鑰：<xliff:g id="PASSKEY">%2$s</xliff:g>。"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"想要進行配對。"</string>
+    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"請在「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」輸入 <xliff:g id="PASSKEY">%2$s</xliff:g> 以進行配對。"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"配對"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"不要配對"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"藍牙裝置"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"注意"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"與<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配對時發生問題。"</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="6938408362011024289">"由於輸入的 PIN 不正確，因此無法與<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配對。"</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"無法與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 進行配對，因為輸入的 PIN 或密碼金鑰有誤。"</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"無法與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」建立通訊。"</string>
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」拒絕配對要求。"</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"連接至<xliff:g id="DEVICE_NAME">%1$s</xliff:g>時發生問題。"</string>
@@ -246,6 +270,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"連線到..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"媒體"</string>
     <string name="bluetooth_profile_headset" msgid="1874975688666658946">"電話"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"傳輸"</string>
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"連接至媒體音訊"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"連接至電話音訊"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"連接至電話和媒體音訊"</string>
@@ -255,8 +280,11 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"設定檔"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"連接至媒體音訊"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"連接至電話音訊"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"已連線到檔案傳輸伺服器"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"不要連線到檔案傳輸伺服器"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"用於媒體音訊"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"用於電話音訊"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"用於傳輸檔案"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"開啟 Wi-Fi"</string>
@@ -271,19 +299,15 @@
     <string name="wifi_signal_1" msgid="8623690413812290642">"可"</string>
     <string name="wifi_signal_0" msgid="3862211184991511432">"差"</string>
     <string name="security" msgid="1040691896987225267">"安全性"</string>
-    <string name="wifi_security_open" msgid="3513305614048816607">"開啟"</string>
+    <string name="wifi_security_open" msgid="3513305614048816607">"開放"</string>
     <string name="wifi_security_wep" msgid="7082604129842065776">"WEP"</string>
-    <string name="wifi_security_wpa" msgid="8980169410565477162">"WPA"</string>
-    <string name="wifi_security_wpa2" msgid="5780665935088930524">"WPA2"</string>
-    <string name="wifi_security_wpa_eap" msgid="7485687331651751101">"WPA-EAP"</string>
-    <string name="wifi_security_ieee8021x" msgid="8538687609878109005">"IEEE8021X"</string>
+    <string name="wifi_security_psk" msgid="3392399380570381452">"WPA/WPA2 PSK"</string>
+    <string name="wifi_security_eap" msgid="8309434150934969132">"Enterprise(802.1x)"</string>
     <string name="wifi_security_unknown" msgid="4564208312073060668">"未知的"</string>
     <string name="wifi_security_verbose_open" msgid="8117878112088901945">"開放網路"</string>
     <string name="wifi_security_verbose_wep" msgid="9220757688700421508">"以 WEP 保護連線安全性"</string>
-    <string name="wifi_security_verbose_wpa" msgid="598697674252714455">"以 WPA 保護連線安全性"</string>
-    <string name="wifi_security_verbose_wpa2" msgid="4116236883347875722">"以 WPA2 保護連線安全性"</string>
-    <string name="wifi_security_verbose_wpa_eap" msgid="1984821646949066624">"以 WPA-EAP 保護連線安全性"</string>
-    <string name="wifi_security_verbose_ieee8021x" msgid="5552995793910186310">"以 IEEE 802.1x 保護連線安全性"</string>
+    <string name="wifi_security_verbose_psk" msgid="1110130025330416225">"以 WPA/WPA2 PSK 保護連線安全性"</string>
+    <string name="wifi_security_verbose_eap" msgid="586632662086063">"以 802.1x EAP 保護連線安全性"</string>
     <string name="ip_address" msgid="850672263358989449">"IP 位址"</string>
     <string name="signal" msgid="1947969631626413228">"訊號強度"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"開啟中..."</string>
@@ -302,14 +326,13 @@
     <string name="please_type_anonymous_identity" msgid="835061562079965048">"匿名識別"</string>
     <string name="please_select_client_certificate" msgid="2137906961594663234">"用戶端憑證"</string>
     <string name="please_select_ca_certificate" msgid="5010815181914420677">"CA 憑證"</string>
-    <string name="please_type_private_key_passwd" msgid="4077744679722504443">"私密金鑰密碼"</string>
     <string name="please_type_passphrase" msgid="8256017704131522462">"無線網路密碼"</string>
     <string name="please_type_hex_key" msgid="8751224390407867551">"WEP hex key (0-9，A-F)"</string>
     <string name="wifi_show_password" msgid="4235237470701732009">"顯示密碼"</string>
     <string name="scan_wifi" msgid="2459901725350542606">"掃描"</string>
     <string name="summary_not_in_range" msgid="3926674700733548684">"不在範圍內"</string>
     <string name="summary_remembered" msgid="6079941090549401742">"已記憶"</string>
-    <string name="summary_connection_failed" msgid="7610394657613410489">"連線失敗，選取此項再試一次。"</string>
+    <string name="summary_connection_failed" msgid="2351885658101671413">"連線失敗，請輕觸以再試一次"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi 網路"</string>
     <string name="wifi_type_ssid" msgid="1326839657083292017">"網路 SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"安全性"</string>
@@ -360,6 +383,7 @@
     <string name="status_disconnected" msgid="7561688569905126046">"已中斷連線"</string>
     <string name="status_failed" msgid="610462050405904601">"失敗"</string>
     <string name="sound_and_display_settings" msgid="349770582993029003">"音效與顯示"</string>
+    <string name="sound_and_display_settings_title" msgid="5036144539683697330">"音效與顯示設定"</string>
     <string name="sound_settings" msgid="5007659014828162881">"音效設定"</string>
     <string name="sound_and_display_settings_summary" msgid="1433943789593286064">"設定鈴聲、通知與螢幕亮度"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"靜音模式"</string>
@@ -385,11 +409,14 @@
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"有聲選項"</string>
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"使用螢幕選取時播放音效"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"在螢幕上進行選取時播放音效"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"觸動回饋"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"按下螢幕按鍵與出現特定的操作行為時會震動"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"按下螢幕按鍵與出現特定的操作行為時會震動"</string>
     <string name="play_media_notification_sounds_enable_title" msgid="1008791464029179529">"SD 卡通知"</string>
     <string name="play_media_notification_sounds_enable_summary_on" msgid="7675466959375667370">"播放 SD 卡通知音效"</string>
     <string name="play_media_notification_sounds_enable_summary_off" msgid="8672617597028744693">"播放 SD 卡通知音效"</string>
-    <string name="sync_settings" msgid="2212736205476453234">"資料同步處理"</string>
-    <string name="sync_settings_summary" msgid="6480534906375217074">"選取要同步處理的應用程式"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"帳戶與同步處理"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"新增或移除帳戶和變更帳戶設定"</string>
     <string name="search_settings" msgid="1910951467596035063">"搜尋"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"管理搜尋設定和記錄"</string>
     <string name="display_settings" msgid="3912042046350078328">"顯示設定"</string>
@@ -403,6 +430,7 @@
     <string name="brightness_summary" msgid="838917350127550703">"調整螢幕亮度"</string>
     <string name="screen_timeout" msgid="4882669461447531301">"螢幕逾時"</string>
     <string name="screen_timeout_summary" msgid="2905757633140605334">"調整螢幕自動關閉前的延遲時間"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 卡鎖定設定"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"設定 SIM 卡鎖定"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM 卡鎖定"</string>
@@ -436,7 +464,8 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"狀態"</string>
     <string name="device_status" msgid="607405385799807324">"狀態"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"電話號碼、訊號等。"</string>
-    <string name="storage_settings_title" msgid="8461515684514801302">"SD 卡與手機儲存"</string>
+    <string name="storage_settings" msgid="6681164315506788024">"SD 卡和行動電話儲存空間"</string>
+    <string name="storage_settings_title" msgid="5379463509034022773">"SD 卡和行動電話儲存空間設定"</string>
     <string name="storage_settings_summary" msgid="9176693537325988610">"卸載 SD 卡，檢視可用儲存媒體。"</string>
     <string name="status_number" msgid="5123197324870153205">"我的電話號碼"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
@@ -480,6 +509,11 @@
     <string name="apn_mms_port" msgid="4074188088199243040">"MMS 連接埠"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"驗證類型"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"無"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP 或 CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN 類型"</string>
     <string name="menu_delete" msgid="6981294422841124659">"刪除 APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"新增 APN"</string>
@@ -518,12 +552,15 @@
     <string name="location_network_based" msgid="8815705866861993344">"使用無線網路"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"使用無線網路，在應用程式中查詢位置 (例如 Google 地圖)"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"根據 Wi-Fi 與/或行動網路判定位置"</string>
-    <string name="location_gps" msgid="375912731641377120">"啟用 GPS 衛星接收器"</string>
-    <string name="location_street_level" msgid="5899941752252356344">"定位時，精準度設定為街道等級 (取消選取此項可較省電)"</string>
+    <string name="location_gps" msgid="6296125378829097831">"使用 GPS 衛星定位"</string>
+    <string name="location_street_level" msgid="6460740847018275745">"定位時，精準度設定為街道等級 (取消勾選即可節省電力)"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"定位至街道等級 (需要更多電力及天候允許)"</string>
-    <string name="use_location_title" msgid="7585990952633568732">"與 Google 分享"</string>
-    <string name="use_location_summary" msgid="4411467143899877395">"允許 Google 使用位置資訊來改善搜尋與其他服務"</string>
-    <string name="use_location_warning_message" msgid="5696732842038416151">"允許 Google 使用位置資訊來改善搜尋結果與其他服務"</string>
+    <string name="assisted_gps" msgid="4649317129586736885">"使用輔助 GPS"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"使用伺服器輔助 GPS (取消勾選即可降低網路使用量)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"使用伺服器輔助 GPS (取消勾選即可提升 GPS 效能)"</string>
+    <string name="use_location_title" msgid="5447030582538504247">"使用我的位置"</string>
+    <string name="use_location_summary" msgid="1816849484040070431">"在 Google 搜尋結果和其他 Google 服務使用「我的位置」資訊"</string>
+    <string name="use_location_warning_message" msgid="1420184860518262439">"要允許 Google 使用位置資訊改善搜尋結果與其他服務嗎？"</string>
     <string name="agree" msgid="6288718671527758326">"同意"</string>
     <string name="disagree" msgid="6221069272309799230">"不同意"</string>
     <string name="about_settings" msgid="1743378368185371685">"關於手機"</string>
@@ -538,6 +575,10 @@
     <string name="settings_license_activity_title" msgid="7553683406244228650">"開啟原始授權"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"載入授權時發生問題"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"載入中..."</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"安全資訊"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"安全資訊"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"您的手機尚未與資料傳輸服務連線。如要檢視此資訊，請使用任何可上網的電腦前往 %s。"</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"載入中..."</string>
     <string name="lock_settings_title" msgid="5828348303971852121">"螢幕解鎖圖形"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"變更解鎖圖形"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"確認儲存的圖形"</string>
@@ -566,9 +607,9 @@
     <string name="skip_button_label" msgid="8680422740354436943">"取消"</string>
     <string name="next_button_label" msgid="8890792540116568321">"下一頁"</string>
     <string name="lock_title" msgid="4059246467204273930">"手機安全設定"</string>
-    <string name="lock_intro_message" msgid="5352897389718432077"><font size="17">" 建立個人螢幕解鎖圖形，避免您的手機在未授權狀態下遭人使用。 "\n<font height="17">\n</font><b>" 1 "</b>"  請在下一個畫面中，檢視範例圖形繪畫示範。"\n<font height="17">\n</font><b>" 2 "</b>"  準備好後，便可畫出個人解鎖圖形。您可以嘗試不同的圖形，但需要至少連接四點。 "\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_intro_message" msgid="9100785646737118042"><font size="17">"建立個人螢幕的解鎖圖案，避免手機在未經授權的狀態下遭人使用。"\n<font height="17">\n</font><b>"1"</b>"  請在下一個畫面檢視範例圖案的繪製示範。"\n<font height="17">\n</font><b>"2"</b>"  當您準備就緒後，請繪製自己的個人解鎖圖案。請嘗試繪製不同的圖案，但至少要連接四個點。"\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" msgid="8052305554017485410">"範例圖形"</string>
-    <string name="lock_example_message" msgid="7431982730914254881">"畫出圖形時，需要至少連接四個點。"\n" "\n"準備好要畫出您的解鎖圖形時，請選取 [下一步]。"</string>
+    <string name="lock_example_message" msgid="1838650097090632706">"至少連接四個點。"\n" "\n"您準備好要繪製自己的解鎖圖案時，請輕觸 [下一步]。"</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"管理應用程式"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"管理及移除已安裝的應用程式"</string>
     <string name="applications_settings" msgid="3736173521008476946">"應用程式"</string>
@@ -602,12 +643,12 @@
     <string name="filter" msgid="2018011724373033887">"篩選"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"選取篩選選項"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"全部"</string>
-    <string name="filter_apps_third_party" msgid="1096017647285183437">"第三方"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"已下載"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"執行中"</string>
     <string name="loading" msgid="3200408047793887917">"載入中..."</string>
     <string name="recompute_size" msgid="7722567982831691718">"重新計算大小..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"刪除"</string>
-    <string name="clear_data_dlg_text" msgid="8796694785488630642">"所有儲存在此應用程式的資訊都會被永久刪除。"</string>
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"該應用程式的所有資料都將遭到永遠刪除，包含所有檔案、設定、帳戶、資料庫等等。"</string>
     <string name="dlg_ok" msgid="2402639055725653590">"確定"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"取消"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"找不到應用程式"</string>
@@ -620,9 +661,23 @@
     <string name="security_settings_desc" msgid="3116027624526915561">"此應用程式可存取您電話中的下列項目："</string>
     <string name="computing_size" msgid="1599186977475211186">"計算中..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"無法計算封裝大小"</string>
-    <string name="empty_list_msg" msgid="1883660401486953588">"您未安裝任何第三方應用程式。"</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"您未安裝任何第三方應用程式。"</string>
     <string name="version_text" msgid="9189073826278676425">"版本 <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
-    <string name="language_settings" msgid="2939555761536357092">"地區設定與文字"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"正在運作的服務"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"查看並控制目前正在運作的服務"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"重新啟動中"</string>
+    <string name="no_running_services" msgid="6981216347270280598">"沒有正在運作的服務"</string>
+    <string name="confirm_stop_service" msgid="5700448757318301681">"要停止服務嗎？"</string>
+    <string name="confirm_stop_service_msg" msgid="1202118456282395730">"服務將不再繼續執行，除非您重新啟動該服務。這個動作可能會對應用程式「<xliff:g id="APPLICATION">%1$s</xliff:g>」造成無法預期的結果。"</string>
+    <string name="confirm_stop_stop" msgid="7382363913280993331">"停止"</string>
+    <string name="confirm_stop_cancel" msgid="206495326622692381">"取消"</string>
+    <string name="service_started_by_app" msgid="8432097226392386802">"由應用程式啟動：輕觸螢幕即可停止"</string>
+    <string name="service_client_name" msgid="2337664610975074717">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>：輕觸即可進行管理"</string>
+    <string name="service_background_processes" msgid="5158600475629177758">"可用：<xliff:g id="FREE">%2$s</xliff:g>+<xliff:g id="MEMORY">%3$s</xliff:g>，共 <xliff:g id="COUNT">%1$d</xliff:g> 個程序"</string>
+    <string name="service_foreground_processes" msgid="4013890350284680796">"其他：<xliff:g id="MEMORY">%2$s</xliff:g>，共 <xliff:g id="COUNT">%1$d</xliff:g> 個程序"</string>
+    <string name="service_process_name" msgid="8630408984456958400">"程序：<xliff:g id="PROCESS">%1$s</xliff:g>"</string>
+    <string name="language_settings" msgid="502219872342167227">"語言與鍵盤"</string>
+    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"語言與鍵盤設定"</string>
     <string name="language_settings_summary" msgid="595647729475399987">"選取地區設定 (語言和地區)、文字輸入和自動校正選項"</string>
     <string name="language_category" msgid="3391756582724541530">"地區設定"</string>
     <string name="text_category" msgid="6342540511465136739">"文字設定"</string>
@@ -637,7 +692,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"按空白鍵兩次可插入「.」"</string>
     <string name="show_password" msgid="2198798062604049206">"顯示密碼"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"顯示輸入的密碼"</string>
-    <string name="ime_security_warning" msgid="3458652708716006477">"此輸入法可能會收集您輸入的所有文字，包括密碼和信用卡號等個人資料。此輸入法來自 <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> 應用程式。是否啟用此輸入法？"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"此輸入法可能會收集您輸入的所有文字，包括密碼和信用卡號等個人資料。此輸入法來自「<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>」應用程式。是否要使用此輸入法？"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"使用者字典"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"使用者字典"</string>
     <string name="user_dict_settings_summary" msgid="2460427065601355471">"在使用者字典中新增及移除字詞"</string>
@@ -665,7 +720,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"文字輸入法"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"管理輸入法選項"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> 設定"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="4919680715154885028">"螢幕小鍵盤設定"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"螢幕鍵盤設定"</string>
     <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"裝置小鍵盤"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"內建小鍵盤設定"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"開發"</string>
@@ -676,11 +731,11 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充電時螢幕不會進入休眠"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"允許模擬位置"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"允許模擬位置"</string>
-    <string name="adb_warning_title" msgid="1756027479229533250">"啟用 USB 偵錯功能嗎？"</string>
+    <string name="adb_warning_title" msgid="6234463310896563253">"允許 USB 偵錯嗎？"</string>
     <string name="adb_warning_message" msgid="5352555112049663033">"USB 偵錯是針對應用程式開發而設計的功能，可讓您在電腦與裝置間複製資料、不用通知即可在裝置上安裝應用程式，以及讀取記錄資料。"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"選擇小工具"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"選擇小工具"</string>
-    <string name="battery_history_details_for" msgid="5189636461798594740">"UID %d 的詳細資料"</string>
+    <string name="battery_history_details_for" msgid="5924639922153109669">"UID <xliff:g id="NUMBER">%d</xliff:g> 的詳細資料"</string>
     <string name="battery_history_uid" msgid="1016606150528436298">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage" msgid="8010852371665217020">"<xliff:g id="APP_NAME">%1$s</xliff:g> 的網路使用率詳細資料："</string>
     <string name="battery_history_bytes_received" msgid="980307569180518302">"已接收的位元組數：<xliff:g id="BYTES">%1$d</xliff:g>"</string>
@@ -716,12 +771,13 @@
     <string name="app_name_label" msgid="2000949925256858308">"應用程式"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"計數"</string>
     <string name="usage_time_label" msgid="295954901452833058">"使用時間"</string>
-    <string name="accessibility_settings_title" msgid="4239640930601071058">"協助工具"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"協助工具"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"協助工具設定"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"管理協助工具選項"</string>
     <string name="toggle_accessibility_title" msgid="650839277066574497">"協助工具"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"協助工具服務"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"尚未安裝協助工具服務。"</string>
-    <string name="accessibility_service_security_warning" msgid="8386156287296967181">"此協助工具服務可能會收集您輸入的所有文字，包括個人資料及信用卡號碼，但並不會收集您輸入的密碼，而且它也可能會記錄您的使用者介面互動行為。該服務是由應用程式「<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>」所提供，要啟動此協助工具服務嗎？"</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"此協助工具服務可能會收集您輸入的所有文字，包括個人資料及信用卡號碼，但並不會收集您輸入的密碼，而且它也可能會記錄您的使用者介面互動行為。該服務是由應用程式「<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>」所提供，要使用此協助工具服務嗎？"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"要停用協助工具嗎？"</string>
     <string name="power_usage_summary_title" msgid="5180282911164282324">"電池使用狀況"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"消耗電池電力的功能"</string>
@@ -733,7 +789,7 @@
     <string name="awake" msgid="387122265874485088">"裝置甦醒時間"</string>
     <string name="wifi_on_time" msgid="4630925382578609056">"WiFi 開啟時間"</string>
     <string name="bluetooth_on_time" msgid="4478515071957280711">"WiFi 開啟時間"</string>
-    <string name="usage_name_percent" msgid="1899151069711662289">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="PERCENT">%2$s</xliff:g>%%"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"電池使用狀況詳細資料"</string>
     <string name="details_subtitle" msgid="32593908269911734">"使用狀況詳細資訊"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"調整電力使用"</string>
@@ -769,7 +825,7 @@
     <string name="battery_desc_wifi" msgid="1702486494565080431">"Wi-Fi 耗電量"</string>
     <string name="battery_sugg_wifi" msgid="7542345142282261691">"未使用或無法使用 Wi-Fi 時即關閉 Wi-Fi"</string>
     <string name="battery_desc_bluetooth" msgid="7535520658674621902">"藍牙耗電量"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="144393178427277439">"未使用藍牙時即關閉藍牙"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"未使用藍牙時即關閉藍牙"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"嘗試連線至不同的藍牙裝置"</string>
     <string name="battery_desc_apps" msgid="8123202939321333639">"應用程式執行時的耗電量"</string>
     <string name="battery_sugg_apps_info" msgid="6065882899391322442">"停止或解除安裝應用程式"</string>
@@ -781,9 +837,9 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"重新整理"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android 作業系統"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"媒體伺服器"</string>
-    <string name="tts_settings" msgid="6454363854545277027">"語音合成"</string>
+    <string name="tts_settings" msgid="3348626948015962987">"文字轉語音"</string>
     <string name="tts_settings_summary" msgid="2627715231944602766">"設定文字轉語音選項"</string>
-    <string name="tts_settings_title" msgid="5064947197040356736">"語音合成器控制項"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"文字轉語音設定"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"永遠使用我的設定"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"下列預設設定會覆寫應用程式設定"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"預設設定"</string>
@@ -801,8 +857,11 @@
     <string name="tts_demo" msgid="405357591189935876">"請聆聽合成的範例。"</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"設定已變更，請聆聽語音範例。"</string>
     <string name="gadget_title" msgid="7455548605888590466">"電源控制"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"正在更新 Wi-Fi 設定"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"正在更新藍牙設定"</string>
+    <string name="credential_installer_activity_title" msgid="7600661521831762521">"認證安裝程式"</string>
     <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN 設定"</string>
-    <string name="vpn_connect_to" msgid="9040615733700098831">"連線至「%s」"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"連線至<xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="vpn_username_colon" msgid="7854930370861306247">"使用者名稱："</string>
     <string name="vpn_password_colon" msgid="5716278710848606626">"密碼："</string>
     <string name="vpn_a_username" msgid="6664733641993968692">"使用者名稱"</string>
@@ -820,9 +879,9 @@
     <string name="vpn_menu_disconnect" msgid="8254492450022562235">"中斷網路連線"</string>
     <string name="vpn_menu_edit" msgid="4526245173583195618">"編輯網路"</string>
     <string name="vpn_menu_delete" msgid="3326527392609513129">"刪除網路"</string>
-    <string name="vpn_error_miss_entering" msgid="1467455143582547499">"請輸入%s。"</string>
-    <string name="vpn_error_miss_selecting" msgid="953436717902387192">"請選取%s。"</string>
-    <string name="vpn_error_duplicate_name" msgid="2786397299628471911">"VPN 名稱「%s」已經存在，請使用其他名稱。"</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"請輸入<xliff:g id="CODE">%s</xliff:g>。"</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"請選取<xliff:g id="OPTION">%s</xliff:g>。"</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"VPN 名稱「<xliff:g id="NAME">%s</xliff:g>」已經存在，請使用其他名稱。"</string>
     <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"確定要刪除此 VPN 嗎？"</string>
     <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"確定不要建立此設定檔嗎？"</string>
     <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"確定要捨棄您對此設定檔所做的變更嗎？"</string>
@@ -833,10 +892,12 @@
     <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"此 VPN 設定遺失了一或多個密碼檔，要檢查密碼檔設定嗎？"</string>
     <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"您所輸入的使用者名稱或密碼不正確，您要再試一次嗎？"</string>
     <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"伺服器無回應，您所輸入的使用者名稱或密碼可能有誤，要再試一次嗎？"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"伺服器中斷連線，這可能是因為您的防火牆禁止您連線到該伺服器。要再試一次嗎？"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"伺服器協商失敗；伺服器不同意您的加密選項。要查看您的加密設定嗎？"</string>
     <string name="vpn_type_title" msgid="6392933604218676224">"新增 VPN"</string>
     <string name="vpn_add_new_vpn" msgid="5438260689052714550">"新增 VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2550661826320709266">"新增%s VPN"</string>
-    <string name="vpn_edit_title_edit" msgid="1769999313158207723">"%s詳細資訊"</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"新增 <xliff:g id="NAME">%s</xliff:g> VPN"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"<xliff:g id="NAME">%s</xliff:g>的詳細資料"</string>
     <string name="vpns" msgid="3148141862835492816">"VPN"</string>
     <string name="vpn_connecting" msgid="8039521381692090116">"連線中..."</string>
     <string name="vpn_disconnecting" msgid="7748050200708257066">"中斷連線中..."</string>
@@ -844,8 +905,8 @@
     <string name="vpn_connect_hint" msgid="7442898962925875181">"連線至網路"</string>
     <string name="vpn_name" msgid="1550918148476193076">"VPN 名稱"</string>
     <string name="vpn_a_name" msgid="8445736942405283509">"VPN 名稱"</string>
-    <string name="vpn_profile_added" msgid="2157095890825215726">"已新增「%s」"</string>
-    <string name="vpn_profile_replaced" msgid="384234123486734768">"已變更「%s」的設定"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"已新增「<xliff:g id="NAME">%s</xliff:g>」"</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"已變更「<xliff:g id="NAME">%s</xliff:g>」的設定"</string>
     <string name="vpn_user_certificate_title" msgid="6812545893924071742">"設定使用者憑證"</string>
     <string name="vpn_user_certificate" msgid="949322691686938888">"使用者憑證"</string>
     <string name="vpn_a_user_certificate" msgid="8943983437956898649">"使用者憑證"</string>
@@ -866,53 +927,53 @@
     <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"VPN 伺服器名稱"</string>
     <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS 搜尋網域"</string>
     <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS 搜尋網域"</string>
-    <string name="vpn_field_is_set" msgid="1880980734721258127">"已設定%s"</string>
-    <string name="vpn_field_not_set" msgid="6827205815004809490">"未設定%s"</string>
-    <string name="vpn_field_not_set_optional" msgid="8665901697706781015">"未設定%s (可略過)"</string>
-    <string name="vpn_enable_field" msgid="3348948489989523325">"啟用%s"</string>
-    <string name="vpn_disable_field" msgid="2286966253789266389">"停用%s"</string>
-    <string name="vpn_is_enabled" msgid="5128973727115662815">"已啟用%s"</string>
-    <string name="vpn_is_disabled" msgid="8028085699769751756">"已停用%s"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"已設定<xliff:g id="VALUE">%s</xliff:g>"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"未設定<xliff:g id="VALUE">%s</xliff:g>"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"未設定<xliff:g id="VALUE">%s</xliff:g> (可略過)"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"啟用<xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"停用<xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"已啟用<xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"已停用<xliff:g id="OPTION">%s</xliff:g>"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"VPN 設定"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"設定與管理虛擬私人網路 (VPN)"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(未變更)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(未設定)"</string>
-    <string name="cstor_settings_category" msgid="2284299080682591107">"認證儲存空間"</string>
-    <string name="cstor_access_title" msgid="1739505390736236717">"使用安全認證"</string>
-    <string name="cstor_access_summary" msgid="4512681868217546677">"允許應用程式存取安全認證及其他認證"</string>
-    <string name="cstor_access_dialog_title" msgid="3024256293191879190">"輸入密碼"</string>
-    <string name="cstor_access_dialog_hint_from_action" msgid="679746865623760961">"輸入認證儲存空間密碼。"</string>
-    <string name="cstor_set_passwd_title" msgid="6156763762703061470">"設定密碼"</string>
-    <string name="cstor_set_passwd_summary" msgid="5248560429856597398">"設定或變更認證儲存空間密碼"</string>
-    <string name="cstor_set_passwd_dialog_title" msgid="4071157542842979977">"設定密碼"</string>
-    <string name="cstor_reset_title" msgid="6001600882136794382">"清除儲存空間"</string>
-    <string name="cstor_reset_summary" msgid="7509525030771504833">"清除認證儲存空間的所有內容，並重新設定密碼"</string>
-    <string name="cstor_reset_hint" msgid="5331632794451859788">"確定要刪除所有認證，並重新設定認證儲存空間密碼嗎？"</string>
-    <string name="cstor_name_credential_dialog_title" msgid="1723509156126180662">"為憑證命名"</string>
-    <string name="cstor_credential_name" msgid="2958936431813760259">"憑證名稱："</string>
-    <string name="cstor_credential_password" msgid="7187440553141199409">"擷取憑證的密碼："</string>
-    <string name="cstor_credential_info" msgid="6097346149400207440">"憑證詳細資訊："</string>
-    <string name="cstor_name_credential_hint" msgid="6889198058976515785">"名稱只能包含英數字元。"</string>
-    <string name="cstor_old_password" msgid="979282118063084561">"目前的密碼："</string>
-    <string name="cstor_new_password" msgid="6218562692435670047">"新密碼："</string>
-    <string name="cstor_confirm_password" msgid="8996028123356342466">"確認新密碼："</string>
-    <string name="cstor_first_time_hint" msgid="1831593416099224962">"設定認證儲存空間密碼。"</string>
-    <string name="cstor_first_time_hint_from_action" msgid="4690937025845780557">"設定認證儲存空間密碼。"</string>
-    <string name="cstor_password_error" msgid="2917326097260402464">"請輸入正確的密碼。"</string>
-    <string name="cstor_password_error_reset_warning" msgid="3336370539045905953">"請輸入正確的密碼。您還有 1 次輸入密碼的機會，如果輸入錯誤，認證儲存空間將遭到清除。"</string>
-    <string name="cstor_password_error_reset_warning_plural" msgid="6209069679269017200">"請輸入正確的密碼。您還有 %d 次輸入密碼的機會，如果輸入錯誤，認證儲存空間將遭到清除。"</string>
-    <string name="cstor_passwords_error" msgid="956773958408751155">"密碼不符。"</string>
-    <string name="cstor_passwords_empty_error" msgid="6062539742626760734">"請輸入一個密碼，並確認未輸錯。"</string>
-    <string name="cstor_password_empty_error" msgid="7249632576906961482">"請輸入密碼。"</string>
-    <string name="cstor_password_verification_error" msgid="8553930704493511389">"請再次輸入密碼，密碼必須包含至少 8 個字元，且不得包含空格。"</string>
-    <string name="cstor_name_empty_error" msgid="7499971191993770322">"請輸入名稱。"</string>
-    <string name="cstor_name_char_error" msgid="8048089317968192516">"請輸入名稱 (只能包含英數字元)。"</string>
-    <string name="cstor_storage_error" msgid="7140697503172458161">"無法儲存憑證，如要重試，請按一下 [確定]。"</string>
-    <string name="cstor_unable_to_save_cert" msgid="1631402544447196406">"無法儲存憑證，未啟用或未正確初始化認證儲存空間。"</string>
-    <string name="cstor_cert_not_saved" msgid="6318149789449538491">"未儲存憑證。"</string>
-    <string name="cstor_is_reset" msgid="449870501126790589">"已清除認證儲存空間內容。"</string>
-    <string name="cstor_is_enabled" msgid="4054049098081482785">"已啟用認證儲存空間。"</string>
-    <string name="cstor_is_added" msgid="794788474010251572">"已新增%s。"</string>
+    <string name="credentials_category" msgid="8536992056377271234">"認證儲存空間"</string>
+    <string name="credentials_access" msgid="4843187230913860492">"使用安全認證"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"允許應用程式存取安全認證及其他認證"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"輸入密碼"</string>
+    <string name="credentials_unlock_hint" msgid="594679530407918031">"輸入認證儲存空間密碼。"</string>
+    <string name="credentials_install_certificates" msgid="177337517568022236">"從 SD 卡安裝"</string>
+    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"從 SD 卡安裝加密憑證"</string>
+    <string name="credentials_set_password" msgid="9104473585811899989">"設定密碼"</string>
+    <string name="credentials_set_password_summary" msgid="8287876917562085701">"設定或變更認證儲存空間密碼"</string>
+    <string name="credentials_reset" msgid="9170150870552453457">"清除儲存空間"</string>
+    <string name="credentials_reset_summary" msgid="1530388094693731636">"清除認證儲存空間的所有內容，並重新設定密碼"</string>
+    <string name="credentials_reset_hint" msgid="819990295796804516">"確定要刪除所有認證，並重新設定認證儲存空間密碼嗎？"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"目前的密碼："</string>
+    <string name="credentials_new_password" msgid="267487774686796938">"新密碼："</string>
+    <string name="credentials_confirm_password" msgid="4732250000633424345">"確認新密碼："</string>
+    <string name="credentials_first_time_hint" msgid="1567821077545346039">"設定認證儲存空間密碼 (最少 8 個字元)。"</string>
+    <string name="credentials_wrong_password" msgid="7525192410790152041">"請輸入正確的密碼。"</string>
+    <string name="credentials_reset_warning" msgid="6392481296673345268">"請輸入正確的密碼。您還有 1 次輸入密碼的機會，如果輸入錯誤，認證儲存空間將遭到清除。"</string>
+    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"請輸入正確的密碼。您還有 <xliff:g id="NUMBER">%1$d</xliff:g> 次輸入密碼的機會，如果輸入錯誤，認證儲存空間將遭到清除。"</string>
+    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"密碼不符。"</string>
+    <string name="credentials_passwords_empty" msgid="8647631321684363549">"請輸入您的密碼，並加以確認。"</string>
+    <string name="credentials_password_empty" msgid="8292138152983330473">"請輸入密碼。"</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"密碼最少必須包含 8 個字元。"</string>
+    <string name="credentials_erased" msgid="7700309135582200849">"已清除認證儲存空間內容。"</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"已啟用認證儲存空間。"</string>
+    <string name="credentials_disabled" msgid="7453188089059045380">"已停用認證儲存空間。"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"緊急警示音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"設定撥打緊急電話時的運作方式"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"隱私設定"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"隱私設定"</string>
+    <string name="location_section_title" msgid="6072558684044939786">"位置"</string>
+    <string name="settings_section_title" msgid="7413252428447723032">"設定"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"個人資料"</string>
+    <string name="backup_settings_title" msgid="2968262658155327829">"備份我的設定"</string>
+    <string name="backup_erase_dialog_title" msgid="6028429904055779443">"設定備份"</string>
+    <string name="backup_erase_dialog_message" msgid="9096433810456900531">"您確定要停止備份設定，並清除 Google 伺服器上的所有設定資料嗎？"</string>
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
+    <skip />
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 6ec90ca5f56..2981b1245e4 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -48,6 +48,30 @@
         <item>yyyy-MM-dd</item>
     </string-array>
 
+    <!-- Display settings.  The type of animations to show. -->
+    <string-array name="animations_entries">
+        <item>No animations</item>
+        <item>Some animations</item>
+        <item>All animations</item>
+    </string-array>
+
+    <!-- Display settings.  Summary for each type of animation. -->
+    <string-array name="animations_summaries">
+        <item>No window animations are shown</item>
+        <item>Some window animations are shown</item>
+        <item>All window animations are shown</item>
+    </string-array>
+
+    <!-- Do not translate. -->
+    <string-array name="animations_values">
+        <!-- Do not translate. -->
+        <item>00</item>
+        <!-- Do not translate. -->
+        <item>01</item>
+        <!-- Do not translate. -->
+        <item>11</item>
+    </string-array>
+
     <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown ain a list dialog. -->
     <string-array name="screen_timeout_entries">
         <item>15 seconds</item>
@@ -55,12 +79,11 @@
         <item>1 minute</item>
         <item>2 minutes</item>
         <item>10 minutes</item>
-        <!-- Choosing this means the screen will only turn off after the user manually does so.  There will be no inactivity check. -->
-        <item>Never timeout</item>
+        <item>30 minutes</item>
     </string-array>
 
     <!-- Do not translate. -->
-    <string-array name="screen_timeout_values">
+    <string-array name="screen_timeout_values" translatable="false">
         <!-- Do not translate. -->
         <item>15000</item>
         <!-- Do not translate. -->
@@ -72,7 +95,7 @@
         <!-- Do not translate. -->
         <item>600000</item>
         <!-- Do not translate. -->
-        <item>-1</item>
+        <item>1800000</item>
     </string-array>
 
     <!-- TTS settings -->
@@ -129,6 +152,15 @@
         <item>ita-ITA</item>
         <item>spa-ESP</item>
     </string-array>
+    <!-- Do not translate. -->
+    <string-array name="tts_demo_strings">
+        <item>This is an example of speech synthesis in English.</item>
+        <item>This is an example of speech synthesis in English.</item>
+        <item>Voici un échantillon de synthèse vocale en français.</item>
+        <item>Dies ist ein Beispiel für Sprachsynthese in Deutsch.</item>
+        <item>Questo è un esempio di sintesi vocale in italiano.</item>
+        <item>Este es un ejemplo de síntesis de voz en español.</item>
+    </string-array>
 
     <!-- Wi-Fi settings -->
 
@@ -142,13 +174,9 @@
         <!-- Do not translate. The Wi-Fi network has WEP security. -->
         <item>WEP</item>
         <!-- The Wi-Fi network has WPA personal security. WPA Personal is a tech term, and might be better left untranslated? -->
-        <item>WPA personal</item>
-        <!-- The Wi-Fi network has WPA2 personal security. WPA Personal is a tech term, and might be better left untranslated? -->
-        <item>WPA2 personal</item>
+        <item>WPA/WPA2 PSK</item>
         <!-- The Wi-Fi network has WPA EAP extensible authentication protocol. -->
-        <item>WPA-EAP</item>
-        <!-- IEEE 802.1X key management -->
-        <item>IEEE 802.1x</item>
+        <item>802.1x Enterprise</item>
     </string-array>
 
     <!-- Match this with code. --> <skip />
@@ -159,14 +187,9 @@
         <!-- Do not translate. The Wi-Fi network has WEP security. -->
         <item>WEP</item>
         <!-- The Wi-Fi network has WPA personal security. WPA Personal is a tech term, and might be better left untranslated? -->
-        <item>WPA personal</item>
-        <!-- The Wi-Fi network has WPA2 personal security. WPA Personal is a tech term, and might be better left untranslated? -->
-        <item>WPA2 personal</item>
+        <item>WPA/WPA2 PSK</item>
         <!-- The Wi-Fi network has WPA enterprise security. WPA Enterprise is a tech term, and might be better left untranslated? -->
-        <!-- The Wi-Fi network has WPA EAP extensible authentication protocol. -->
-        <item>WPA-EAP</item>
-        <!-- IEEE 802.1X key management -->
-        <item>IEEE 802.1x</item>
+        <item>802.1x Enterprise</item>
     </string-array>
 
     <!-- Match this with code. --> <skip />
@@ -237,7 +260,7 @@
         <item>None</item>
         <item>PAP</item>
         <item>MSCHAP</item>
-        <item>MSCHAP2</item>
+        <item>MSCHAPV2</item>
         <item>GTC</item>
     </string-array>
 
@@ -264,8 +287,27 @@
     </string-array>
 
     <string-array translatable="false" name="special_locale_names">
-        <item>中文（简体）</item>
+        <item>中文 (简体)</item>
         <item>中文 (繁體)</item>
     </string-array>
 
+    <!-- Authentication Types used in APN editor -->
+    <string-array name="apn_auth_entries">
+        <item>None</item>
+        <item>PAP</item>
+        <item>CHAP</item>
+        <item>PAP or CHAP</item>
+    </string-array>
+
+    <string-array translatable="false" name="apn_auth_values">
+        <!-- Do not translate. -->
+        <item>0</item>
+        <!-- Do not translate. -->
+        <item>1</item>
+        <!-- Do not translate. -->
+        <item>2</item>
+        <!-- Do not translate. -->
+        <item>3</item>
+    </string-array>
+
 </resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 9bf79f9c0c5..0a2c5c52e9e 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -18,4 +18,7 @@
     <declare-styleable name="WifiEncryptionState">
         <attr name="state_encrypted" format="boolean" />
     </declare-styleable>
+    <declare-styleable name="IconPreferenceScreen">
+        <attr name="icon" format="reference" />
+    </declare-styleable>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 9626837f0f4..80a4a376d01 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -18,7 +18,4 @@
     <dimen name="vpn_connect_margin_right">10sp</dimen>
     <dimen name="vpn_connect_normal_text_size">16sp</dimen>
     <dimen name="vpn_connect_input_box_label_width">90sp</dimen>
-
-    <dimen name="appwidget_width">311dip</dimen>
-    <dimen name="appwidget_height">80dip</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8d8b226f52b..23d1767cc63 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -15,6 +15,11 @@
 -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Strings for Dialog yes button -->
+    <string name="yes">"Yes"</string>
+
+    <!-- Strings for Dialog no button -->
+    <string name="no">"No"</string>
 
     <!-- Device Info --> <skip />
     <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
@@ -117,6 +122,8 @@
     <!-- 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 -->
+    <string name="battery_info_power_label">Power plug:</string>
+    <!-- Battery Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="battery_info_scale_label">Battery scale:</string>
     <!-- Battery Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="battery_info_level_label">Battery level:</string>
@@ -157,6 +164,13 @@
     <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="battery_info_status_full">Full</string>
 
+    <!-- Battery Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="battery_info_power_unplugged">Unplugged</string>
+    <string name="battery_info_power_ac">AC</string>
+    <string name="battery_info_power_usb">USB</string>
+    <string name="battery_info_power_ac_usb">AC+USB</string>
+    <string name="battery_info_power_unknown">Unknown</string>
+    
     <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="battery_info_health_unknown">Unknown</string>
     <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -174,7 +188,7 @@
     <string name="bluetooth">Bluetooth</string>
     <!-- Bluetooth settings screen, check box label when the Bluetooth device can be seen by others -->
     <string name="bluetooth_visibility">Discoverable</string>
-    <!-- Bluetooth settings screen,  summary after selecting Discoverable check box -->
+    <!-- Bluetooth settings screen, summary after selecting Discoverable check box -->
     <string name="bluetooth_is_discoverable">Discoverable for <xliff:g id="discoverable_time_period">%1$s</xliff:g> seconds\u2026</string>
     <!-- Bluetooth settings screen, Discoverable checkbox summary text -->
     <string name="bluetooth_not_discoverable">Make device discoverable</string>
@@ -215,6 +229,23 @@
     <!-- Notification message when a Bluetooth device wants to pair with us -->
     <string name="bluetooth_notif_message">Select to pair with\u0020</string>
 
+    <!-- Strings for BluetoothDevicePicker -->
+    <string name="device_picker">Bluetooth device picker</string>
+
+    <!-- Strings for dialog title when asking to the user whether to allow an app to enable discovery mode -->
+    <string name="bluetooth_permission_request">"Bluetooth permission request"</string>
+
+    <!-- Strings for asking to the user whether to allow an app to enable bluetooth -->
+    <string name="bluetooth_ask_enablement">"An application on your phone is requesting permission to turn on Bluetooth. Do you want to do this?"</string>
+
+    <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
+    <string name="bluetooth_ask_discovery">"An application on your phone is requesting permission to make your phone discoverable by other Bluetooth devices for <xliff:g id="timeout">%1$d</xliff:g> seconds. Do you want to do this?"</string>
+
+    <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+    <string name="bluetooth_ask_enablement_and_discovery">"An application on your phone is requesting permission to turn on Bluetooth and to make your phone discoverable by other devices for <xliff:g id="timeout">%1$d</xliff:g> seconds. Do you want to do this?"</string>
+
+    <!-- Strings for msg to display to user while bluetooth is turning on -->
+    <string name="bluetooth_turning_on">"Turning on Bluetooth\u2026"</string>
 
     <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
     <string name="bluetooth_scan_text">Empty button\u2026</string>
@@ -435,7 +466,9 @@
     <!-- Wireless controls settings screen, setting option summary text as airplane mode is being disabled (so it is re-enabling all the wireless conenctions) -->
     <string name="airplane_mode_turning_off">Enabling wireless connections\u2026</string>
     <!-- Main Settings screen settings title for things like Wi-Fi, bluetooth, airplane mode.  This will take you to another screen with those settings. -->
-    <string name="radio_controls_title">Wireless controls</string>
+    <string name="radio_controls_title">Wireless &amp; networks</string>
+    <!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. -->
+    <string name="wireless_networks_settings_title">Wireless &amp; network settings</string>
     <!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
     <string name="radio_controls_summary">Manage Wi-Fi, Bluetooth, airplane mode, mobile networks, &amp; VPNs</string>
 
@@ -486,9 +519,13 @@
     <string name="zone_list_menu_sort_by_timezone">Sort by time zone</string>
 
     <!-- Main Settings screen setting option title for the item to take you the security and location screen -->
-    <string name="security_settings_title">Security &amp; location</string>
+    <string name="security_settings_title">Location &amp; security</string>
+    <!-- Location & security settings screen title -->
+    <string name="location_security_settings_title">Location &amp; security settings</string>
     <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
     <string name="security_settings_summary">Set My Location, screen unlock, SIM card lock, credential storage lock</string>
+    <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
+    <string name="cdma_security_settings_summary">Set My Location, screen unlock, credential storage lock</string>
     <!-- In the security screen, the header title for settings related to  Passwords-->
     <string name="security_passwords_title">Passwords</string>
 
@@ -505,18 +542,33 @@
     <string name="bluetooth_settings_summary">Manage connections, set device name &amp; discoverability</string>
 
     <!-- Title for the dialog to enter PIN.  -->
-    <string name="bluetooth_pin_entry">Bluetooth pairing request</string>
+    <string name="bluetooth_pairing_request">Bluetooth pairing request</string>
     <!-- Title for the bluetooth device info screen. -->
     <string name="bluetooth_device_info">Bluetooth device info</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>
+    <!-- Message when bluetooth dialog for pin entry is showing -->
+    <string name="bluetooth_enter_pin_msg">\nType PIN to pair with \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022. (Try 0000 or 1234.)</string>
+    <!-- Message when bluetooth dialog for passkey entry is showing -->
+    <string name="bluetooth_enter_passkey_msg">\nType passkey to pair with \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022.</string>
+    <!-- Message when bluetooth dialog for confirmation of passkey is showing -->
+    <string name="bluetooth_confirm_passkey_msg">To pair with \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022, confirm that it is showing the passkey: <xliff:g id="passkey">%2$s</xliff:g>.</string>
+    <!-- Message when bluetooth incoming pairing request for (2.1 devices) dialog is showing -->
+    <string name="bluetooth_incoming_pairing_msg"><xliff:g id="device_name">%1$s</xliff:g>\nwants to pair.</string>
+    <!-- Message when bluetooth dialog when passkey needs to be displayed. -->
+    <string name="bluetooth_display_passkey_msg">Enter <xliff:g id="passkey">%2$s</xliff:g> on \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022 to pair. </string>
+    <!-- Button text for accepting an incoming pairing request -->
+    <string name="bluetooth_pairing_accept">Pair</string>
+    <!-- Button text for declining an incoming pairing request -->
+    <string name="bluetooth_pairing_decline">Don\u0027t Pair</string>
+    <!-- Generic string for remote Bluetooth device  -->
+    <string name="bluetooth_remote_device">bluetooth device</string>
 
     <!-- Title for BT error dialogs. -->
     <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> 
-    <!-- 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 pairing fails because the PIN /
+    Passkey 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 PIN or Passkey is incorrect.</string>
     <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
     <string name="bluetooth_pairing_device_down_error_message">Cannot establish communication with <xliff:g id="device_name">%1$s</xliff:g>.</string>
     <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
@@ -557,6 +609,8 @@
     <string name="bluetooth_profile_a2dp">Media</string>
     <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
     <string name="bluetooth_profile_headset">Phone</string>
+    <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+    <string name="bluetooth_profile_opp">Transfer</string>
 
     <!-- Bluetooth settings.  The summary string when a device is connected to the A2DP profile. -->
     <string name="bluetooth_summary_connected_to_a2dp">Connected to media audio</string>
@@ -577,11 +631,17 @@
     <string name="bluetooth_a2dp_profile_summary_connected">Connected to media audio</string>
     <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
     <string name="bluetooth_headset_profile_summary_connected">Connected to phone audio</string>
+    <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+    <string name="bluetooth_opp_profile_summary_connected">Connected to file transfer server</string>
+    <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+    <string name="bluetooth_opp_profile_summary_not_connected">Not connected to file transfer server</string>
 
     <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
     <string name="bluetooth_a2dp_profile_summary_use_for">Use for media audio</string>
     <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
     <string name="bluetooth_headset_profile_summary_use_for">Use for phone audio</string>
+    <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+    <string name="bluetooth_opp_profile_summary_use_for">Use for file transfer</string>
 
     <!-- Wi-Fi settings -->
     <!-- Used in the 2nd-level settings screen to turn on Wi-Fi -->
@@ -617,13 +677,10 @@
     <!-- Value for the wifi security -->
     <string name="wifi_security_wep">WEP</string>
     <!-- Value for the wifi security -->
-    <string name="wifi_security_wpa">WPA</string>
+    <string name="wifi_security_psk">WPA/WPA2 PSK</string>
     <!-- Value for the wifi security -->
-    <string name="wifi_security_wpa2">WPA2</string>
+    <string name="wifi_security_eap">Enterprise(802.1x)</string>
     <!-- Value for the wifi security -->
-    <string name="wifi_security_wpa_eap">WPA-EAP</string>
-    <!-- Value for the wifi security -->
-    <string name="wifi_security_ieee8021x">IEEE8021X</string>
 
     <!-- Value for the wifi security when it is unknown -->
     <string name="wifi_security_unknown">Unknown</string>
@@ -632,14 +689,10 @@
     <!-- Verbose security type of a wifi network.  Capitalized by app. -->
     <string name="wifi_security_verbose_wep">secured with WEP</string>
     <!-- Verbose security type of a wifi network.  Capitalized by app. -->
-    <string name="wifi_security_verbose_wpa">secured with WPA</string>
+    <string name="wifi_security_verbose_psk">secured with WPA/WPA2 PSK</string>
     <!-- Verbose security type of a wifi network.  Capitalized by app. -->
-    <string name="wifi_security_verbose_wpa2">secured with WPA2</string>
-    <!-- Verbose security type of a wifi network.  Capitalized by app. -->
-    <string name="wifi_security_verbose_wpa_eap">secured with WPA-EAP</string>
-    <!-- Verbose security type of a wifi network.  Capitalized by app. -->
-    <string name="wifi_security_verbose_ieee8021x">secured with IEEE 802.1x</string>
-    <!-- Wi-Fi IP addrress label -->    
+    <string name="wifi_security_verbose_eap">secured with 802.1x EAP</string>
+    <!-- Wi-Fi IP addrress label -->
     <string name="ip_address">IP address</string>
     <!-- Label for the signal strength -->
     <string name="signal">Signal strength</string>
@@ -675,8 +728,6 @@
     <string name="please_select_client_certificate">Client certificate</string>
     <!-- Caption for the ca certificate -->
     <string name="please_select_ca_certificate">CA certificate</string>
-    <!-- Caption for the Private Key -->
-    <string name="please_type_private_key_passwd">Private key password</string>
     <!-- Caption for the wireless password -->
     <string name="please_type_passphrase">Wireless password</string>
     <!--Wi-Fi settings screen, connect to network dialog box, field label and hint text -->
@@ -690,7 +741,7 @@
     <!-- Wifi network summary when the network is configured previously, capitalized by app -->
     <string name="summary_remembered">remembered</string>
     <!-- Wifi network summary when there was an error connecting -->
-    <string name="summary_connection_failed">Connection unsuccessful, select to try again</string>
+    <string name="summary_connection_failed">Connection unsuccessful, touch to try again</string>
     <!-- Header for the list of wifi networks-->
     <string name="wifi_access_points">Wi-Fi networks</string>
     <!-- Caption for entering the SSID of a wifi network -->
@@ -798,6 +849,8 @@
     <!-- Sound and alerts settings -->
     <!-- Main Settings screen setting option name to go into the sound and display settings screen -->
     <string name="sound_and_display_settings">Sound &amp; display</string>
+    <!-- Main Settings screen setting option name to go into the sound and display settings screen -->
+    <string name="sound_and_display_settings_title">Sound &amp; display settings</string>
     <!-- Sound settings screen heading -->
     <string name="sound_settings">Sound settings</string>
     <!-- Main Settings screen setting option summary text for the item to go into the soudn and display settings screen-->
@@ -850,16 +903,26 @@
     <!-- 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="haptic_feedback_enable_title">Haptic feedback</string>
+    <!-- Sound settings screen, setting option summary text when check box is selected -->
+    <string name="haptic_feedback_enable_summary_on">Vibrate when pressing soft keys and on certain UI interactions</string>
+    <!-- Sound settings screen, setting option summary text when check box is clear -->
+    <string name="haptic_feedback_enable_summary_off">Vibrate when pressing soft keys and on certain UI interactions</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">Play sound for SD card notifications</string>
     <!-- Sound settings screen, setting option summary text when check box is clear -->
     <string name="play_media_notification_sounds_enable_summary_off">Play sound for SD card notifications</string>
+    <!-- Sound settings screen, setting option name checkbox to enable/disable audio recording features that improve audio recording in noisy environments -->
+    <string name="audio_record_proc_title">Noise cancellation</string>
+    <!-- Sound settings screen, setting option summary text -->
+    <string name="audio_record_proc_summary">Suppress background noise when speaking or recording.</string>
 
-    <!-- Main Settings screen setting option name to go into the screen for data sync settings-->
-    <string name="sync_settings">Data synchronization</string>
+    <!-- Acounts & Sync settings screen setting option name to go into the screen for data sync settings-->
+    <string name="sync_settings">Accounts &amp; sync</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>
+    <string name="sync_settings_summary">Add or remove accounts and change account settings</string>
 
     <!-- Main Settings screen, setting option name to go into search settings -->
     <string name="search_settings">Search</string>
@@ -889,6 +952,8 @@
     <string name="screen_timeout">Screen timeout</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>
+    <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
+    <string name="automatic_brightness">Automatic brightness</string>
 
     <!-- SIM lock settings title -->
     <string name="sim_lock_settings">SIM card lock settings</string>
@@ -960,7 +1025,9 @@
     <!-- About phone screen, summary of the item to go into the phone status screen -->
     <string name="device_status_summary">Phone number, signal, etc.</string>
     <!-- Main settings screen item's title to go into the SD card and storage settings screen-->
-    <string name="storage_settings_title">SD card &amp; phone storage</string>
+    <string name="storage_settings">SD card &amp; phone storage</string>
+    <!-- SD card and storage settings screen title -->
+    <string name="storage_settings_title">SD card &amp; phone storage settings</string>
     <!-- Main settings screen item's summary for the SD card and storage settings -->
     <string name="storage_settings_summary">Unmount SD card, view available storage</string>
     <!-- Do not translate. About phone, status item title -->
@@ -1053,6 +1120,16 @@
     <string name="apn_mcc">MCC</string>
     <!-- Edit access point labels: -->
     <string name="apn_mnc">MNC</string>
+    <!-- Edit acces  point labels: Authenticaton type-->
+    <string name="apn_auth_type">Authentication type</string>
+    <!-- Authentication Typs: None -->
+    <string name="apn_auth_type_none">None</string>
+    <!-- Authentication Typs: PAP -->
+    <string name="apn_auth_type_pap">PAP</string>
+    <!-- Authentication Typs: CHAP -->
+    <string name="apn_auth_type_chap">CHAP</string>
+    <!-- Authentication Typs: PAP or CHAP -->
+    <string name="apn_auth_type_pap_chap">PAP or CHAP</string>
     <!-- Edit access point labels: The type of APN -->
     <string name="apn_type">APN type</string>
     <!-- Edit access point screen menu option to delete this APN -->
@@ -1137,17 +1214,23 @@
     <!-- Security & location settings screen, setting summary when Use wireless networks check box is selected -->
     <string name="location_neighborhood_level">Location determined by Wi-Fi and/or mobile networks</string>
     <!-- Security & location settings screen, setting check box label if the GPS receiver should be enabled -->
-    <string name="location_gps">Enable GPS satellites</string>
-    <!-- Security & location settings screen, setting summary when Enable GPS satellites check box is selected -->
-    <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">Use GPS satellites</string>
+    <!-- Security & location settings screen, setting summary when Use GPS satellites check box is selected -->
+    <string name="location_street_level">When locating, accurate to street level (uncheck to conserve battery)</string>
+    <!-- Security & location settings screen, setting summary when Use GPS satellites check box is clear -->
     <string name="location_gps_disabled">Locate to street-level (requires more battery plus view of sky)</string>
+    <!-- Security & location settings screen, setting check box label if Assisted GPS should be enabled -->
+    <string name="assisted_gps">Use assisted GPS</string>
+    <!-- Security & location settings screen, setting summary when Assisted GPS check box is selected -->
+    <string name="assisted_gps_enabled">Use server to assist GPS (uncheck to reduce network usage)</string>
+    <!-- Security & location settings screen, setting summary when Assisted GPS check box is clear -->
+    <string name="assisted_gps_disabled">Use server to assist GPS (uncheck to improve GPS performance)</string>
     <!-- Setting title for allow sending location to google -->
-    <string name="use_location_title">Share with Google</string>
-    <!-- Title of dialog to user requesting use of location information to improve services -->
-    <string name="use_location_summary">Allow Google to use location for improved search and other services</string>
+    <string name="use_location_title">Use My Location</string>
+    <!-- Setting summary for allowing Google to use location information for improved search results. -->
+    <string name="use_location_summary">Use My Location for Google search results and other Google services</string>
     <!-- Message of dialog to user requesting use of location information -->
-    <string name="use_location_warning_message">Allow Google to use location for improved search results and other services</string>
+    <string name="use_location_warning_message">Do you want to allow Google to use location for improved search results and other services?</string>
     <!-- Agree -->
     <string name="agree">Agree</string>
     <!-- Disagree -->
@@ -1185,6 +1268,15 @@
     <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
     <string name="settings_license_activity_loading">Loading\u2026</string>
 
+    <!-- About phone settings, Safety Legal information setting option name and title of dialog box holding safety legal info -->
+    <string name="settings_safetylegal_title">Safety information</string>
+    <!-- About phone settings, Safety Legal information setting option name and title of dialog box holding safety legal info -->
+    <string name="settings_safetylegal_activity_title">Safety information</string>
+    <!-- About phone settings screen, Safety legal dialog message when data network is not connected -->
+    <string name="settings_safetylegal_activity_unreachable">Your phone is not connected to a data service. To view this information now, go to %s from any computer connected to the Internet.</string>
+    <!-- About phone settings screen, Safety Legal dialog title until the link is fully loaded -->
+    <string name="settings_safetylegal_activity_loading">Loading\u2026</string>
+
     <!-- Lock Pattern settings -->
     <!-- Security & location settings screen, header -->
     <string name="lock_settings_title">Screen unlock pattern</string>
@@ -1252,8 +1344,8 @@
         \n<font height="17">\n</font><b>1</b>\u00A0 On the next screen, watch while an example pattern is drawn.
         \n<font height="17">\n</font><b>2</b>\u00A0 When ready, draw your own personal unlock pattern. Experiment with different patterns but connect at least four dots.
         \n<font height="17">\n</font><b>3</b>\u00A0 Redraw your pattern to confirm.
-        \n<font height="17">\n</font><b>Ready to start? Select \u201CNext\u201D</b>.
-        \n<font height="3">\n</font>To leave your phone unprotected, select \u201CCancel\u201D.</font>
+        \n<font height="17">\n</font><b>Ready to start? Touch \u201CNext\u201D</b>.
+        \n<font height="3">\n</font>To leave your phone unprotected, touch \u201CCancel\u201D.</font>
     </string>    
         
     <!-- ChooseLockPatternExample --> <skip />
@@ -1261,7 +1353,7 @@
     <string name="lock_example_title">Example pattern</string>
     <!-- ChooseLockPatternExample, screen hint text at bottom of screen. These are instructions and rules for drawing a good patttern -->
     <string name="lock_example_message">Connect at least four dots.\n
-        \nSelect \u201CNext\u201D when you\u2019re ready to draw your own pattern.
+        \nTouch \u201CNext\u201D when you\u2019re ready to draw your own pattern.
     </string>
 
     <!-- Applications Settings --> <skip />
@@ -1337,7 +1429,7 @@
     <string name="filter_apps_all">All</string>
     <!-- Text for filter option in ManageApps screen to display third party 
     applications only -->
-    <string name="filter_apps_third_party">Third-party</string>
+    <string name="filter_apps_third_party">Downloaded</string>
     <!-- Text for filter option in ManageApps screen to display list of running
     packages only. -->
     <string name="filter_apps_running">Running</string>
@@ -1347,7 +1439,7 @@
     <!-- Manage applications, individual application screen, confirmation dialog title. Displays when user selects to "Clear data". -->
     <string name="clear_data_dlg_title">Delete</string>
     <!-- Manage applications, individual application screen, confirmation dialog message. Displays when user selects to "Clear data". It warns the user of the consequences of clearing the data for an app. -->
-    <string name="clear_data_dlg_text">All information you\'ve saved in this application will be deleted permanently.</string>
+    <string name="clear_data_dlg_text">All of this application\'s data will be deleted permanently. This includes all files, settings, accounts, databases and so on.</string>
     <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
     <string name="dlg_ok">OK</string>
     <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
@@ -1372,13 +1464,45 @@ found in the list of installed applications.</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>
+    <string name="empty_list_msg">You do not have any third-party applications installed.</string>
     <!-- Manage applications, version string displayed in app snippet -->
     <string name="version_text">version <xliff:g id="version_num">%1$s</xliff:g></string>
 
+    <!-- Services settings screen, setting option name for the user to go to the screen to view running services -->
+    <string name="runningservices_settings_title">Running services</string>
+    <!-- Services settings screen, setting option summary for the user to go to the screen to view running services  -->
+    <string name="runningservices_settings_summary">View and control currently running services</string>
+    <!-- Label for a service item when it is restarting -->
+    <string name="service_restarting">Restarting</string>
+    <!-- Running services, body text when there are no services to show -->
+    <string name="no_running_services">No running services</string>
+    <!-- Running services, title of dialog to stop a service -->
+    <string name="confirm_stop_service">Stop service?</string>
+    <!-- Running services, message of dialog to stop a service -->
+    <string name="confirm_stop_service_msg">The service will no longer run until
+            started again.  This may have undesireable
+            consequences on the applicaton
+            <xliff:g id="application">%1$s</xliff:g>.</string>
+    <!-- Running services, button to stop a service -->
+    <string name="confirm_stop_stop">Stop</string>
+    <!-- Running services, button to cancel stopping of a service -->
+    <string name="confirm_stop_cancel">Cancel</string>
+    <!-- Running services, description for a service in the started state -->
+    <string name="service_started_by_app">Started by application: touch to stop</string>
+    <!-- Running services, description for a service in the started state -->
+    <string name="service_client_name"><xliff:g id="client_name">%1$s</xliff:g>: touch to manage</string>
+    <!-- Running services, summary of background processes -->
+    <string name="service_background_processes">Avail: <xliff:g id="free">%2$s</xliff:g>+<xliff:g id="memory">%3$s</xliff:g> in <xliff:g id="count">%1$d</xliff:g></string>
+    <!-- Running services, summary of foreground processes -->
+    <string name="service_foreground_processes">Other: <xliff:g id="memory">%2$s</xliff:g> in <xliff:g id="count">%1$d</xliff:g></string>
+    <!-- Text to label a process entry with the process name. -->
+    <string name="service_process_name">Process: <xliff:g id="process">%1$s</xliff:g></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 -->
-    <string name="language_settings">Locale &amp; text</string>
+    <string name="language_settings">Language &amp; keyboard</string>
+    <!-- Title of Language and keyboard settings screen -->
+    <string name="language_keyboard_settings_title">Language &amp; keyboard settings</string>
     <!-- Summary of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
     <string name="language_settings_summary">Set locale (language and region), text input and auto-correction options</string>
     <!-- On Text & language settings screen, heading. Inside the "Locale & text" screen, this is the header for settings that are for locale changes. -->
@@ -1413,7 +1537,7 @@ found in the list of installed applications.</string>
     all the text you type, including personal data like passwords and credit
     card numbers.  It comes from the application
     <xliff:g id="ime_application_name">%1$s</xliff:g>.
-    Enable this input method?</string>
+    Use this input method?</string>
     
     <!-- User dictionary settings --><skip />
     <!-- User dictionary settings, The titlebar text of the User dictionary settings screen. -->
@@ -1475,7 +1599,7 @@ found in the list of installed applications.</string>
     <!-- Input Methods Settings localized format string for generating the appropriate "Foo settings" menu label for the Input Method named "Foo" -->
     <string name="input_methods_settings_label_format"><xliff:g id="ime_name">%1$s</xliff:g> settings</string>
     <!-- Summary for on-screen keyboard settings -->
-    <string name="onscreen_keyboard_settings_summary">On-screen keyboard settings</string>
+    <string name="onscreen_keyboard_settings_summary">Onscreen keyboard settings</string>
     <!-- Title for built-in keyboard settings -->
     <string name="builtin_keyboard_settings_title">Device keyboard</string>
     <!-- Summary for built-in keyboard settings -->
@@ -1498,7 +1622,7 @@ 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>
     <!-- Title of warning dialog about the implications of enabling USB debugging -->
-    <string name="adb_warning_title">Enable USB debugging?</string>
+    <string name="adb_warning_title">Allow USB debugging?</string>
     <!-- Warning text to user about the implications of enabling USB debugging -->
     <string name="adb_warning_message">USB debugging is intended for development purposes only. It can be used to copy data between your computer and your device, install applications on your device without notification, and read log data.</string>
 
@@ -1506,13 +1630,14 @@ found in the list of installed applications.</string>
          (or other screens that can host gadgets).  Note to translators: we're still determining
          the final name for Gadgets/Widgets, so please translate both for now. -->
     <string name="gadget_picker_title">Choose gadget</string>
+    
     <!-- Title for the screen that lets the user choose a widget to add to the home screen
          (or other screens that can host widgets).  Note to translators: we're still determining
          the final name for Gadgets/Widgets, so please translate both for now. -->
     <string name="widget_picker_title">Choose widget</string>
 
     <!-- Used to display "Details for UID 1234" in BatteryHistory -->
-    <string name="battery_history_details_for">Details for UID %d</string>
+    <string name="battery_history_details_for">Details for UID <xliff:g id="number" example="1234">%d</xliff:g></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>
@@ -1618,8 +1743,10 @@ found in the list of installed applications.</string>
     <!-- Accessibility settings -->
     <skip/>
 
-    <!-- Settings title for accessibility settings -->
-    <string name="accessibility_settings_title">Accessibility</string>
+    <!-- Settings title in main settings screen for accessibility settings -->
+    <string name="accessibility_settings">Accessibility</string>
+    <!-- Settings title for accessibility settings screen -->
+    <string name="accessibility_settings_title">Accessibility settings</string>
     <!-- Settings summary for accessibility settings -->
     <string name="accessibility_settings_summary">Manage accessibility options</string>
     <!-- Setting Checkbox title for enabling accessibility -->
@@ -1633,7 +1760,7 @@ found in the list of installed applications.</string>
     <string name="accessibility_service_security_warning">This accessibility service may be able to collect
         all the text you type, including personal data credit card numbers except passwords.
         It may also log your user interface interactions. It comes from the application
-        <xliff:g id="accessibility_service_name">%1$s</xliff:g>. Enable this accessibility service?</string>
+        <xliff:g id="accessibility_service_name">%1$s</xliff:g>. Use this accessibility service?</string>
     <!-- Warning about disabling accessibility displayed as a dialog message when the user
          selects to disable accessibility. This avoids accidental disabling. -->
     <string name="accessibility_service_disable_warning">Disable accessibility?</string>
@@ -1661,7 +1788,7 @@ found in the list of installed applications.</string>
     <string name="bluetooth_on_time">WiFi on time</string>
     <!-- Application name and battery usage percentage -->
     <string name="usage_name_percent"><xliff:g id="name">%1$s</xliff:g>" - "
-            <xliff:g id="percent">%2$s</xliff:g>"%%"</string>
+            <xliff:g id="number" example="30">%2$s</xliff:g><xliff:g id="percent" example="%">%%</xliff:g></string>
 
     <!-- Activity title for battery usage details for an app. or power consumer -->
     <string name="details_title">Battery use details</string>
@@ -1742,7 +1869,7 @@ found in the list of installed applications.</string>
     <!-- Description for bluetooth power consumption detail -->
     <string name="battery_desc_bluetooth">Battery used by bluetooth</string>
     <!-- Suggestion for bluetooth -->
-    <string name="battery_sugg_bluetooth_basic">Turn off bluetooth when you aren't using it</string>
+    <string name="battery_sugg_bluetooth_basic">Turn off bluetooth when you aren\'t using it</string>
     <!-- Suggestion for bluetooth headset -->
     <string name="battery_sugg_bluetooth_headset">Try connecting to a different bluetooth device</string>
 
@@ -1771,11 +1898,11 @@ found in the list of installed applications.</string>
 
     <!-- Text-To-Speech (TTS) settings --><skip />
     <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings related to the text-to-speech functionality -->
-    <string name="tts_settings">Speech synthesis</string>
+    <string name="tts_settings">Text-to-speech</string>
     <!-- Summary of setting on main settings screen. This item will take the user to the screen to tweak settings related to the text-to-speech functionality  -->
     <string name="tts_settings_summary">Set text-to-speech options</string>
     <!-- Main TTS Settings screen title -->
-    <string name="tts_settings_title">Speech synthesizer controls</string>
+    <string name="tts_settings_title">Text-to-speech settings</string>
     <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
     <string name="use_default_tts_settings_title">Always use my settings</string>
     <!-- On main TTS Settings screen, summary for toggle used to force use of default TTS settings -->
@@ -1811,11 +1938,16 @@ found in the list of installed applications.</string>
 
     <!-- Power Control Widget -->
     <string name="gadget_title">Power Control</string>
+    <string name="gadget_toggle_wifi">Updating Wi-Fi setting</string>
+    <string name="gadget_toggle_bluetooth">Updating Bluetooth setting</string>
+
+    <!-- credential installer title -->
+    <string name="credential_installer_activity_title">Credential installer</string>
 
     <string name="vpn_settings_activity_title">VPN settings</string>
 
     <!-- Title of VPN connect dialog -->
-    <string name="vpn_connect_to">Connect to %s</string>
+    <string name="vpn_connect_to">Connect to <xliff:g id="name" example="Work Network">%s</xliff:g></string>
     <!-- In VPN connect dialog, for inputing username and password -->
     <string name="vpn_username_colon">Username:</string>
     <string name="vpn_password_colon">Password:</string>
@@ -1840,9 +1972,9 @@ found in the list of installed applications.</string>
     <string name="vpn_menu_delete">Delete network</string>
 
     <!-- VPN error dialog messages -->
-    <string name="vpn_error_miss_entering">You must enter %s.</string>
-    <string name="vpn_error_miss_selecting">You must select %s.</string>
-    <string name="vpn_error_duplicate_name">The VPN name \'%s\' already exists. Find another name.</string>
+    <string name="vpn_error_miss_entering">You must enter <xliff:g id="code">%s</xliff:g>.</string>
+    <string name="vpn_error_miss_selecting">You must select <xliff:g id="option">%s</xliff:g>.</string>
+    <string name="vpn_error_duplicate_name">The VPN name \'<xliff:g id="name" example="Home Network">%s</xliff:g>\' already exists. Find another name.</string>
     <string name="vpn_confirm_profile_deletion">Are you sure you want to delete this VPN?</string>
     <string name="vpn_confirm_add_profile_cancellation">Are you sure you don\'t want to create this profile?</string>
     <string name="vpn_confirm_edit_profile_cancellation">Are you sure you want to discard the changes made to this profile?</string>
@@ -1853,15 +1985,17 @@ found in the list of installed applications.</string>
     <string name="vpn_secret_not_set_dialog_msg">One or more secrets are missing in this VPN configuration. Do you want to check your secret setting?</string>
     <string name="vpn_auth_error_dialog_msg">The username or password you entered is incorrect. Do you want to try again?</string>
     <string name="vpn_remote_hung_up_error_dialog_msg">Server hung up. The username or password you entered could be incorrect. Do you want to try again?</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg">Server hung up. It is possible that you are behind a firewall that prevents you from connecting to the server. Do you want to try again?</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg">Server negotiation failed. The server may not agree with your encryption option. Do you want to check your encryption setting?</string>
 
     <!-- VPN type selection activity title -->
     <string name="vpn_type_title">Add VPN</string>
     <!-- "Add VPN" preference title -->
     <string name="vpn_add_new_vpn">Add VPN</string>
     <!-- VPN profile editor title when adding a new profile -->
-    <string name="vpn_edit_title_add">Add %s VPN</string>
+    <string name="vpn_edit_title_add">Add <xliff:g id="name">%s</xliff:g> VPN</string>
     <!-- VPN profile editor title when editing an existing profile -->
-    <string name="vpn_edit_title_edit">%s details</string>
+    <string name="vpn_edit_title_edit"><xliff:g id="name">%s</xliff:g> details</string>
     <!-- Preference group title for a list of VPN profiles -->
     <string name="vpns">VPNs</string>
     <!-- Preference summary text when VPN is connecting -->
@@ -1878,9 +2012,9 @@ found in the list of installed applications.</string>
     <string name="vpn_a_name">a VPN name</string>
 
     <!-- Toast message shown when a profile is added -->
-    <string name="vpn_profile_added">&#39;%s&#39; is added</string>
+    <string name="vpn_profile_added">\'<xliff:g id="name">%s</xliff:g>\' is added</string>
     <!-- Toast message shown when changes of a profile is saved -->
-    <string name="vpn_profile_replaced">Changes are made to &#39;%s&#39;</string>
+    <string name="vpn_profile_replaced">Changes are made to \'<xliff:g id="name">%s</xliff:g>\'</string>
 
     <!-- Preference title -->
     <string name="vpn_user_certificate_title">Set user certificate</string>
@@ -1921,21 +2055,21 @@ found in the list of installed applications.</string>
     <string name="vpn_dns_search_list">DNS search domains</string>
 
     <!-- Summary text to hint that the value is set -->
-    <string name="vpn_field_is_set">%s is set</string>
+    <string name="vpn_field_is_set"><xliff:g id="value">%s</xliff:g> is set</string>
     <!-- Summary text to hint that the value is not set -->
-    <string name="vpn_field_not_set">%s not set</string>
+    <string name="vpn_field_not_set"><xliff:g id="value">%s</xliff:g> not set</string>
     <!-- Summary text to hint that the value is not set but it's not required-->
-    <string name="vpn_field_not_set_optional">%s not set (optional)</string>
+    <string name="vpn_field_not_set_optional"><xliff:g id="value">%s</xliff:g> not set (optional)</string>
 
     <!-- CheckBoxPreference title to enable something -->
-    <string name="vpn_enable_field">Enable %s</string>
+    <string name="vpn_enable_field">Enable <xliff:g id="option">%s</xliff:g></string>
     <!-- CheckBoxPreference title to disable something -->
-    <string name="vpn_disable_field">Disable %s</string>
+    <string name="vpn_disable_field">Disable <xliff:g id="option">%s</xliff:g></string>
 
     <!-- CheckBoxPreference summary to hint that something is enabled -->
-    <string name="vpn_is_enabled">%s is enabled</string>
+    <string name="vpn_is_enabled"><xliff:g id="option">%s</xliff:g> is enabled</string>
     <!-- CheckBoxPreference summary to hint that something is disabled -->
-    <string name="vpn_is_disabled">%s is disabled</string>
+    <string name="vpn_is_disabled"><xliff:g id="option">%s</xliff:g> is disabled</string>
 
     <!-- Title of preference to enter the VPN settings activity -->
     <string name="vpn_settings_title">VPN settings</string>
@@ -1947,71 +2081,74 @@ found in the list of installed applications.</string>
     <string name="vpn_secret_not_set">(not set)</string>
 
     <!-- Title of preference group for credential storage settings -->
-    <string name="cstor_settings_category">Credential storage</string>
+    <string name="credentials_category">Credential storage</string>
     <!-- Title of preference to enable/dislable access to credential storage -->
-    <string name="cstor_access_title">Use secure credentials</string>
+    <string name="credentials_access">Use secure credentials</string>
     <!-- Summary of preference to enable/dislable access to credential storage -->
-    <string name="cstor_access_summary">Allow applications to access secure certificates and other credentials</string>
+    <string name="credentials_access_summary">Allow applications to access secure certificates and other credentials</string>
     <!-- Title of dialog to enable/dislable access to credential storage -->
-    <string name="cstor_access_dialog_title">Enter password</string>
-    <!-- Description of dialog to enable/dislable access to credential storage from an action that requires the credential storage -->
-    <string name="cstor_access_dialog_hint_from_action">Enter the credential storage password.</string>
-
+    <string name="credentials_unlock">Enter password</string>
+    <!-- Description of dialog to enable/dislable access to credential storage -->
+    <string name="credentials_unlock_hint">Enter the credential storage password.</string>
+    <!-- Title of preference to install certificates from SD card -->
+    <string name="credentials_install_certificates">Install from SD card</string>
+    <!-- Summary of preference to install certificates from SD card -->
+    <string name="credentials_install_certificates_summary">Install encrypted certificates from SD card</string>
     <!-- Title of preference to set storage password -->
-    <string name="cstor_set_passwd_title">Set password</string>
+    <string name="credentials_set_password">Set password</string>
     <!-- Summary of preference to set storage password -->
-    <string name="cstor_set_passwd_summary">Set or change the credential storage password</string>
-    <!-- Title of dialog to set storage password -->
-    <string name="cstor_set_passwd_dialog_title">Set password</string>
-
-    <!-- Title of preference to reset storage -->
-    <string name="cstor_reset_title">Clear storage</string>
-    <!-- Summary of preference to reset storage -->
-    <string name="cstor_reset_summary">Clear credential storage of all contents and reset its password</string>
-    <string name="cstor_reset_hint">Are you sure you want to delete all credentials and reset the credential storage password?</string>
-
-    <!-- Title of dialog to name a credential -->
-    <string name="cstor_name_credential_dialog_title">Name the certificate</string>
-    <!-- Description for the credential name input box -->
-    <string name="cstor_credential_name">Certificate name:</string>
-    <!-- Title of the credential info -->
-    <!-- Description for the credential password input box -->
-    <string name="cstor_credential_password">Password to extract the certificate:</string>
-    <string name="cstor_credential_info">Certificate details:</string>
-    <string name="cstor_name_credential_hint">The name can contain only letters and numbers.</string>
-
-
+    <string name="credentials_set_password_summary">Set or change the credential storage password</string>
+    <!-- Title of preference to reset credential storage -->
+    <string name="credentials_reset">Clear storage</string>
+    <!-- Summary of preference to reset credential storage -->
+    <string name="credentials_reset_summary">Clear credential storage of all contents and reset its password</string>
+    <!-- Description of dialog to reset the credential storage -->
+    <string name="credentials_reset_hint">Are you sure you want to delete all credentials and reset the credential storage password?</string>
     <!-- Description for the old-password input box -->
-    <string name="cstor_old_password">Current password:</string>
+    <string name="credentials_old_password">Current password:</string>
     <!-- Description for the new-password input box -->
-    <string name="cstor_new_password">New password:</string>
+    <string name="credentials_new_password">New password:</string>
     <!-- Description for the confirm-new-password input box -->
-    <string name="cstor_confirm_password">Confirm new password:</string>
+    <string name="credentials_confirm_password">Confirm new password:</string>
     <!-- Description when user set up the storage for the very first time -->
-    <string name="cstor_first_time_hint">Set a password for the credential storage.</string>
-    <!-- Description when user set up the storage for the very first time from an action that requires the credential storage-->
-    <string name="cstor_first_time_hint_from_action">Set a password for the credential storage.</string>
-    <string name="cstor_password_error">Please enter the correct password.</string>
-    <string name="cstor_password_error_reset_warning">Please enter the correct password. You have one more try to enter the correct password before the credential storage is erased.</string>
-    <string name="cstor_password_error_reset_warning_plural">Please enter the correct password. You have %d more tries to enter the correct password before the credential storage is erased.</string>
-    <string name="cstor_passwords_error">Passwords do not match.</string>
-    <string name="cstor_passwords_empty_error">You must enter and confirm a password.</string>
-    <string name="cstor_password_empty_error">Please enter the password.</string>
-    <string name="cstor_password_verification_error">Please enter the password again. The password must have at least 8 characters and must not contain spaces.</string>
-    <string name="cstor_name_empty_error">Please enter a name.</string>
-    <string name="cstor_name_char_error">Please enter a name that contains only letters and numbers.</string>
-    <string name="cstor_storage_error">Unable to save the certificate. Click OK to retry.</string>
-    <string name="cstor_unable_to_save_cert">Unable to save the certificate. The credential storage is not enabled or properly initialized.</string>
-    <string name="cstor_cert_not_saved">The certificate is not saved.</string>
-    <string name="cstor_is_reset">The credential storage is erased.</string>
-
+    <string name="credentials_first_time_hint">Set a password for the credential storage (at least 8 characters).</string>
+    <string name="credentials_wrong_password">Please enter the correct password.</string>
+    <string name="credentials_reset_warning">Please enter the correct password. You have one more try to enter the correct password before the credential storage is erased.</string>
+    <string name="credentials_reset_warning_plural">Please enter the correct password. You have <xliff:g id="number" example="5">%1$d</xliff:g> more tries to enter the correct password before the credential storage is erased.</string>
+    <string name="credentials_passwords_mismatch">Passwords do not match.</string>
+    <string name="credentials_passwords_empty">You must enter and confirm a password.</string>
+    <string name="credentials_password_empty">Please enter the password.</string>
+    <string name="credentials_password_too_short">The password must have at least 8 characters.</string>
     <!-- toast message -->
-    <string name="cstor_is_enabled">Credential storage is enabled.</string>
+    <string name="credentials_erased">The credential storage is erased.</string>
     <!-- toast message -->
-    <string name="cstor_is_added">%s is added.</string>
+    <string name="credentials_enabled">Credential storage is enabled.</string>
+    <!-- toast message -->
+    <string name="credentials_disabled">Credential storage is disabled.</string>
 
     <!-- Sound settings screen, setting check box label -->
     <string name="emergency_tone_title">Emergency tone</string>
     <!-- Sound settings screen, setting option summary text -->
     <string name="emergency_tone_summary">Set behavior when an emergency call is placed</string>
+    
+    <!-- Privacy Settings screen --><skip/>
+    <!-- Privacy settings menu title -->
+    <string name="privacy_settings">Privacy</string>
+    <!-- Privacy settings activity title -->
+    <string name="privacy_settings_title">Privacy settings</string>
+    <!-- Location settings section title -->
+    <string name="location_section_title">Location</string>
+    <!-- Settings section title -->
+    <string name="settings_section_title">Settings</string>
+    <!-- Personal data section title -->
+    <string name="personal_data_section_title">Personal data</string>
+    <!-- Backup settings menu title -->
+    <string name="backup_settings_title">Back up my settings</string>
+    <!-- Dialog title for confirmation to erase backup data from server -->
+    <string name="backup_erase_dialog_title">Settings backup</string>
+    <!-- Dialog title for confirmation to erase backup data from server -->
+    <string name="backup_erase_dialog_message">Are you sure you want to stop backing up your settings and erase all copies on Google servers?</string>
+
+    <!-- Name to assign to a Network Access Point that was saved without a name -->
+    <string name="untitled_apn">Untitled</string>
 </resources>
diff --git a/res/xml-ar/timezones.xml b/res/xml-ar/timezones.xml
index 395e5e23430..b9038805b63 100644
--- a/res/xml-ar/timezones.xml
+++ b/res/xml-ar/timezones.xml
@@ -2,7 +2,7 @@
     <timezone id="Pacific/Majuro">ماجورو</timezone>
     <timezone id="Pacific/Midway">ميدواي</timezone>
     <timezone id="Pacific/Honolulu">هونولولو</timezone>
-    <timezone id="America/Anchorage">أنكوريج</timezone>
+    <timezone id="America/Anchorage">أنشوراج</timezone>
     <timezone id="America/Los_Angeles">لوس انجلوس</timezone>
     <timezone id="America/Tijuana">تيخوانا</timezone>
     <timezone id="America/Phoenix">فينكس</timezone>
@@ -18,7 +18,7 @@
     <timezone id="America/Barbados">Barbados</timezone>
     <timezone id="America/Manaus">ماناوس</timezone>
     <timezone id="America/Santiago">سانتيجو</timezone>
-    <timezone id="America/St_Johns">سانت جونز</timezone>
+    <timezone id="America/St_Johns">سانت جونس</timezone>
     <timezone id="America/Araguaina">أروجوانيا</timezone>
     <timezone id="America/Argentina/Buenos_Aires">بوينوس أيرس</timezone>
     <timezone id="America/Godthab">جودثاب</timezone>
@@ -62,6 +62,7 @@
     <timezone id="Asia/Rangoon">Rangoon</timezone>
     <timezone id="Asia/Krasnoyarsk">كراسنويارسك</timezone>
     <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Shanghai">بكين</timezone>
     <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
     <timezone id="Asia/Irkutsk">ايركيتسك</timezone>
     <timezone id="Asia/Kuala_Lumpur">كوالالمبور</timezone>
@@ -70,7 +71,7 @@
     <timezone id="Asia/Seoul">Seoul</timezone>
     <timezone id="Asia/Tokyo">Tokyo</timezone>
     <timezone id="Asia/Yakutsk">ياكتسك</timezone>
-    <timezone id="Australia/Adelaide">أدليادا</timezone>
+    <timezone id="Australia/Adelaide">استراليا(توقيت أدليادا</timezone>
     <timezone id="Australia/Darwin">دارون</timezone>
     <timezone id="Australia/Brisbane">برسيبان</timezone>
     <timezone id="Australia/Hobart">هوبارت</timezone>
diff --git a/res/xml-cs/timezones.xml b/res/xml-cs/timezones.xml
index 26a97156356..3b7e87b7cba 100644
--- a/res/xml-cs/timezones.xml
+++ b/res/xml-cs/timezones.xml
@@ -2,7 +2,7 @@
     <timezone id="Pacific/Majuro">Majuro</timezone>
     <timezone id="Pacific/Midway">Midway</timezone>
     <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Aljašský čas</timezone>
+    <timezone id="America/Anchorage">Anchorage</timezone>
     <timezone id="America/Los_Angeles">Pacifický standardní čas (Los Angeles)</timezone>
     <timezone id="America/Tijuana">Pacifický standardní čas (Tichuana)</timezone>
     <timezone id="America/Phoenix">Horský standardní čas (Phoenix)</timezone>
diff --git a/res/xml-da/timezones.xml b/res/xml-da/timezones.xml
index eb63dcea617..6e80e87fc9a 100644
--- a/res/xml-da/timezones.xml
+++ b/res/xml-da/timezones.xml
@@ -2,7 +2,7 @@
     <timezone id="Pacific/Majuro">Majuro</timezone>
     <timezone id="Pacific/Midway">Midway</timezone>
     <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Alaska Time</timezone>
+    <timezone id="America/Anchorage">Alaska</timezone>
     <timezone id="America/Los_Angeles">Pacific-tid (Los Angeles)</timezone>
     <timezone id="America/Tijuana">Pacific-tid (Tijuana)</timezone>
     <timezone id="America/Phoenix">Mountain-tid (Phoenix)</timezone>
@@ -62,13 +62,14 @@
     <timezone id="Asia/Rangoon">Rangoon</timezone>
     <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
     <timezone id="Asia/Bangkok">Indokinesisk tid (Bangkok)</timezone>
+    <timezone id="Asia/Shanghai">Kinesisk tid (Beijing)</timezone>
     <timezone id="Asia/Hong_Kong">Hongkong-tid (Hongkong)</timezone>
     <timezone id="Asia/Irkutsk">Irkutsk</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
     <timezone id="Australia/Perth">Vestaustralsk tid (Perth)</timezone>
-    <timezone id="Asia/Taipei">Kinesisk normaltid (Taipei)</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
     <timezone id="Asia/Seoul">Koreansk normaltid (Seoul)</timezone>
-    <timezone id="Asia/Tokyo">Japansk normaltid (Tokyo)</timezone>
+    <timezone id="Asia/Tokyo">Japansk tid (Tokyo)</timezone>
     <timezone id="Asia/Yakutsk">Yakutsk</timezone>
     <timezone id="Australia/Adelaide">Centralaustralsk tid (Adelaide)</timezone>
     <timezone id="Australia/Darwin">Centralaustralsk tid (Darwin)</timezone>
diff --git a/res/xml-el/timezones.xml b/res/xml-el/timezones.xml
index 9cb4dc124c9..de25148e29f 100644
--- a/res/xml-el/timezones.xml
+++ b/res/xml-el/timezones.xml
@@ -6,19 +6,19 @@
     <timezone id="America/Los_Angeles">Λος Άντζελες</timezone>
     <timezone id="America/Tijuana">Τιχουάνα</timezone>
     <timezone id="America/Phoenix">Φοίνιξ</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Chihuahua">Τσιουάουα</timezone>
     <timezone id="America/Denver">Ντένβερ</timezone>
     <timezone id="America/Costa_Rica">Κόστα Ρίκα</timezone>
     <timezone id="America/Chicago">Σικάγο</timezone>
     <timezone id="America/Mexico_City">Πόλη του Μεξικού</timezone>
-    <timezone id="America/Regina">Regina</timezone>
+    <timezone id="America/Regina">Ρετζίνα</timezone>
     <timezone id="America/Bogota">Μπογκοτά</timezone>
     <timezone id="America/New_York">Νέα Υόρκη</timezone>
     <timezone id="America/Caracas">Καράκας</timezone>
     <timezone id="America/Barbados">Μπαρμπέιντος</timezone>
     <timezone id="America/Manaus">Μανάος</timezone>
     <timezone id="America/Santiago">Σαντιάγκο</timezone>
-    <timezone id="America/St_Johns">St. John's</timezone>
+    <timezone id="America/St_Johns">Σεντ Τζονς</timezone>
     <timezone id="America/Araguaina">Αραγκουάινα</timezone>
     <timezone id="America/Argentina/Buenos_Aires">Μπουένος Άιρες</timezone>
     <timezone id="America/Godthab">Γκόνθαμπ</timezone>
@@ -33,7 +33,7 @@
     <timezone id="Europe/Brussels">Βρυξέλλες</timezone>
     <timezone id="Europe/Sarajevo">Sarajevo</timezone>
     <timezone id="Africa/Windhoek">Γουιντχόεκ</timezone>
-    <timezone id="Africa/Brazzaville">Μπράζαβιλ</timezone>
+    <timezone id="Africa/Brazzaville">ώρα Δυτικής Αφρικής (Μπράζαβιλ)</timezone>
     <timezone id="Asia/Amman">Αμάν</timezone>
     <timezone id="Europe/Athens">Αθήνα</timezone>
     <timezone id="Asia/Beirut">Βηρυτός</timezone>
@@ -41,11 +41,11 @@
     <timezone id="Europe/Helsinki">Ελσίνκι</timezone>
     <timezone id="Asia/Jerusalem">Ιερουσαλήμ</timezone>
     <timezone id="Europe/Minsk">Μινσκ</timezone>
-    <timezone id="Africa/Harare">Ζιμπάμπουε</timezone>
+    <timezone id="Africa/Harare">ώρα Κεντρικής Αφρικής (Ζιμπάμπουε)</timezone>
     <timezone id="Asia/Baghdad">Βαγδάτη</timezone>
     <timezone id="Europe/Moscow">Μόσχα</timezone>
     <timezone id="Asia/Kuwait">Kuwait</timezone>
-    <timezone id="Africa/Nairobi">Κένυα</timezone>
+    <timezone id="Africa/Nairobi">ώρα Ανατολικής Αφρικής (Κένυα)</timezone>
     <timezone id="Asia/Tehran">Τεχεράνη</timezone>
     <timezone id="Asia/Baku">Μπακού</timezone>
     <timezone id="Asia/Tbilisi">Τμπιλίσι</timezone>
@@ -53,31 +53,32 @@
     <timezone id="Asia/Dubai">Ντουμπάι</timezone>
     <timezone id="Asia/Kabul">Καμπούλ</timezone>
     <timezone id="Asia/Karachi">Καράτσι</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
+    <timezone id="Asia/Oral">Όραλ</timezone>
     <timezone id="Asia/Yekaterinburg">Αικατερινούπολη</timezone>
     <timezone id="Asia/Calcutta">Calcutta</timezone>
     <timezone id="Asia/Colombo">Κολόμπο</timezone>
     <timezone id="Asia/Katmandu">Κατμαντού</timezone>
     <timezone id="Asia/Almaty">Αλμάτυ</timezone>
     <timezone id="Asia/Rangoon">Ρανγκούν</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
+    <timezone id="Asia/Krasnoyarsk">Κρασνογιάρσκ</timezone>
     <timezone id="Asia/Bangkok">Μπανγκόκ</timezone>
+    <timezone id="Asia/Shanghai">Πεκίνο</timezone>
     <timezone id="Asia/Hong_Kong">Χονγκ Κονγκ</timezone>
     <timezone id="Asia/Irkutsk">Ιρκούτσκ</timezone>
     <timezone id="Asia/Kuala_Lumpur">Κουάλα Λουμπούρ</timezone>
-    <timezone id="Australia/Perth">Perth</timezone>
+    <timezone id="Australia/Perth">Περθ</timezone>
     <timezone id="Asia/Taipei">Ταϊπέι</timezone>
     <timezone id="Asia/Seoul">Σεούλ</timezone>
     <timezone id="Asia/Tokyo">Τόκυο</timezone>
-    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
+    <timezone id="Asia/Yakutsk">Γιάκουτσκ</timezone>
     <timezone id="Australia/Adelaide">Αδελαΐδα</timezone>
-    <timezone id="Australia/Darwin">Darwin</timezone>
-    <timezone id="Australia/Brisbane">Brisbane</timezone>
-    <timezone id="Australia/Hobart">Hobart</timezone>
-    <timezone id="Australia/Sydney">Σύδνεϊ</timezone>
+    <timezone id="Australia/Darwin">Ντάργουιν</timezone>
+    <timezone id="Australia/Brisbane">Μπρίσμπεϊν</timezone>
+    <timezone id="Australia/Hobart">Χόμπαρτ</timezone>
+    <timezone id="Australia/Sydney">Σίδνεϊ</timezone>
     <timezone id="Asia/Vladivostok">Βλαδιβοστόκ</timezone>
     <timezone id="Pacific/Guam">Γκουάμ</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
+    <timezone id="Asia/Magadan">Μαγκαντάν</timezone>
     <timezone id="Pacific/Auckland">Όκλαντ</timezone>
     <timezone id="Pacific/Fiji">Φίτζι</timezone>
     <timezone id="Pacific/Tongatapu">Τονγκατάπου</timezone>
diff --git a/res/xml-es/timezones.xml b/res/xml-es/timezones.xml
index d59aabe94ac..4fe564db591 100644
--- a/res/xml-es/timezones.xml
+++ b/res/xml-es/timezones.xml
@@ -3,29 +3,29 @@
     <timezone id="Pacific/Midway">Midway</timezone>
     <timezone id="Pacific/Honolulu">Honolulú</timezone>
     <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Hora estándar del Pacífico (Los Ángeles)</timezone>
-    <timezone id="America/Tijuana">Hora estándar del Pacífico (Hora de México (Tijuana))</timezone>
-    <timezone id="America/Phoenix">Hora estándar de Montaña (Hora de Estados Unidos (Phoenix))</timezone>
-    <timezone id="America/Chihuahua">Hora de México (Chihuahua)</timezone>
+    <timezone id="America/Los_Angeles">Hora del Pacífico (Los Ángeles)</timezone>
+    <timezone id="America/Tijuana">Hora del Pacífico (Tijuana)</timezone>
+    <timezone id="America/Phoenix">Hora estándar de Montaña (Phoenix)</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
     <timezone id="America/Denver">Hora estándar de Montaña (Denver)</timezone>
     <timezone id="America/Costa_Rica">Hora central (Costa Rica)</timezone>
     <timezone id="America/Chicago">Hora central (Chicago)</timezone>
     <timezone id="America/Mexico_City">Hora central (Ciudad de México)</timezone>
     <timezone id="America/Regina">Hora central (Hora de Canadá (Regina))</timezone>
-    <timezone id="America/Bogota">Bogotá</timezone>
+    <timezone id="America/Bogota">Hora de Colombia (Bogotá)</timezone>
     <timezone id="America/New_York">Hora oriental (Nueva York)</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Hora estándar del Atlántico (Barbados)</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">Hora estándar de Newfoundland (St. Johns)</timezone>
-    <timezone id="America/Araguaina">Araguaína</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Hora de Argentina (Buenos Aires)</timezone>
-    <timezone id="America/Godthab">Godthab</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">Georgia del Sur</timezone>
+    <timezone id="America/Caracas">Hora de Venezuela (Caracas)</timezone>
+    <timezone id="America/Barbados">Hora del Atlántico (Barbados)</timezone>
+    <timezone id="America/Manaus">Hora del Amazonas (Manaus)</timezone>
+    <timezone id="America/Santiago">Hora de Chile (Santiago)</timezone>
+    <timezone id="America/St_Johns">Hora estándar de Newfoundland (St. John’s)</timezone>
+    <timezone id="America/Araguaina">Hora de Brasilia (Araguaína)</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Hora de Argentina (Hora de Argentina (Buenos Aires))</timezone>
+    <timezone id="America/Godthab">Hora de Groenlandia occidental (Godthab)</timezone>
+    <timezone id="America/Montevideo">Hora de Uruguay (Montevideo)</timezone>
+    <timezone id="Atlantic/South_Georgia">Hora de Georgia meridional (Georgia del Sur)</timezone>
     <timezone id="Atlantic/Azores">Azores</timezone>
-    <timezone id="Atlantic/Cape_Verde">Cabo Verde</timezone>
+    <timezone id="Atlantic/Cape_Verde">Hora de Cabo Verde (Cabo Verde)</timezone>
     <timezone id="Africa/Casablanca">Casablanca</timezone>
     <timezone id="Europe/London">Hora media de Greenwich (Londres)</timezone>
     <timezone id="Europe/Amsterdam">Hora estándar de Europa Central (Amsterdam)</timezone>
@@ -33,7 +33,7 @@
     <timezone id="Europe/Brussels">Hora estándar de Europa Central (Bruselas)</timezone>
     <timezone id="Europe/Sarajevo">Hora estándar de Europa Central (Sarajevo)</timezone>
     <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
+    <timezone id="Africa/Brazzaville">Hora de África occidental (Brazzaville)</timezone>
     <timezone id="Asia/Amman">Hora estándar de Europa del Este (Amman)</timezone>
     <timezone id="Europe/Athens">Hora estándar de Europa del Este (Atenas)</timezone>
     <timezone id="Asia/Beirut">Hora estándar de Europa del Este (Beirut)</timezone>
@@ -41,45 +41,45 @@
     <timezone id="Europe/Helsinki">Hora estándar de Europa del Este (Helsinki)</timezone>
     <timezone id="Asia/Jerusalem">Hora estándar de Israel (Jerusalén)</timezone>
     <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Harare</timezone>
-    <timezone id="Asia/Baghdad">Bagdad</timezone>
+    <timezone id="Africa/Harare">Hora de África central (Harare)</timezone>
+    <timezone id="Asia/Baghdad">Hora de Arabia (Bagdad)</timezone>
     <timezone id="Europe/Moscow">Moscú</timezone>
-    <timezone id="Asia/Kuwait">Kuwait</timezone>
-    <timezone id="Africa/Nairobi">Nairobi</timezone>
+    <timezone id="Asia/Kuwait">Hora de Arabia (Kuwait)</timezone>
+    <timezone id="Africa/Nairobi">Hora de África oriental (Nairobi)</timezone>
     <timezone id="Asia/Tehran">Teherán</timezone>
     <timezone id="Asia/Baku">Bakú</timezone>
     <timezone id="Asia/Tbilisi">Tiflis</timezone>
     <timezone id="Asia/Yerevan">Ereván</timezone>
     <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Kabul</timezone>
+    <timezone id="Asia/Kabul">Hora de Afganistán (Kabul)</timezone>
     <timezone id="Asia/Karachi">Karachi</timezone>
     <timezone id="Asia/Oral">Oral</timezone>
     <timezone id="Asia/Yekaterinburg">Yekaterinburgo</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Calcutta">Hora estándar de la India (Calcutta)</timezone>
     <timezone id="Asia/Colombo">Colombo</timezone>
     <timezone id="Asia/Katmandu">Katmandú</timezone>
     <timezone id="Asia/Almaty">Almaty</timezone>
     <timezone id="Asia/Rangoon">Rangún</timezone>
     <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
     <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Hora estándar de China (Beijing)</timezone>
-    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
+    <timezone id="Asia/Shanghai">Hora de China (Beijing)</timezone>
+    <timezone id="Asia/Hong_Kong">Hora de Hong Kong (Hong Kong)</timezone>
     <timezone id="Asia/Irkutsk">Irkutsk</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Hora de Australia (Perth)</timezone>
+    <timezone id="Australia/Perth">Hora de Australia occidental (Perth)</timezone>
     <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Seúl</timezone>
+    <timezone id="Asia/Seoul">Hora de Corea (Seúl)</timezone>
     <timezone id="Asia/Tokyo">Hora estándar de Japón (Tokio)</timezone>
     <timezone id="Asia/Yakutsk">Yakutsk</timezone>
-    <timezone id="Australia/Adelaide">Adelaida</timezone>
-    <timezone id="Australia/Darwin">Hora de Australia (Darwin)</timezone>
-    <timezone id="Australia/Brisbane">Hora de Australia (Brisbane)</timezone>
-    <timezone id="Australia/Hobart">Hora de Australia (Hobart)</timezone>
-    <timezone id="Australia/Sydney">Sydney</timezone>
+    <timezone id="Australia/Adelaide">Hora de Australia central (Adelaida)</timezone>
+    <timezone id="Australia/Darwin">Hora de Australia central (Darwin)</timezone>
+    <timezone id="Australia/Brisbane">Hora de Australia oriental (Brisbane)</timezone>
+    <timezone id="Australia/Hobart">Hora de Australia oriental (Hobart)</timezone>
+    <timezone id="Australia/Sydney">Hora de Australia oriental (Sídney)</timezone>
     <timezone id="Asia/Vladivostok">Vladivostok</timezone>
     <timezone id="Pacific/Guam">Guam</timezone>
     <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
+    <timezone id="Pacific/Auckland">Hora de Nueva Zelanda (Auckland)</timezone>
     <timezone id="Pacific/Fiji">Fiyi</timezone>
     <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
 </timezones>
diff --git a/res/xml-fi/timezones.xml b/res/xml-fi/timezones.xml
index 4172ec0de0b..ae194a71b2e 100644
--- a/res/xml-fi/timezones.xml
+++ b/res/xml-fi/timezones.xml
@@ -3,22 +3,22 @@
     <timezone id="Pacific/Midway">Midway</timezone>
     <timezone id="Pacific/Honolulu">Honolulu</timezone>
     <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Yhdysvaltain Tyynenmeren normaaliaika (Los Angeles)</timezone>
-    <timezone id="America/Tijuana">Yhdysvaltain Tyynenmeren normaaliaika (Tijuana)</timezone>
-    <timezone id="America/Phoenix">Kalliovuorten normaaliaika (Phoenix)</timezone>
+    <timezone id="America/Los_Angeles">Yhdysvaltain Tyynenmeren aika (Los Angeles)</timezone>
+    <timezone id="America/Tijuana">Yhdysvaltain Tyynenmeren aika (Tijuana)</timezone>
+    <timezone id="America/Phoenix">Kalliovuorten aika (Phoenix)</timezone>
     <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Kalliovuorten normaaliaika (Denver)</timezone>
-    <timezone id="America/Costa_Rica">Yhdysvaltain keskinen normaaliaika (Costa Rica)</timezone>
-    <timezone id="America/Chicago">Yhdysvaltain keskinen normaaliaika (Chicago)</timezone>
-    <timezone id="America/Mexico_City">Yhdysvaltain keskinen normaaliaika (Ciudad de México)</timezone>
-    <timezone id="America/Regina">Yhdysvaltain keskinen normaaliaika (Regina)</timezone>
+    <timezone id="America/Denver">Kalliovuorten aika (Denver)</timezone>
+    <timezone id="America/Costa_Rica">Yhdysvaltain keskinen aika (Costa Rica)</timezone>
+    <timezone id="America/Chicago">Yhdysvaltain keskinen aika (Chicago)</timezone>
+    <timezone id="America/Mexico_City">Yhdysvaltain keskinen aika (Ciudad de México)</timezone>
+    <timezone id="America/Regina">Yhdysvaltain keskinen aika (Regina)</timezone>
     <timezone id="America/Bogota">Bogota</timezone>
-    <timezone id="America/New_York">Yhdysvaltain itäinen normaaliaika (New York)</timezone>
+    <timezone id="America/New_York">Yhdysvaltain itäinen aika (New York)</timezone>
     <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Kanadan Atlantin normaaliaika (Barbados)</timezone>
+    <timezone id="America/Barbados">Kanadan Atlantin aika (Barbados)</timezone>
     <timezone id="America/Manaus">Manaus</timezone>
     <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">Newfoundlandin normaaliaika (St. John's)</timezone>
+    <timezone id="America/St_Johns">Newfoundlandin normaaliaika (St. Johns)</timezone>
     <timezone id="America/Araguaina">Araguaina</timezone>
     <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
     <timezone id="America/Godthab">Godthåb</timezone>
@@ -33,7 +33,7 @@
     <timezone id="Europe/Brussels">Keski-Euroopan normaaliaika (Bryssel)</timezone>
     <timezone id="Europe/Sarajevo">Keski-Euroopan normaaliaika (Sarajevo)</timezone>
     <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
+    <timezone id="Africa/Brazzaville">Länsi-Afrikan aika (Brazzaville)</timezone>
     <timezone id="Asia/Amman">Itä-Euroopan normaaliaika (Amman)</timezone>
     <timezone id="Europe/Athens">Itä-Euroopan normaaliaika (Ateena)</timezone>
     <timezone id="Asia/Beirut">Itä-Euroopan normaaliaika (Beirut)</timezone>
@@ -41,11 +41,11 @@
     <timezone id="Europe/Helsinki">Itä-Euroopan normaaliaika (Helsinki)</timezone>
     <timezone id="Asia/Jerusalem">Israelin normaaliaika (Jerusalem)</timezone>
     <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Harare</timezone>
+    <timezone id="Africa/Harare">Keski-Afrikan aika (Harare)</timezone>
     <timezone id="Asia/Baghdad">Baghdad</timezone>
     <timezone id="Europe/Moscow">Moskova</timezone>
     <timezone id="Asia/Kuwait">Kuwait</timezone>
-    <timezone id="Africa/Nairobi">Nairobi</timezone>
+    <timezone id="Africa/Nairobi">Itä-Afrikan aika (Nairobi)</timezone>
     <timezone id="Asia/Tehran">Teheran</timezone>
     <timezone id="Asia/Baku">Baku</timezone>
     <timezone id="Asia/Tbilisi">Tbilisi</timezone>
@@ -62,11 +62,12 @@
     <timezone id="Asia/Rangoon">Rangoon</timezone>
     <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
     <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Shanghai">Kiinan normaaliaika (Peking)</timezone>
     <timezone id="Asia/Hong_Kong">Hongkong</timezone>
     <timezone id="Asia/Irkutsk">Irkutsk</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
     <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Kiinan normaaliaika (Taipei)</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
     <timezone id="Asia/Seoul">Seoul</timezone>
     <timezone id="Asia/Tokyo">Japanin normaaliaika (Tokio)</timezone>
     <timezone id="Asia/Yakutsk">Jakutsk</timezone>
diff --git a/res/xml-fr/timezones.xml b/res/xml-fr/timezones.xml
index 6def4757728..d655e895a1c 100644
--- a/res/xml-fr/timezones.xml
+++ b/res/xml-fr/timezones.xml
@@ -1,8 +1,8 @@
 <timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
+    <timezone id="Pacific/Majuro">Heure des îles Marshall (Majuro)</timezone>
     <timezone id="Pacific/Midway">Midway</timezone>
     <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Anchorage</timezone>
+    <timezone id="America/Anchorage">Alaska</timezone>
     <timezone id="America/Los_Angeles">Heure du Pacifique (Los Angeles)</timezone>
     <timezone id="America/Tijuana">Heure du Pacifique (Tijuana)</timezone>
     <timezone id="America/Phoenix">Heure des Rocheuses (Phoenix)</timezone>
@@ -11,21 +11,21 @@
     <timezone id="America/Costa_Rica">Heure du Centre (San José)</timezone>
     <timezone id="America/Chicago">Heure du Centre (Chicago)</timezone>
     <timezone id="America/Mexico_City">Heure du Centre (Mexico)</timezone>
-    <timezone id="America/Regina">Heure du Centre (Regina)</timezone>
-    <timezone id="America/Bogota">Bogota</timezone>
+    <timezone id="America/Regina">Heure du Centre (Régina)</timezone>
+    <timezone id="America/Bogota">Heure de Colombie (Bogota)</timezone>
     <timezone id="America/New_York">Heure de l’Est (New York)</timezone>
     <timezone id="America/Caracas">Caracas</timezone>
     <timezone id="America/Barbados">Heure de l’Atlantique (Barbade (La))</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
+    <timezone id="America/Manaus">Heure de l’Amazonie (Manaos)</timezone>
+    <timezone id="America/Santiago">Heure du Chili (Santiago)</timezone>
     <timezone id="America/St_Johns">Heure de Terre-Neuve (Saint-Jean de Terre-Neuve)</timezone>
-    <timezone id="America/Araguaina">Araguaína</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Heure d’Argentine (Buenos Aires)</timezone>
+    <timezone id="America/Araguaina">Heure de Brasilia (Araguaína)</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Heure de l’Est argentin (Buenos Aires)</timezone>
     <timezone id="America/Godthab">Heure de l’Ouest du Groenland (Godthåb)</timezone>
     <timezone id="America/Montevideo">Montevideo</timezone>
     <timezone id="Atlantic/South_Georgia">Heure de Géorgie du Sud (Géorgie du Sud)</timezone>
-    <timezone id="Atlantic/Azores">Ponta Delgada</timezone>
-    <timezone id="Atlantic/Cape_Verde">Cap Vert</timezone>
+    <timezone id="Atlantic/Azores">Açores</timezone>
+    <timezone id="Atlantic/Cape_Verde">Heure du Cap-Vert (Cap Vert)</timezone>
     <timezone id="Africa/Casablanca">Casablanca</timezone>
     <timezone id="Europe/London">Heure moyenne de Greenwich (Londres)</timezone>
     <timezone id="Europe/Amsterdam">Heure de l’Europe centrale (Amsterdam)</timezone>
@@ -33,7 +33,7 @@
     <timezone id="Europe/Brussels">Heure de l’Europe centrale (Bruxelles)</timezone>
     <timezone id="Europe/Sarajevo">Heure de l’Europe centrale (Sarajevo)</timezone>
     <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Heure normale d’Afrique de l’Ouest (Brazzaville)</timezone>
+    <timezone id="Africa/Brazzaville">Heure d’Afrique de l’Ouest (Brazzaville)</timezone>
     <timezone id="Asia/Amman">Heure normale de l’Europe de l’Est (Amman)</timezone>
     <timezone id="Europe/Athens">Heure normale de l’Europe de l’Est (Athènes)</timezone>
     <timezone id="Asia/Beirut">Heure normale de l’Europe de l’Est (Beyrouth)</timezone>
@@ -41,24 +41,24 @@
     <timezone id="Europe/Helsinki">Heure normale de l’Europe de l’Est (Helsinki)</timezone>
     <timezone id="Asia/Jerusalem">Heure d’Israël (Jérusalem)</timezone>
     <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Heure normale d’Afrique centrale (Harare)</timezone>
+    <timezone id="Africa/Harare">Heure d’Afrique centrale (Harare)</timezone>
     <timezone id="Asia/Baghdad">Heure de l’Arabie (Bagdad)</timezone>
     <timezone id="Europe/Moscow">Moscou</timezone>
     <timezone id="Asia/Kuwait">Heure de l’Arabie (Koweït)</timezone>
-    <timezone id="Africa/Nairobi">Heure normale d’Afrique de l’Est (Nairobi)</timezone>
-    <timezone id="Asia/Tehran">Heure normale d’Iran (Téhéran)</timezone>
+    <timezone id="Africa/Nairobi">Heure d’Afrique de l’Est (Nairobi)</timezone>
+    <timezone id="Asia/Tehran">Heure d’Iran (Téhéran)</timezone>
     <timezone id="Asia/Baku">Bakou</timezone>
     <timezone id="Asia/Tbilisi">Tbilissi</timezone>
     <timezone id="Asia/Yerevan">Erevan</timezone>
     <timezone id="Asia/Dubai">Heure du Golfe (Dubaï)</timezone>
     <timezone id="Asia/Kabul">Heure d’Afghanistan (Kaboul)</timezone>
     <timezone id="Asia/Karachi">Karâchi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Iekaterinbourg</timezone>
-    <timezone id="Asia/Calcutta">Heure normale de l’Inde (Kolkata)</timezone>
+    <timezone id="Asia/Oral">Ouralsk</timezone>
+    <timezone id="Asia/Yekaterinburg">Ekaterinbourg</timezone>
+    <timezone id="Asia/Calcutta">Heure de l’Inde (Kolkata)</timezone>
     <timezone id="Asia/Colombo">Colombo</timezone>
     <timezone id="Asia/Katmandu">Katmandou</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
+    <timezone id="Asia/Almaty">Alma Ata</timezone>
     <timezone id="Asia/Rangoon">Rangoon</timezone>
     <timezone id="Asia/Krasnoyarsk">Heure de Krasnoïarsk (Krasnoïarsk)</timezone>
     <timezone id="Asia/Bangkok">Heure d’Indochine (Bangkok)</timezone>
@@ -79,7 +79,7 @@
     <timezone id="Asia/Vladivostok">Vladivostok</timezone>
     <timezone id="Pacific/Guam">Hagåtña</timezone>
     <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
+    <timezone id="Pacific/Auckland">Heure de Nouvelle-Zélande (Auckland)</timezone>
     <timezone id="Pacific/Fiji">Heure des îles Fidji (Fidji)</timezone>
-    <timezone id="Pacific/Tongatapu">Nukuʻalofa</timezone>
+    <timezone id="Pacific/Tongatapu">Heure de Tonga (Nukuʻalofa)</timezone>
 </timezones>
diff --git a/res/xml-he/timezones.xml b/res/xml-he/timezones.xml
index 510e0a5a6c0..9a2d9f3f9ea 100644
--- a/res/xml-he/timezones.xml
+++ b/res/xml-he/timezones.xml
@@ -62,6 +62,7 @@
     <timezone id="Asia/Rangoon">ראנגון</timezone>
     <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
     <timezone id="Asia/Bangkok">בנקוק</timezone>
+    <timezone id="Asia/Shanghai">בייג'ין</timezone>
     <timezone id="Asia/Hong_Kong">הונג קונג</timezone>
     <timezone id="Asia/Irkutsk">Irkutsk</timezone>
     <timezone id="Asia/Kuala_Lumpur">קואלה לומפור</timezone>
diff --git a/res/xml-hr/timezones.xml b/res/xml-hr/timezones.xml
index 7280fdb12fb..9a44c475152 100644
--- a/res/xml-hr/timezones.xml
+++ b/res/xml-hr/timezones.xml
@@ -3,19 +3,19 @@
     <timezone id="Pacific/Midway">Midway</timezone>
     <timezone id="Pacific/Honolulu">Honolulu</timezone>
     <timezone id="America/Anchorage">Alaska vremenska zona</timezone>
-    <timezone id="America/Los_Angeles">Los Angeles</timezone>
-    <timezone id="America/Tijuana">Tijuana</timezone>
-    <timezone id="America/Phoenix">Phoenix</timezone>
+    <timezone id="America/Los_Angeles">Pacifičko vrijeme (Los Angeles)</timezone>
+    <timezone id="America/Tijuana">Pacifičko vrijeme (Tijuana)</timezone>
+    <timezone id="America/Phoenix">Planinsko vrijeme (Phoenix)</timezone>
     <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Denver</timezone>
-    <timezone id="America/Costa_Rica">Kostarika</timezone>
-    <timezone id="America/Chicago">Chicago</timezone>
-    <timezone id="America/Mexico_City">Mexico City</timezone>
-    <timezone id="America/Regina">Regina</timezone>
+    <timezone id="America/Denver">Planinsko vrijeme (Denver)</timezone>
+    <timezone id="America/Costa_Rica">Središnje vrijeme (Kostarika)</timezone>
+    <timezone id="America/Chicago">Središnje vrijeme (Chicago)</timezone>
+    <timezone id="America/Mexico_City">Središnje vrijeme (Mexico City)</timezone>
+    <timezone id="America/Regina">Središnje vrijeme (Regina)</timezone>
     <timezone id="America/Bogota">Bogota</timezone>
-    <timezone id="America/New_York">New York</timezone>
+    <timezone id="America/New_York">Istočno vrijeme (New York)</timezone>
     <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Barbados</timezone>
+    <timezone id="America/Barbados">Atlantsko vrijeme (Barbados)</timezone>
     <timezone id="America/Manaus">Manaus</timezone>
     <timezone id="America/Santiago">Santiago</timezone>
     <timezone id="America/St_Johns">St. John's</timezone>
@@ -24,7 +24,7 @@
     <timezone id="America/Godthab">Godthab</timezone>
     <timezone id="America/Montevideo">Montevideo</timezone>
     <timezone id="Atlantic/South_Georgia">Južna Georgia</timezone>
-    <timezone id="Atlantic/Azores">Azores</timezone>
+    <timezone id="Atlantic/Azores">Azorski otoci</timezone>
     <timezone id="Atlantic/Cape_Verde">Zelenortska Republika</timezone>
     <timezone id="Africa/Casablanca">Casablanca</timezone>
     <timezone id="Europe/London">London</timezone>
@@ -33,7 +33,7 @@
     <timezone id="Europe/Brussels">Brussels</timezone>
     <timezone id="Europe/Sarajevo">Sarajevo</timezone>
     <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
+    <timezone id="Africa/Brazzaville">Zapadna Afrika (Brazzaville)</timezone>
     <timezone id="Asia/Amman">Amman</timezone>
     <timezone id="Europe/Athens">Atena</timezone>
     <timezone id="Asia/Beirut">Beirut</timezone>
@@ -41,11 +41,11 @@
     <timezone id="Europe/Helsinki">Helsinki</timezone>
     <timezone id="Asia/Jerusalem">Jerusalem</timezone>
     <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Harare</timezone>
+    <timezone id="Africa/Harare">Središnja Afrika (Harare)</timezone>
     <timezone id="Asia/Baghdad">Baghdad</timezone>
     <timezone id="Europe/Moscow">Moskva</timezone>
     <timezone id="Asia/Kuwait">Kuvajt</timezone>
-    <timezone id="Africa/Nairobi">Nairobi</timezone>
+    <timezone id="Africa/Nairobi">Istočna Afrika (Nairobi)</timezone>
     <timezone id="Asia/Tehran">Tehran</timezone>
     <timezone id="Asia/Baku">Baku</timezone>
     <timezone id="Asia/Tbilisi">Tbilisi</timezone>
@@ -62,6 +62,7 @@
     <timezone id="Asia/Rangoon">Rangoon</timezone>
     <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
     <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Shanghai">Peking</timezone>
     <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
     <timezone id="Asia/Irkutsk">Irkutsk</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
diff --git a/res/xml-hu/timezones.xml b/res/xml-hu/timezones.xml
index 7fcc513c7a5..72668600169 100644
--- a/res/xml-hu/timezones.xml
+++ b/res/xml-hu/timezones.xml
@@ -2,7 +2,7 @@
     <timezone id="Pacific/Majuro">Marshall-szigeteki idő (Majuro-zátony)</timezone>
     <timezone id="Pacific/Midway">Midway-szigetek</timezone>
     <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">anchorage-i idő</timezone>
+    <timezone id="America/Anchorage">Anchorage</timezone>
     <timezone id="America/Los_Angeles">Csendes-óceáni idő (Los Angeles)</timezone>
     <timezone id="America/Tijuana">Csendes-óceáni idő (Tijuana)</timezone>
     <timezone id="America/Phoenix">Hegyvidéki idő (Phoenix)</timezone>
@@ -33,7 +33,7 @@
     <timezone id="Europe/Brussels">Közép-európai idő (Brüsszel)</timezone>
     <timezone id="Europe/Sarajevo">Közép-európai idő (Sarajevo)</timezone>
     <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Nyugat-afrikai idő (Brazzaville)</timezone>
+    <timezone id="Africa/Brazzaville">Nigériai idő (Brazzaville)</timezone>
     <timezone id="Asia/Amman">Kelet-európai idő (Amman)</timezone>
     <timezone id="Europe/Athens">Kelet-európai idő (Athén)</timezone>
     <timezone id="Asia/Beirut">Kelet-európai idő (Bejrút)</timezone>
@@ -41,11 +41,11 @@
     <timezone id="Europe/Helsinki">Kelet-európai idő (Helsinki)</timezone>
     <timezone id="Asia/Jerusalem">Izraeli zónaidő (Jerusalem)</timezone>
     <timezone id="Europe/Minsk">Minszk</timezone>
-    <timezone id="Africa/Harare">Közép-afrikai idő (Harare)</timezone>
+    <timezone id="Africa/Harare">Mozambiki idő (Harare)</timezone>
     <timezone id="Asia/Baghdad">Arab idő (Bagdad)</timezone>
     <timezone id="Europe/Moscow">Moszkva</timezone>
     <timezone id="Asia/Kuwait">Arab idő (Kuvait)</timezone>
-    <timezone id="Africa/Nairobi">Kelet-afrikai idő (Nairobi)</timezone>
+    <timezone id="Africa/Nairobi">Kenyai idő (Nairobi)</timezone>
     <timezone id="Asia/Tehran">Iráni zónaidő (Teherán)</timezone>
     <timezone id="Asia/Baku">Baku</timezone>
     <timezone id="Asia/Tbilisi">Tbilisi</timezone>
@@ -58,15 +58,16 @@
     <timezone id="Asia/Calcutta">Indiai zónaidő (Calcutta)</timezone>
     <timezone id="Asia/Colombo">Colombo</timezone>
     <timezone id="Asia/Katmandu">Nepáli idő (Katmandu)</timezone>
-    <timezone id="Asia/Almaty">almati idő</timezone>
+    <timezone id="Asia/Almaty">Alma-Ata</timezone>
     <timezone id="Asia/Rangoon">Myanmari idő (Rangoon)</timezone>
     <timezone id="Asia/Krasnoyarsk">Krasznojarszki idő (Krasznojarszk)</timezone>
     <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Shanghai">Kínai zónaidő (Peking)</timezone>
     <timezone id="Asia/Hong_Kong">Hongkongi idő (Hong Kong)</timezone>
     <timezone id="Asia/Irkutsk">Irkutszki idő (Irkutszk)</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
     <timezone id="Australia/Perth">Nyugat-ausztrál idő (Perth)</timezone>
-    <timezone id="Asia/Taipei">Kínai zónaidő (Tajvan)</timezone>
+    <timezone id="Asia/Taipei">Tajvan</timezone>
     <timezone id="Asia/Seoul">Koreai idő (Dél-Korea)</timezone>
     <timezone id="Asia/Tokyo">Japán zónaidő (Tokio)</timezone>
     <timezone id="Asia/Yakutsk">Jakutszki idő (Jakutszk)</timezone>
diff --git a/res/xml-id/timezones.xml b/res/xml-id/timezones.xml
index c1db8374af0..ee625b0b54f 100644
--- a/res/xml-id/timezones.xml
+++ b/res/xml-id/timezones.xml
@@ -62,6 +62,7 @@
     <timezone id="Asia/Rangoon">Rangoon</timezone>
     <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
     <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Shanghai">Beijing</timezone>
     <timezone id="Asia/Hong_Kong">Hongkong</timezone>
     <timezone id="Asia/Irkutsk">Irkutsk</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
diff --git a/res/xml-ko/timezones.xml b/res/xml-ko/timezones.xml
index 6d62d035430..711f732ad72 100644
--- a/res/xml-ko/timezones.xml
+++ b/res/xml-ko/timezones.xml
@@ -23,9 +23,9 @@
     <timezone id="America/Argentina/Buenos_Aires">부에노스 아이레스</timezone>
     <timezone id="America/Godthab">고드호프</timezone>
     <timezone id="America/Montevideo">몬테비데오</timezone>
-    <timezone id="Atlantic/South_Georgia">남부 조지아</timezone>
+    <timezone id="Atlantic/South_Georgia">사우스 조지아 표준시 (남부 조지아)</timezone>
     <timezone id="Atlantic/Azores">아조레스</timezone>
-    <timezone id="Atlantic/Cape_Verde">카보 베르데</timezone>
+    <timezone id="Atlantic/Cape_Verde">카보 베르데 표준시 (카보 베르데)</timezone>
     <timezone id="Africa/Casablanca">카사블랑카</timezone>
     <timezone id="Europe/London">그리니치 표준시 (런던)</timezone>
     <timezone id="Europe/Amsterdam">중부유럽 표준시 (암스텔담)</timezone>
@@ -42,9 +42,9 @@
     <timezone id="Asia/Jerusalem">이스라엘 표준시 (예루살렘)</timezone>
     <timezone id="Europe/Minsk">민스크</timezone>
     <timezone id="Africa/Harare">중앙아프리카 시간 (하라레)</timezone>
-    <timezone id="Asia/Baghdad">바그다드</timezone>
+    <timezone id="Asia/Baghdad">아라비아 시간 (바그다드)</timezone>
     <timezone id="Europe/Moscow">모스크바</timezone>
-    <timezone id="Asia/Kuwait">쿠웨이트</timezone>
+    <timezone id="Asia/Kuwait">아라비아 시간 (쿠웨이트)</timezone>
     <timezone id="Africa/Nairobi">동아프리카 시간 (나이로비)</timezone>
     <timezone id="Asia/Tehran">테헤란</timezone>
     <timezone id="Asia/Baku">바쿠</timezone>
@@ -55,7 +55,7 @@
     <timezone id="Asia/Karachi">카라치</timezone>
     <timezone id="Asia/Oral">오랄</timezone>
     <timezone id="Asia/Yekaterinburg">예카테린부르크</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Calcutta">인도 표준시 (Calcutta)</timezone>
     <timezone id="Asia/Colombo">콜롬보</timezone>
     <timezone id="Asia/Katmandu">카트만두</timezone>
     <timezone id="Asia/Almaty">알마티</timezone>
@@ -80,6 +80,6 @@
     <timezone id="Pacific/Guam">괌</timezone>
     <timezone id="Asia/Magadan">마가단</timezone>
     <timezone id="Pacific/Auckland">뉴질랜드 시간 (오클랜드)</timezone>
-    <timezone id="Pacific/Fiji">피지</timezone>
+    <timezone id="Pacific/Fiji">피지 표준시 (피지)</timezone>
     <timezone id="Pacific/Tongatapu">통가타푸</timezone>
 </timezones>
diff --git a/res/xml-nb/timezones.xml b/res/xml-nb/timezones.xml
index 4bf41450064..f374a34c311 100644
--- a/res/xml-nb/timezones.xml
+++ b/res/xml-nb/timezones.xml
@@ -2,24 +2,24 @@
     <timezone id="Pacific/Majuro">Majuro</timezone>
     <timezone id="Pacific/Midway">Midway</timezone>
     <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Los Angeles</timezone>
-    <timezone id="America/Tijuana">Tijuana</timezone>
-    <timezone id="America/Phoenix">Phoenix</timezone>
+    <timezone id="America/Anchorage">Alaska</timezone>
+    <timezone id="America/Los_Angeles">PST (Los Angeles)</timezone>
+    <timezone id="America/Tijuana">PST (Tijuana)</timezone>
+    <timezone id="America/Phoenix">MST (Phoenix)</timezone>
     <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Denver</timezone>
-    <timezone id="America/Costa_Rica">Costa Rica</timezone>
-    <timezone id="America/Chicago">Chicago</timezone>
-    <timezone id="America/Mexico_City">Mexico by</timezone>
-    <timezone id="America/Regina">Regina</timezone>
+    <timezone id="America/Denver">MST (Denver)</timezone>
+    <timezone id="America/Costa_Rica">Normaltid (Costa Rica)</timezone>
+    <timezone id="America/Chicago">Normaltid (Chicago)</timezone>
+    <timezone id="America/Mexico_City">Normaltid (Mexico by)</timezone>
+    <timezone id="America/Regina">Normaltid (Regina)</timezone>
     <timezone id="America/Bogota">Bogotá</timezone>
     <timezone id="America/New_York">New York</timezone>
     <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Barbados</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
+    <timezone id="America/Barbados">AT (Barbados)</timezone>
+    <timezone id="America/Manaus">Amazonas-tid (Manaus)</timezone>
     <timezone id="America/Santiago">Santiago</timezone>
     <timezone id="America/St_Johns">St. John's</timezone>
-    <timezone id="America/Araguaina">Araguaína</timezone>
+    <timezone id="America/Araguaina">Brasilia-tid (Araguaína)</timezone>
     <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
     <timezone id="America/Godthab">Godthåb</timezone>
     <timezone id="America/Montevideo">Montevideo</timezone>
@@ -62,11 +62,12 @@
     <timezone id="Asia/Rangoon">Rangoon</timezone>
     <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
     <timezone id="Asia/Bangkok">Indokinesisk tid (Bangkok)</timezone>
+    <timezone id="Asia/Shanghai">Kinesisk standardtid (Beijing)</timezone>
     <timezone id="Asia/Hong_Kong">Hong Kong-tid (Hong Kong)</timezone>
     <timezone id="Asia/Irkutsk">Irkutsk</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
     <timezone id="Australia/Perth">Vestaustralsk tid (Perth)</timezone>
-    <timezone id="Asia/Taipei">Kinesisk standardtid (Taipei)</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
     <timezone id="Asia/Seoul">Koreansk standardtid (Seoul)</timezone>
     <timezone id="Asia/Tokyo">Japansk standardtid (Tokyo)</timezone>
     <timezone id="Asia/Yakutsk">Jakutsk</timezone>
diff --git a/res/xml-nl/timezones.xml b/res/xml-nl/timezones.xml
index e2315dfbc5a..ee2453e7abc 100644
--- a/res/xml-nl/timezones.xml
+++ b/res/xml-nl/timezones.xml
@@ -62,7 +62,7 @@
     <timezone id="Asia/Rangoon">Rangoon</timezone>
     <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
     <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Chinese standaardtijd (Peking)</timezone>
+    <timezone id="Asia/Shanghai">Chinese standaardtijd (Beijing)</timezone>
     <timezone id="Asia/Hong_Kong">Hongkong</timezone>
     <timezone id="Asia/Irkutsk">Irkoetsk</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
diff --git a/res/xml-no/timezones.xml b/res/xml-no/timezones.xml
deleted file mode 100644
index 85201b96e2a..00000000000
--- a/res/xml-no/timezones.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Los Angeles</timezone>
-    <timezone id="America/Tijuana">Tijuana</timezone>
-    <timezone id="America/Phoenix">Phoenix</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Denver</timezone>
-    <timezone id="America/Costa_Rica">Costa Rica</timezone>
-    <timezone id="America/Chicago">Chicago</timezone>
-    <timezone id="America/Mexico_City">Mexico City</timezone>
-    <timezone id="America/Regina">Regina</timezone>
-    <timezone id="America/Bogota">Bogota</timezone>
-    <timezone id="America/New_York">New York</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Barbados</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">St. John's</timezone>
-    <timezone id="America/Araguaina">Araguaina</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
-    <timezone id="America/Godthab">Godthab</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">South Georgia</timezone>
-    <timezone id="Atlantic/Azores">Azores</timezone>
-    <timezone id="Atlantic/Cape_Verde">Cape Verde</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">London</timezone>
-    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
-    <timezone id="Europe/Belgrade">Belgrade</timezone>
-    <timezone id="Europe/Brussels">Brussels</timezone>
-    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
-    <timezone id="Asia/Amman">Amman</timezone>
-    <timezone id="Europe/Athens">Athens</timezone>
-    <timezone id="Asia/Beirut">Beirut</timezone>
-    <timezone id="Africa/Cairo">Cairo</timezone>
-    <timezone id="Europe/Helsinki">Helsinki</timezone>
-    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Harare</timezone>
-    <timezone id="Asia/Baghdad">Baghdad</timezone>
-    <timezone id="Europe/Moscow">Moscow</timezone>
-    <timezone id="Asia/Kuwait">Kuwait</timezone>
-    <timezone id="Africa/Nairobi">Nairobi</timezone>
-    <timezone id="Asia/Tehran">Tehran</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Yerevan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Kabul</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandu</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Beijing</timezone>
-    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Seoul</timezone>
-    <timezone id="Asia/Tokyo">Tokyo</timezone>
-    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
-    <timezone id="Australia/Adelaide">Adelaide</timezone>
-    <timezone id="Australia/Darwin">Darwin</timezone>
-    <timezone id="Australia/Brisbane">Brisbane</timezone>
-    <timezone id="Australia/Hobart">Hobart</timezone>
-    <timezone id="Australia/Sydney">Sydney</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
-    <timezone id="Pacific/Fiji">Fiji</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-pt/timezones.xml b/res/xml-pt/timezones.xml
index b77e30fd624..176d214353e 100644
--- a/res/xml-pt/timezones.xml
+++ b/res/xml-pt/timezones.xml
@@ -1,5 +1,5 @@
 <timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
+    <timezone id="Pacific/Majuro">Horário das Ilhas Marshall (Majuro)</timezone>
     <timezone id="Pacific/Midway">Midway</timezone>
     <timezone id="Pacific/Honolulu">Honolulu</timezone>
     <timezone id="America/Anchorage">Anchorage</timezone>
@@ -8,24 +8,24 @@
     <timezone id="America/Phoenix">Horário da Montanha (Phoenix)</timezone>
     <timezone id="America/Chihuahua">Chihuahua</timezone>
     <timezone id="America/Denver">Horário da Montanha (Denver)</timezone>
-    <timezone id="America/Costa_Rica">Horário Padrão Central (Costa Rica)</timezone>
-    <timezone id="America/Chicago">Horário Padrão Central (Chicago)</timezone>
-    <timezone id="America/Mexico_City">Horário Padrão Central (Cidade do México)</timezone>
-    <timezone id="America/Regina">Horário Padrão Central (Regina)</timezone>
-    <timezone id="America/Bogota">Bogotá</timezone>
-    <timezone id="America/New_York">Horário Padrão Oriental (Nova Iorque)</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
+    <timezone id="America/Costa_Rica">Horário Central (Costa Rica)</timezone>
+    <timezone id="America/Chicago">Horário Central (Chicago)</timezone>
+    <timezone id="America/Mexico_City">Horário Central (Cidade do México)</timezone>
+    <timezone id="America/Regina">Horário Central (Regina)</timezone>
+    <timezone id="America/Bogota">Horário da Colômbia (Bogotá)</timezone>
+    <timezone id="America/New_York">Horário Oriental (Nova York)</timezone>
+    <timezone id="America/Caracas">Horário da Venezuela (Caracas)</timezone>
     <timezone id="America/Barbados">Horário do Atlântico (Barbados)</timezone>
     <timezone id="America/Manaus">Horário do Amazonas (Manaus)</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">Horário Padrão de Terra Nova (St. Johns)</timezone>
-    <timezone id="America/Araguaina">Araguaína</timezone>
+    <timezone id="America/Santiago">Horário do Chile (Santiago)</timezone>
+    <timezone id="America/St_Johns">Horário de Terra Nova (St. Johns)</timezone>
+    <timezone id="America/Araguaina">Horário de Brasília (Araguaína)</timezone>
     <timezone id="America/Argentina/Buenos_Aires">Horário da Argentina (Buenos Aires)</timezone>
     <timezone id="America/Godthab">Horário da Groenlândia Ocidental (Godthab)</timezone>
-    <timezone id="America/Montevideo">Montevidéu</timezone>
-    <timezone id="Atlantic/South_Georgia">Geórgia do Sul</timezone>
+    <timezone id="America/Montevideo">Horário do Uruguai (Montevidéu)</timezone>
+    <timezone id="Atlantic/South_Georgia">Horário da Geórgia do Sul (Geórgia do Sul)</timezone>
     <timezone id="Atlantic/Azores">Açores</timezone>
-    <timezone id="Atlantic/Cape_Verde">Cabo Verde</timezone>
+    <timezone id="Atlantic/Cape_Verde">Horário do Cabo Verde (Cabo Verde)</timezone>
     <timezone id="Africa/Casablanca">Casablanca</timezone>
     <timezone id="Europe/London">Horário do Meridiano de Greenwich (Londres)</timezone>
     <timezone id="Europe/Amsterdam">Horário da Europa Central (Amsterdã)</timezone>
@@ -39,46 +39,47 @@
     <timezone id="Asia/Beirut">Horário Padrão da Europa Oriental (Beirute)</timezone>
     <timezone id="Africa/Cairo">Horário Padrão da Europa Oriental (Cairo)</timezone>
     <timezone id="Europe/Helsinki">Horário Padrão da Europa Oriental (Helsinque)</timezone>
-    <timezone id="Asia/Jerusalem">Horário Padrão de Israel (Jerusalém)</timezone>
+    <timezone id="Asia/Jerusalem">Horário de Israel (Jerusalém)</timezone>
     <timezone id="Europe/Minsk">Minsk</timezone>
     <timezone id="Africa/Harare">Horário da África Central (Harare)</timezone>
-    <timezone id="Asia/Baghdad">Bagdá</timezone>
+    <timezone id="Asia/Baghdad">Horário da Arábia (Bagdá)</timezone>
     <timezone id="Europe/Moscow">Moscou</timezone>
-    <timezone id="Asia/Kuwait">Kuwait</timezone>
+    <timezone id="Asia/Kuwait">Horário da Arábia (Kuwait)</timezone>
     <timezone id="Africa/Nairobi">Horário da África Oriental (Nairóbi)</timezone>
-    <timezone id="Asia/Tehran">Teerã</timezone>
+    <timezone id="Asia/Tehran">Horário Padrão do Irã (Teerã)</timezone>
     <timezone id="Asia/Baku">Baku</timezone>
     <timezone id="Asia/Tbilisi">Tbilisi</timezone>
     <timezone id="Asia/Yerevan">Ierevan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Cabul</timezone>
+    <timezone id="Asia/Dubai">Horário do Golfo (Dubai)</timezone>
+    <timezone id="Asia/Kabul">Horário do Afeganistão (Cabul)</timezone>
     <timezone id="Asia/Karachi">Karachi</timezone>
     <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
+    <timezone id="Asia/Yekaterinburg">Ecaterimburgo</timezone>
     <timezone id="Asia/Calcutta">Horário Padrão da Índia (Calcutta)</timezone>
     <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Catmandu</timezone>
+    <timezone id="Asia/Katmandu">Horário do Nepal (Catmandu)</timezone>
     <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
+    <timezone id="Asia/Rangoon">Horário de Mianmar (Rangoon)</timezone>
+    <timezone id="Asia/Krasnoyarsk">Horário de Krasnoyarsk (Krasnoyarsk)</timezone>
+    <timezone id="Asia/Bangkok">Horário da Indochina (Bangkok)</timezone>
+    <timezone id="Asia/Shanghai">Horário da China (Beijing)</timezone>
+    <timezone id="Asia/Hong_Kong">Horário de Hong Kong (Hong Kong)</timezone>
+    <timezone id="Asia/Irkutsk">Horário de Irkutsk (Irkutsk)</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Horário Padrão da China (Taipei)</timezone>
-    <timezone id="Asia/Seoul">Seul</timezone>
-    <timezone id="Asia/Tokyo">Horário Padrão do Japão (Tóquio)</timezone>
-    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
+    <timezone id="Australia/Perth">Horário da Austrália Ocidental (Perth)</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
+    <timezone id="Asia/Seoul">Horário da Coréia (Seul)</timezone>
+    <timezone id="Asia/Tokyo">Horário do Japão (Tóquio)</timezone>
+    <timezone id="Asia/Yakutsk">Horário de Yakutsk (Yakutsk)</timezone>
     <timezone id="Australia/Adelaide">Horário da Austrália Central (Adelaide)</timezone>
     <timezone id="Australia/Darwin">Horário da Austrália Central (Darwin)</timezone>
     <timezone id="Australia/Brisbane">Horário da Austrália Oriental (Brisbane)</timezone>
     <timezone id="Australia/Hobart">Horário da Austrália Oriental (Hobart)</timezone>
     <timezone id="Australia/Sydney">Horário da Austrália Oriental (Sydney)</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
+    <timezone id="Asia/Vladivostok">Horário de Vladivostok (Vladivostok)</timezone>
     <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
+    <timezone id="Asia/Magadan">Horário de Magadan (Magadan)</timezone>
     <timezone id="Pacific/Auckland">Horário da Nova Zelândia (Auckland)</timezone>
-    <timezone id="Pacific/Fiji">Fiji</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
+    <timezone id="Pacific/Fiji">Horário de Fiji (Fiji)</timezone>
+    <timezone id="Pacific/Tongatapu">Horário de Tonga (Tongatapu)</timezone>
 </timezones>
diff --git a/res/xml-ro/timezones.xml b/res/xml-ro/timezones.xml
index c875ef73806..c87d0e0b6f3 100644
--- a/res/xml-ro/timezones.xml
+++ b/res/xml-ro/timezones.xml
@@ -3,49 +3,49 @@
     <timezone id="Pacific/Midway">Midway</timezone>
     <timezone id="Pacific/Honolulu">Honolulu</timezone>
     <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Los Angeles</timezone>
-    <timezone id="America/Tijuana">Tijuana</timezone>
-    <timezone id="America/Phoenix">Phoenix</timezone>
+    <timezone id="America/Los_Angeles">Ora zonei Pacific (Los Angeles)</timezone>
+    <timezone id="America/Tijuana">Ora zonei Pacific (Tijuana)</timezone>
+    <timezone id="America/Phoenix">Ora zonei montane (Phoenix)</timezone>
     <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Denver</timezone>
-    <timezone id="America/Costa_Rica">Costa Rica</timezone>
-    <timezone id="America/Chicago">Chicago</timezone>
-    <timezone id="America/Mexico_City">Mexico City</timezone>
-    <timezone id="America/Regina">Regina</timezone>
+    <timezone id="America/Denver">Ora zonei montane (Denver)</timezone>
+    <timezone id="America/Costa_Rica">Ora Centrală (Costa Rica)</timezone>
+    <timezone id="America/Chicago">Ora Centrală (Chicago)</timezone>
+    <timezone id="America/Mexico_City">Ora Centrală (Mexico City)</timezone>
+    <timezone id="America/Regina">Ora Centrală (Regina)</timezone>
     <timezone id="America/Bogota">Bogota</timezone>
-    <timezone id="America/New_York">New York</timezone>
+    <timezone id="America/New_York">Ora orientală (New York)</timezone>
     <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Barbados</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
+    <timezone id="America/Barbados">Ora zonei Atlantic (Barbados)</timezone>
+    <timezone id="America/Manaus">Ora Amazon (Manaus)</timezone>
     <timezone id="America/Santiago">Santiago</timezone>
     <timezone id="America/St_Johns">St. John's</timezone>
     <timezone id="America/Araguaina">Araguaina</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Ora Argentinei (Buenos Aires)</timezone>
     <timezone id="America/Godthab">Godthab</timezone>
     <timezone id="America/Montevideo">Montevideo</timezone>
     <timezone id="Atlantic/South_Georgia">Georgia de Sud</timezone>
     <timezone id="Atlantic/Azores">Azore</timezone>
     <timezone id="Atlantic/Cape_Verde">Capul Verde</timezone>
     <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">Londra</timezone>
-    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
-    <timezone id="Europe/Belgrade">Belgrade</timezone>
-    <timezone id="Europe/Brussels">Bruxelles</timezone>
-    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
+    <timezone id="Europe/London">Greenwich Mean Time (Londra)</timezone>
+    <timezone id="Europe/Amsterdam">Ora Europei Centrale (Amsterdam)</timezone>
+    <timezone id="Europe/Belgrade">Ora Europei Centrale (Belgrade)</timezone>
+    <timezone id="Europe/Brussels">Ora Europei Centrale (Bruxelles)</timezone>
+    <timezone id="Europe/Sarajevo">Ora Europei Centrale (Sarajevo)</timezone>
     <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
-    <timezone id="Asia/Amman">Amman</timezone>
-    <timezone id="Europe/Athens">Atena</timezone>
-    <timezone id="Asia/Beirut">Beirut</timezone>
-    <timezone id="Africa/Cairo">Cairo</timezone>
-    <timezone id="Europe/Helsinki">Helsinki</timezone>
+    <timezone id="Africa/Brazzaville">Ora Africii Occidentale (Brazzaville)</timezone>
+    <timezone id="Asia/Amman">Ora Europei de Est (Amman)</timezone>
+    <timezone id="Europe/Athens">Ora Europei de Est (Atena)</timezone>
+    <timezone id="Asia/Beirut">Ora Europei de Est (Beirut)</timezone>
+    <timezone id="Africa/Cairo">Ora Europei de Est (Cairo)</timezone>
+    <timezone id="Europe/Helsinki">Ora Europei de Est (Helsinki)</timezone>
     <timezone id="Asia/Jerusalem">Ierusalim</timezone>
     <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Harare</timezone>
+    <timezone id="Africa/Harare">Ora Africii Centrale (Harare)</timezone>
     <timezone id="Asia/Baghdad">Bagdad</timezone>
     <timezone id="Europe/Moscow">Moscova</timezone>
     <timezone id="Asia/Kuwait">Kuweit</timezone>
-    <timezone id="Africa/Nairobi">Nairobi</timezone>
+    <timezone id="Africa/Nairobi">Ora Africii Orientale (Nairobi)</timezone>
     <timezone id="Asia/Tehran">Teheran</timezone>
     <timezone id="Asia/Baku">Baku</timezone>
     <timezone id="Asia/Tbilisi">Tbilisi</timezone>
@@ -60,21 +60,22 @@
     <timezone id="Asia/Katmandu">Katmandu</timezone>
     <timezone id="Asia/Almaty">Almaty</timezone>
     <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnoiarsk</timezone>
     <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Shanghai">Beijing</timezone>
     <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
     <timezone id="Asia/Irkutsk">Irkuțk</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Perth</timezone>
+    <timezone id="Australia/Perth">Ora Australiei Occidentale (Perth)</timezone>
     <timezone id="Asia/Taipei">Taipei</timezone>
     <timezone id="Asia/Seoul">Seul</timezone>
     <timezone id="Asia/Tokyo">Tokyo</timezone>
     <timezone id="Asia/Yakutsk">Yakuțk</timezone>
-    <timezone id="Australia/Adelaide">Adelaide</timezone>
-    <timezone id="Australia/Darwin">Darwin</timezone>
-    <timezone id="Australia/Brisbane">Brisbane</timezone>
-    <timezone id="Australia/Hobart">Hobart</timezone>
-    <timezone id="Australia/Sydney">Sydney</timezone>
+    <timezone id="Australia/Adelaide">Ora Australiei Centrale (Adelaide)</timezone>
+    <timezone id="Australia/Darwin">Ora Australiei Centrale (Darwin)</timezone>
+    <timezone id="Australia/Brisbane">Ora Australiei Orientale (Brisbane)</timezone>
+    <timezone id="Australia/Hobart">Ora Australiei Orientale (Hobart)</timezone>
+    <timezone id="Australia/Sydney">Ora Australiei Orientale (Sydney)</timezone>
     <timezone id="Asia/Vladivostok">Vladivostok</timezone>
     <timezone id="Pacific/Guam">Guam</timezone>
     <timezone id="Asia/Magadan">Magadan</timezone>
diff --git a/res/xml-sk/timezones.xml b/res/xml-sk/timezones.xml
index bd00b105400..2f4254cf3ce 100644
--- a/res/xml-sk/timezones.xml
+++ b/res/xml-sk/timezones.xml
@@ -62,6 +62,7 @@
     <timezone id="Asia/Rangoon">Rangoon</timezone>
     <timezone id="Asia/Krasnoyarsk">Krasnojarsko</timezone>
     <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Shanghai">Peking</timezone>
     <timezone id="Asia/Hong_Kong">Hongkong</timezone>
     <timezone id="Asia/Irkutsk">Irkutsko</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
diff --git a/res/xml-sr/timezones.xml b/res/xml-sr/timezones.xml
index 1b7517a27c6..51caf083138 100644
--- a/res/xml-sr/timezones.xml
+++ b/res/xml-sr/timezones.xml
@@ -1,84 +1,85 @@
 <timezones>
-    <timezone id="Pacific/Majuro">Мајуро</timezone>
+    <timezone id="Pacific/Majuro">Маршалска Острва време (Мајуро)</timezone>
     <timezone id="Pacific/Midway">Мидвеј</timezone>
     <timezone id="Pacific/Honolulu">Хонолулу</timezone>
     <timezone id="America/Anchorage">Енкориџ</timezone>
-    <timezone id="America/Los_Angeles">Лос Анђелес</timezone>
-    <timezone id="America/Tijuana">Тихуана</timezone>
-    <timezone id="America/Phoenix">Феникс</timezone>
+    <timezone id="America/Los_Angeles">Пацифичко време (Лос Анђелес)</timezone>
+    <timezone id="America/Tijuana">Пацифичко време (Тихуана)</timezone>
+    <timezone id="America/Phoenix">Планинско време (Феникс)</timezone>
     <timezone id="America/Chihuahua">Чихуахуа</timezone>
-    <timezone id="America/Denver">Денвер</timezone>
-    <timezone id="America/Costa_Rica">Костарика</timezone>
-    <timezone id="America/Chicago">Чикаго</timezone>
-    <timezone id="America/Mexico_City">Мексико Сити</timezone>
-    <timezone id="America/Regina">Regina</timezone>
-    <timezone id="America/Bogota">Богота</timezone>
-    <timezone id="America/New_York">Њујорк</timezone>
-    <timezone id="America/Caracas">Каракас</timezone>
-    <timezone id="America/Barbados">Барбадос</timezone>
-    <timezone id="America/Manaus">Манаус</timezone>
-    <timezone id="America/Santiago">Сантијаго</timezone>
-    <timezone id="America/St_Johns">Св. Џон</timezone>
-    <timezone id="America/Araguaina">Арагвајана</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Буенос Аирес</timezone>
-    <timezone id="America/Godthab">Нук</timezone>
-    <timezone id="America/Montevideo">Монтевидео</timezone>
-    <timezone id="Atlantic/South_Georgia">Јужна Џорџија</timezone>
+    <timezone id="America/Denver">Планинско време (Денвер)</timezone>
+    <timezone id="America/Costa_Rica">Централно време (Костарика)</timezone>
+    <timezone id="America/Chicago">Централно време (Чикаго)</timezone>
+    <timezone id="America/Mexico_City">Централно време (Мексико Сити)</timezone>
+    <timezone id="America/Regina">Централно време (Регина)</timezone>
+    <timezone id="America/Bogota">Колумбија време (Богота)</timezone>
+    <timezone id="America/New_York">Источно време (Њујорк)</timezone>
+    <timezone id="America/Caracas">Венецуела време (Каракас)</timezone>
+    <timezone id="America/Barbados">Атланско време (Барбадос)</timezone>
+    <timezone id="America/Manaus">Амазон време (Манаус)</timezone>
+    <timezone id="America/Santiago">Чиле време (Сантијаго)</timezone>
+    <timezone id="America/St_Johns">Њуфаундленд време (Св. Џон)</timezone>
+    <timezone id="America/Araguaina">Бразилија време (Арагвајана)</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Аргентина време (Буенос Аирес)</timezone>
+    <timezone id="America/Godthab">Западни Гренланд време (Нук)</timezone>
+    <timezone id="America/Montevideo">Уругвај време (Монтевидео)</timezone>
+    <timezone id="Atlantic/South_Georgia">Јужна Џорџија време (Јужна Џорџија)</timezone>
     <timezone id="Atlantic/Azores">Азори</timezone>
-    <timezone id="Atlantic/Cape_Verde">Капе Верде</timezone>
+    <timezone id="Atlantic/Cape_Verde">Зелениртско време (Капе Верде)</timezone>
     <timezone id="Africa/Casablanca">Казабланка</timezone>
-    <timezone id="Europe/London">Лондон</timezone>
+    <timezone id="Europe/London">Гринвич средње време (Лондон)</timezone>
     <timezone id="Europe/Amsterdam">Средњеевропско време (Амстердам)</timezone>
     <timezone id="Europe/Belgrade">Средњеевропско време (Belgrade)</timezone>
     <timezone id="Europe/Brussels">Средњеевропско време (Брисел)</timezone>
     <timezone id="Europe/Sarajevo">Средњеевропско време (Sarajevo)</timezone>
     <timezone id="Africa/Windhoek">Виндхук</timezone>
-    <timezone id="Africa/Brazzaville">Бразавил</timezone>
+    <timezone id="Africa/Brazzaville">Западно-афричко време (Бразавил)</timezone>
     <timezone id="Asia/Amman">Источноевропско време (Аман)</timezone>
     <timezone id="Europe/Athens">Источноевропско време (Атина)</timezone>
     <timezone id="Asia/Beirut">Источноевропско време (Бејрут)</timezone>
     <timezone id="Africa/Cairo">Источноевропско време (Каиро)</timezone>
     <timezone id="Europe/Helsinki">Источноевропско време (Хелсинки)</timezone>
-    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
+    <timezone id="Asia/Jerusalem">Израелско стандардно време (Jerusalem)</timezone>
     <timezone id="Europe/Minsk">Минск</timezone>
-    <timezone id="Africa/Harare">Хараре</timezone>
-    <timezone id="Asia/Baghdad">Багдад</timezone>
+    <timezone id="Africa/Harare">Централно-афричко време (Хараре)</timezone>
+    <timezone id="Asia/Baghdad">Арабијско време (Багдад)</timezone>
     <timezone id="Europe/Moscow">Москва</timezone>
-    <timezone id="Asia/Kuwait">Кувајт</timezone>
-    <timezone id="Africa/Nairobi">Најроби</timezone>
-    <timezone id="Asia/Tehran">Техеран</timezone>
+    <timezone id="Asia/Kuwait">Арабијско време (Кувајт)</timezone>
+    <timezone id="Africa/Nairobi">Источно-афричко време (Најроби)</timezone>
+    <timezone id="Asia/Tehran">Иран стандардно време (Техеран)</timezone>
     <timezone id="Asia/Baku">Баку</timezone>
     <timezone id="Asia/Tbilisi">Тбилиси</timezone>
     <timezone id="Asia/Yerevan">Јереван</timezone>
-    <timezone id="Asia/Dubai">Дубаи</timezone>
+    <timezone id="Asia/Dubai">Залив време (Дубаи)</timezone>
     <timezone id="Asia/Kabul">Кабул</timezone>
     <timezone id="Asia/Karachi">Карачи</timezone>
     <timezone id="Asia/Oral">Орал</timezone>
     <timezone id="Asia/Yekaterinburg">Јекатеринбург</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Calcutta">Индијско стандардно време (Calcutta)</timezone>
     <timezone id="Asia/Colombo">Коломбо</timezone>
-    <timezone id="Asia/Katmandu">Катманду</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Рангун</timezone>
-    <timezone id="Asia/Krasnoyarsk">Краснојарск</timezone>
-    <timezone id="Asia/Bangkok">Банкок</timezone>
-    <timezone id="Asia/Hong_Kong">Хонг Конг</timezone>
-    <timezone id="Asia/Irkutsk">Иркуцк</timezone>
+    <timezone id="Asia/Katmandu">Непал време (Катманду)</timezone>
+    <timezone id="Asia/Almaty">Алмати</timezone>
+    <timezone id="Asia/Rangoon">Мијанмар време (Рангун)</timezone>
+    <timezone id="Asia/Krasnoyarsk">Краснојарск време (Краснојарск)</timezone>
+    <timezone id="Asia/Bangkok">Индокина време (Банкок)</timezone>
+    <timezone id="Asia/Shanghai">Кина време (Пекинг)</timezone>
+    <timezone id="Asia/Hong_Kong">Хонг Конг време (Хонг Конг)</timezone>
+    <timezone id="Asia/Irkutsk">Иркуцк време (Иркуцк)</timezone>
     <timezone id="Asia/Kuala_Lumpur">Куала Лумпур</timezone>
-    <timezone id="Australia/Perth">Перт</timezone>
+    <timezone id="Australia/Perth">Аустралијско западно време (Перт)</timezone>
     <timezone id="Asia/Taipei">Тајпеј</timezone>
-    <timezone id="Asia/Seoul">Сеул</timezone>
-    <timezone id="Asia/Tokyo">Токио</timezone>
-    <timezone id="Asia/Yakutsk">Јакутск</timezone>
-    <timezone id="Australia/Adelaide">Аделајд</timezone>
-    <timezone id="Australia/Darwin">Дарвин</timezone>
-    <timezone id="Australia/Brisbane">Бризбејн</timezone>
-    <timezone id="Australia/Hobart">Хобарт</timezone>
-    <timezone id="Australia/Sydney">Сиднеј</timezone>
-    <timezone id="Asia/Vladivostok">Владивосток</timezone>
+    <timezone id="Asia/Seoul">Кореја време (Сеул)</timezone>
+    <timezone id="Asia/Tokyo">Јапанско стандардно време (Токио)</timezone>
+    <timezone id="Asia/Yakutsk">Јакутск време (Јакутск)</timezone>
+    <timezone id="Australia/Adelaide">Аустралијско централно време (Аделаида)</timezone>
+    <timezone id="Australia/Darwin">Аустралијско централно време (Дарвин)</timezone>
+    <timezone id="Australia/Brisbane">Аустралијско источно време (Бризбејн)</timezone>
+    <timezone id="Australia/Hobart">Аустралијско источно време (Хобарт)</timezone>
+    <timezone id="Australia/Sydney">Аустралијско источно време (Сиднеј)</timezone>
+    <timezone id="Asia/Vladivostok">Владивосток време (Владивосток)</timezone>
     <timezone id="Pacific/Guam">Гуам</timezone>
-    <timezone id="Asia/Magadan">Магадан</timezone>
-    <timezone id="Pacific/Auckland">Окланд</timezone>
-    <timezone id="Pacific/Fiji">Фиџи</timezone>
-    <timezone id="Pacific/Tongatapu">Тонгатапу</timezone>
+    <timezone id="Asia/Magadan">Магадан време (Магадан)</timezone>
+    <timezone id="Pacific/Auckland">Нови Зеланд време (Окланд)</timezone>
+    <timezone id="Pacific/Fiji">Фиџи време (Фиџи)</timezone>
+    <timezone id="Pacific/Tongatapu">Тонга време (Тонгатапу)</timezone>
 </timezones>
diff --git a/res/xml-sv/timezones.xml b/res/xml-sv/timezones.xml
index aaed8282579..ecf99215b03 100644
--- a/res/xml-sv/timezones.xml
+++ b/res/xml-sv/timezones.xml
@@ -18,7 +18,7 @@
     <timezone id="America/Barbados">Atlantic, normaltid (Barbados)</timezone>
     <timezone id="America/Manaus">Amazonastid (Manaus)</timezone>
     <timezone id="America/Santiago">Chilensk tid (Santiago)</timezone>
-    <timezone id="America/St_Johns">Newfoundland, normaltid (S:t Johns)</timezone>
+    <timezone id="America/St_Johns">Newfoundland, normaltid (St. Johns)</timezone>
     <timezone id="America/Araguaina">Brasiliansk tid (Araguaina)</timezone>
     <timezone id="America/Argentina/Buenos_Aires">östargentinsk tid (Buenos Aires)</timezone>
     <timezone id="America/Godthab">Godthåb</timezone>
@@ -62,11 +62,12 @@
     <timezone id="Asia/Rangoon">Rangoon</timezone>
     <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
     <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Shanghai">Kinesisk tid (Peking)</timezone>
     <timezone id="Asia/Hong_Kong">Hongkong</timezone>
     <timezone id="Asia/Irkutsk">Irkutsk</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
     <timezone id="Australia/Perth">Västaustralisk tid (Perth)</timezone>
-    <timezone id="Asia/Taipei">Kinesisk tid (Taipei)</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
     <timezone id="Asia/Seoul">Söul</timezone>
     <timezone id="Asia/Tokyo">Japan, normaltid (Tokyo)</timezone>
     <timezone id="Asia/Yakutsk">Jakutsk</timezone>
diff --git a/res/xml-th/timezones.xml b/res/xml-th/timezones.xml
index d90c4991d84..f2fdabc387e 100644
--- a/res/xml-th/timezones.xml
+++ b/res/xml-th/timezones.xml
@@ -3,14 +3,14 @@
     <timezone id="Pacific/Midway">มิดเวย์</timezone>
     <timezone id="Pacific/Honolulu">โฮโนลูลู</timezone>
     <timezone id="America/Anchorage">แองเคอเรจ</timezone>
-    <timezone id="America/Los_Angeles">ลอสแอนเจลิส</timezone>
+    <timezone id="America/Los_Angeles">ลอสแองเจลิส</timezone>
     <timezone id="America/Tijuana">ทิฮัวนา</timezone>
     <timezone id="America/Phoenix">ฟีนิกซ์</timezone>
     <timezone id="America/Chihuahua">ชีวาวา</timezone>
     <timezone id="America/Denver">เดนเวอร์</timezone>
     <timezone id="America/Costa_Rica">คอสตาริกา</timezone>
     <timezone id="America/Chicago">ชิคาโก</timezone>
-    <timezone id="America/Mexico_City">เม็กซิโกซิตี้</timezone>
+    <timezone id="America/Mexico_City">เม็กซิโกซิตี</timezone>
     <timezone id="America/Regina">ริไจนา</timezone>
     <timezone id="America/Bogota">โบโกตา</timezone>
     <timezone id="America/New_York">นิวยอร์ก</timezone>
@@ -24,7 +24,7 @@
     <timezone id="America/Godthab">กอดแธบ</timezone>
     <timezone id="America/Montevideo">มอนเตวิเดโอ</timezone>
     <timezone id="Atlantic/South_Georgia">เซาท์ จอร์เจีย</timezone>
-    <timezone id="Atlantic/Azores">อาโซเรช</timezone>
+    <timezone id="Atlantic/Azores">อาซอเรส</timezone>
     <timezone id="Atlantic/Cape_Verde">เคปเวิร์ด</timezone>
     <timezone id="Africa/Casablanca">คาสซาบลางก้า</timezone>
     <timezone id="Europe/London">ลอนดอน</timezone>
@@ -53,15 +53,16 @@
     <timezone id="Asia/Dubai">ดูใบ</timezone>
     <timezone id="Asia/Kabul">คาบูล</timezone>
     <timezone id="Asia/Karachi">การาจี</timezone>
-    <timezone id="Asia/Oral">โอรัล</timezone>
-    <timezone id="Asia/Yekaterinburg">เยคาเตรินบูร์ก</timezone>
+    <timezone id="Asia/Oral">ออรัล</timezone>
+    <timezone id="Asia/Yekaterinburg">ยีคาเตอรินเบิร์ก</timezone>
     <timezone id="Asia/Calcutta">Calcutta</timezone>
     <timezone id="Asia/Colombo">โคลัมโบ</timezone>
     <timezone id="Asia/Katmandu">กาตมันดุ</timezone>
     <timezone id="Asia/Almaty">อัลมาตี</timezone>
     <timezone id="Asia/Rangoon">ย่างกุ้ง</timezone>
-    <timezone id="Asia/Krasnoyarsk">ครัสโนยาสค์</timezone>
+    <timezone id="Asia/Krasnoyarsk">ครัสโนยาร์สก์</timezone>
     <timezone id="Asia/Bangkok">กรุงเทพ</timezone>
+    <timezone id="Asia/Shanghai">Beijing</timezone>
     <timezone id="Asia/Hong_Kong">ฮ่องกง</timezone>
     <timezone id="Asia/Irkutsk">อีร์คุตสค์</timezone>
     <timezone id="Asia/Kuala_Lumpur">กัวลาลัมเปอร์</timezone>
@@ -75,7 +76,7 @@
     <timezone id="Australia/Brisbane">บริสเบน</timezone>
     <timezone id="Australia/Hobart">โฮบาร์ต</timezone>
     <timezone id="Australia/Sydney">ซิดนีย์</timezone>
-    <timezone id="Asia/Vladivostok">วลาดีวอสตอค</timezone>
+    <timezone id="Asia/Vladivostok">วลาดิโวสต็อก</timezone>
     <timezone id="Pacific/Guam">กวม</timezone>
     <timezone id="Asia/Magadan">มากาดาน</timezone>
     <timezone id="Pacific/Auckland">โอคแลนด์</timezone>
diff --git a/res/xml-tr/timezones.xml b/res/xml-tr/timezones.xml
index 31f5d4668d0..18a341ed660 100644
--- a/res/xml-tr/timezones.xml
+++ b/res/xml-tr/timezones.xml
@@ -9,7 +9,7 @@
     <timezone id="America/Chihuahua">Chihuahua</timezone>
     <timezone id="America/Denver">ABD Sıradağlar Saati (Denver)</timezone>
     <timezone id="America/Costa_Rica">Merkezi Saat (Kosta Rika)</timezone>
-    <timezone id="America/Chicago">Merkezi Saat (Şikago)</timezone>
+    <timezone id="America/Chicago">Merkezi Saat (Chicago)</timezone>
     <timezone id="America/Mexico_City">Merkezi Saat (Meksiko City)</timezone>
     <timezone id="America/Regina">Merkezi Saat (Regina)</timezone>
     <timezone id="America/Bogota">Kolombiya Saati (Bogota)</timezone>
@@ -42,9 +42,9 @@
     <timezone id="Asia/Jerusalem">İsrail Saati (Kudüs)</timezone>
     <timezone id="Europe/Minsk">Minsk</timezone>
     <timezone id="Africa/Harare">Orta Afrika Saati (Harare)</timezone>
-    <timezone id="Asia/Baghdad">Arap Saati (Bağdat)</timezone>
+    <timezone id="Asia/Baghdad">Arabistan Saati (Bağdat)</timezone>
     <timezone id="Europe/Moscow">Moskova</timezone>
-    <timezone id="Asia/Kuwait">Arap Saati (Kuveyt)</timezone>
+    <timezone id="Asia/Kuwait">Arabistan Saati (Kuveyt)</timezone>
     <timezone id="Africa/Nairobi">Doğu Afrika Saati (Nairobi)</timezone>
     <timezone id="Asia/Tehran">İran Standart Saati (Tahran)</timezone>
     <timezone id="Asia/Baku">Bakü</timezone>
@@ -62,11 +62,12 @@
     <timezone id="Asia/Rangoon">Myanmar Saati (Rangoon)</timezone>
     <timezone id="Asia/Krasnoyarsk">Krasnoyarsk Saati (Krasnoyarsk)</timezone>
     <timezone id="Asia/Bangkok">Çinhindi Saati (Bangkok)</timezone>
+    <timezone id="Asia/Shanghai">Çin Saati (Pekin)</timezone>
     <timezone id="Asia/Hong_Kong">Hong Kong Saati (Hong Kong)</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk Saati (İrkutsk)</timezone>
+    <timezone id="Asia/Irkutsk">İrkutsk Saati (İrkutsk)</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
     <timezone id="Australia/Perth">Batı Avustralya Saati (Perth)</timezone>
-    <timezone id="Asia/Taipei">Çin Saati (Taipei)</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
     <timezone id="Asia/Seoul">Kore Saati (Seul)</timezone>
     <timezone id="Asia/Tokyo">Japonya Saati (Tokyo)</timezone>
     <timezone id="Asia/Yakutsk">Yakutsk Saati (Yakutsk)</timezone>
diff --git a/res/xml-uk/timezones.xml b/res/xml-uk/timezones.xml
index 55192ef13ca..2337570b4bb 100644
--- a/res/xml-uk/timezones.xml
+++ b/res/xml-uk/timezones.xml
@@ -62,6 +62,7 @@
     <timezone id="Asia/Rangoon">Рангун</timezone>
     <timezone id="Asia/Krasnoyarsk">Красноярськ</timezone>
     <timezone id="Asia/Bangkok">Бангкок</timezone>
+    <timezone id="Asia/Shanghai">Пекін</timezone>
     <timezone id="Asia/Hong_Kong">Гонконг</timezone>
     <timezone id="Asia/Irkutsk">Іркутськ</timezone>
     <timezone id="Asia/Kuala_Lumpur">Куала-Лумпур</timezone>
diff --git a/res/xml-zh/timezones.xml b/res/xml-zh/timezones.xml
index 7f852aa979d..1129e7c33b3 100644
--- a/res/xml-zh/timezones.xml
+++ b/res/xml-zh/timezones.xml
@@ -3,26 +3,26 @@
     <timezone id="Pacific/Midway">中途岛</timezone>
     <timezone id="Pacific/Honolulu">檀香山</timezone>
     <timezone id="America/Anchorage">安克雷奇</timezone>
-    <timezone id="America/Los_Angeles">太平洋标准时间 (洛杉矶)</timezone>
-    <timezone id="America/Tijuana">太平洋标准时间 (提华纳)</timezone>
-    <timezone id="America/Phoenix">山区标准时间 (凤凰城)</timezone>
+    <timezone id="America/Los_Angeles">美国太平洋时间 (洛杉矶)</timezone>
+    <timezone id="America/Tijuana">美国太平洋时间 (提华纳)</timezone>
+    <timezone id="America/Phoenix">美国山区时间 (凤凰城)</timezone>
     <timezone id="America/Chihuahua">奇瓦瓦</timezone>
-    <timezone id="America/Denver">山区标准时间 (丹佛)</timezone>
-    <timezone id="America/Costa_Rica">中部标准时间 (哥斯达黎加)</timezone>
-    <timezone id="America/Chicago">中部标准时间 (芝加哥)</timezone>
-    <timezone id="America/Mexico_City">中部标准时间 (墨西哥城)</timezone>
-    <timezone id="America/Regina">中部标准时间 (里贾纳)</timezone>
-    <timezone id="America/Bogota">波哥大</timezone>
-    <timezone id="America/New_York">东部标准时间 (纽约)</timezone>
-    <timezone id="America/Caracas">加拉加斯</timezone>
-    <timezone id="America/Barbados">大西洋标准时间 (巴巴多斯)</timezone>
-    <timezone id="America/Manaus">亚马逊时间 (马瑙斯)</timezone>
+    <timezone id="America/Denver">美国山区时间 (丹佛)</timezone>
+    <timezone id="America/Costa_Rica">美国中部时间 (哥斯达黎加)</timezone>
+    <timezone id="America/Chicago">美国中部时间 (芝加哥)</timezone>
+    <timezone id="America/Mexico_City">美国中部时间 (墨西哥城)</timezone>
+    <timezone id="America/Regina">美国中部时间 (里贾纳)</timezone>
+    <timezone id="America/Bogota">哥伦比亚时间 (波哥大)</timezone>
+    <timezone id="America/New_York">美国东部时间 (纽约)</timezone>
+    <timezone id="America/Caracas">委内瑞拉时间 (加拉加斯)</timezone>
+    <timezone id="America/Barbados">大西洋时间 (巴巴多斯)</timezone>
+    <timezone id="America/Manaus">亚马逊标准时间 (马瑙斯)</timezone>
     <timezone id="America/Santiago">圣地亚哥</timezone>
-    <timezone id="America/St_Johns">纽芬兰标准时间 (圣约翰)</timezone>
+    <timezone id="America/St_Johns">纽芬兰时间 (圣约翰)</timezone>
     <timezone id="America/Araguaina">阿拉瓜伊纳</timezone>
     <timezone id="America/Argentina/Buenos_Aires">布宜诺斯艾利斯</timezone>
     <timezone id="America/Godthab">戈特霍布</timezone>
-    <timezone id="America/Montevideo">蒙得维的亚</timezone>
+    <timezone id="America/Montevideo">乌拉圭时间 (蒙得维的亚)</timezone>
     <timezone id="Atlantic/South_Georgia">南乔治亚</timezone>
     <timezone id="Atlantic/Azores">亚述尔群岛</timezone>
     <timezone id="Atlantic/Cape_Verde">佛得角</timezone>
@@ -33,52 +33,52 @@
     <timezone id="Europe/Brussels">中欧标准时间 (布鲁塞尔)</timezone>
     <timezone id="Europe/Sarajevo">中欧标准时间 (萨拉热窝)</timezone>
     <timezone id="Africa/Windhoek">温得和克</timezone>
-    <timezone id="Africa/Brazzaville">西部非洲时间 (布拉扎维)</timezone>
+    <timezone id="Africa/Brazzaville">西部非洲标准时间 (布拉扎维)</timezone>
     <timezone id="Asia/Amman">东欧标准时间 (安曼)</timezone>
     <timezone id="Europe/Athens">东欧标准时间 (雅典)</timezone>
     <timezone id="Asia/Beirut">东欧标准时间 (贝鲁特)</timezone>
     <timezone id="Africa/Cairo">东欧标准时间 (开罗)</timezone>
     <timezone id="Europe/Helsinki">东欧标准时间 (赫尔辛基)</timezone>
-    <timezone id="Asia/Jerusalem">以色列标准时间 (耶路撒冷)</timezone>
+    <timezone id="Asia/Jerusalem">以色列时间 (耶路撒冷)</timezone>
     <timezone id="Europe/Minsk">明斯克</timezone>
-    <timezone id="Africa/Harare">非洲中部时间 (哈拉雷)</timezone>
+    <timezone id="Africa/Harare">中部非洲标准时间 (哈拉雷)</timezone>
     <timezone id="Asia/Baghdad">巴格达</timezone>
     <timezone id="Europe/Moscow">莫斯科</timezone>
     <timezone id="Asia/Kuwait">科威特</timezone>
-    <timezone id="Africa/Nairobi">非洲东部时间 (内罗毕)</timezone>
-    <timezone id="Asia/Tehran">德黑兰</timezone>
+    <timezone id="Africa/Nairobi">东部非洲标准时间 (内罗毕)</timezone>
+    <timezone id="Asia/Tehran">伊朗标准时间 (德黑兰)</timezone>
     <timezone id="Asia/Baku">巴库</timezone>
     <timezone id="Asia/Tbilisi">第比利斯</timezone>
     <timezone id="Asia/Yerevan">埃里温</timezone>
     <timezone id="Asia/Dubai">迪拜</timezone>
-    <timezone id="Asia/Kabul">喀布尔</timezone>
+    <timezone id="Asia/Kabul">阿富汗时间 (喀布尔)</timezone>
     <timezone id="Asia/Karachi">卡拉奇</timezone>
     <timezone id="Asia/Oral">乌拉尔</timezone>
     <timezone id="Asia/Yekaterinburg">叶卡捷林堡</timezone>
     <timezone id="Asia/Calcutta">加尔各答</timezone>
     <timezone id="Asia/Colombo">科伦坡</timezone>
-    <timezone id="Asia/Katmandu">加德满都</timezone>
+    <timezone id="Asia/Katmandu">尼泊尔时间 (加德满都)</timezone>
     <timezone id="Asia/Almaty">阿拉木图</timezone>
-    <timezone id="Asia/Rangoon">仰光</timezone>
+    <timezone id="Asia/Rangoon">缅甸时间 (仰光)</timezone>
     <timezone id="Asia/Krasnoyarsk">克拉斯诺亚尔斯克</timezone>
     <timezone id="Asia/Bangkok">曼谷</timezone>
     <timezone id="Asia/Shanghai">中国标准时间 (北京)</timezone>
-    <timezone id="Asia/Hong_Kong">香港</timezone>
-    <timezone id="Asia/Irkutsk">伊尔库茨克</timezone>
+    <timezone id="Asia/Hong_Kong">香港时间 (香港)</timezone>
+    <timezone id="Asia/Irkutsk">伊尔库茨克时间 (伊尔库茨克)</timezone>
     <timezone id="Asia/Kuala_Lumpur">吉隆坡</timezone>
     <timezone id="Australia/Perth">佩思</timezone>
-    <timezone id="Asia/Taipei">台北</timezone>
+    <timezone id="Asia/Taipei">台北时间 (台北)</timezone>
     <timezone id="Asia/Seoul">首尔</timezone>
-    <timezone id="Asia/Tokyo">日本标准时间 (东京)</timezone>
-    <timezone id="Asia/Yakutsk">雅库茨克</timezone>
+    <timezone id="Asia/Tokyo">日本时间 (东京)</timezone>
+    <timezone id="Asia/Yakutsk">雅库茨克时间 (雅库茨克)</timezone>
     <timezone id="Australia/Adelaide">阿德莱德</timezone>
     <timezone id="Australia/Darwin">达尔文</timezone>
     <timezone id="Australia/Brisbane">布里斯班</timezone>
     <timezone id="Australia/Hobart">霍巴特</timezone>
     <timezone id="Australia/Sydney">悉尼</timezone>
-    <timezone id="Asia/Vladivostok">符拉迪沃斯托克</timezone>
+    <timezone id="Asia/Vladivostok">海参崴时间 (符拉迪沃斯托克)</timezone>
     <timezone id="Pacific/Guam">关岛</timezone>
-    <timezone id="Asia/Magadan">马加丹</timezone>
+    <timezone id="Asia/Magadan">马加丹时间 (马加丹)</timezone>
     <timezone id="Pacific/Auckland">奥克兰</timezone>
     <timezone id="Pacific/Fiji">斐济</timezone>
     <timezone id="Pacific/Tongatapu">东加塔布</timezone>
diff --git a/res/xml/apn_editor.xml b/res/xml/apn_editor.xml
index e9ded6ca002..3835a2c0674 100644
--- a/res/xml/apn_editor.xml
+++ b/res/xml/apn_editor.xml
@@ -101,10 +101,17 @@
         android:singleLine="true"
         android:inputType="number"
         />
+    <ListPreference
+        android:title="@string/apn_auth_type"
+        android:key="auth_type"
+        android:entries="@array/apn_auth_entries"
+        android:entryValues="@array/apn_auth_values"
+        />
     <EditTextPreference
         android:title="@string/apn_type"
         android:dialogTitle="@string/apn_type"
         android:key="apn_type"
         android:singleLine="true"
+        android:inputType="textNoSuggestions"
         />
 </PreferenceScreen>   
diff --git a/res/xml/application_settings.xml b/res/xml/application_settings.xml
index 8d0a7cb5153..b5418e810de 100644
--- a/res/xml/application_settings.xml
+++ b/res/xml/application_settings.xml
@@ -43,6 +43,14 @@
                 android:targetClass="com.android.settings.ManageApplications" />
     </PreferenceScreen>
 
+    <PreferenceScreen
+            android:title="@string/runningservices_settings_title"
+            android:summary="@string/runningservices_settings_summary">
+        <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.RunningServices" />
+    </PreferenceScreen>
+
     <PreferenceScreen 
             android:title="@string/development_settings_title" 
             android:summary="@string/development_settings_summary">
diff --git a/res/xml/device_info_memory.xml b/res/xml/device_info_memory.xml
index b7ec3c13a59..febd00f795d 100644
--- a/res/xml/device_info_memory.xml
+++ b/res/xml/device_info_memory.xml
@@ -38,13 +38,6 @@
             style="?android:attr/preferenceInformationStyle" 
             android:title="@string/memory_available"
             android:summary="00"/>
-        <PreferenceScreen 
-            android:title="@string/master_clear_title" 
-            android:summary="@string/master_clear_summary">
-            <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.MasterClear" />
-        </PreferenceScreen>
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 56810b47c4f..860c2ea012b 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -75,6 +75,12 @@
 
         </PreferenceScreen>
         
+        <PreferenceScreen
+                android:key="safetylegal"
+                android:title="@string/settings_safetylegal_title">
+            <intent android:action="android.settings.SAFETY" />
+        </PreferenceScreen>
+
         <!-- Contributors -->
         <!-- 
         <PreferenceScreen
diff --git a/res/xml/device_picker.xml b/res/xml/device_picker.xml
new file mode 100644
index 00000000000..7dd5b6887f1
--- /dev/null
+++ b/res/xml/device_picker.xml
@@ -0,0 +1,30 @@
+<?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.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <Preference
+        android:key="bt_scan"
+        android:title="@string/bluetooth_preference_scan_title" />
+
+    <com.android.settings.ProgressCategory
+        android:key="bt_device_list"
+        android:title="@string/bluetooth_devices"
+        android:orderingFromXml="false" />
+
+</PreferenceScreen>
+
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index 86893bd616b..47eb79550e8 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -15,8 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/language_settings">
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
     <PreferenceScreen
             android:title="@string/phone_language"
diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
new file mode 100644
index 00000000000..92955a54011
--- /dev/null
+++ b/res/xml/privacy_settings.xml
@@ -0,0 +1,50 @@
+<?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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory android:key="location_category"
+            android:title="@string/location_section_title">
+        <!-- Share location with Google -->
+        <CheckBoxPreference
+                android:key="use_location"
+                android:title="@string/use_location_title"
+                android:persistent="false"
+                android:summary="@string/use_location_summary"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory android:key="settings_category"
+            android:title="@string/settings_section_title">
+        <!-- Backup settings -->
+        <CheckBoxPreference
+                android:key="backup_settings"
+                android:title="@string/backup_settings_title"
+                android:persistent="false" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+            android:title="@string/personal_data_section_title">
+        <!-- Factory reset -->
+        <PreferenceScreen
+                android:title="@string/master_clear_title"
+                android:summary="@string/master_clear_summary">
+            <intent android:action="android.intent.action.MAIN"
+                    android:targetPackage="com.android.settings"
+                    android:targetClass="com.android.settings.MasterClear" />
+        </PreferenceScreen>
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/security_settings.xml b/res/xml/security_settings.xml
index 8dd9d897b38..1b735848b9c 100644
--- a/res/xml/security_settings.xml
+++ b/res/xml/security_settings.xml
@@ -32,11 +32,14 @@
             android:summaryOn="@string/location_street_level"
             android:summaryOff="@string/location_gps_disabled"/>
 
+<!-- Disabled to avoid confusion on devices with no AGPS
+     For Google experience devices we want AGPS on by default (if supported) so we don't really need this.
         <CheckBoxPreference
-            android:key="use_location"
-            android:title="@string/use_location_title"
-            android:persistent="false"
-            android:summary="@string/use_location_summary"/>
+            android:key="assisted_gps"
+            android:title="@string/assisted_gps"
+            android:summaryOn="@string/assisted_gps_enabled"
+            android:summaryOff="@string/assisted_gps_disabled"/>
+-->
 
     </PreferenceCategory>
             
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 9ca581ae019..79a777dc2d5 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -16,104 +16,96 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
     android:title="@string/settings_label"
     android:key="parent">
-            
-        <PreferenceScreen
+
+        <com.android.settings.IconPreferenceScreen
             android:title="@string/radio_controls_title"
-            android:summary="@string/radio_controls_summary">
+            settings:icon="@drawable/ic_settings_wireless">
             <intent
                 android:action="android.intent.action.MAIN"
                 android:targetPackage="com.android.settings"
                 android:targetClass="com.android.settings.WirelessSettings" />
-        </PreferenceScreen>
+        </com.android.settings.IconPreferenceScreen>
 
-        <PreferenceScreen
+        <com.android.settings.IconPreferenceScreen
             android:key="call_settings"
-            android:title="@string/call_settings_title"
-            android:summary="@string/call_settings_summary">
+            settings:icon="@drawable/ic_settings_call"
+            android:title="@string/call_settings_title">
             <intent
                 android:action="android.intent.action.MAIN"
                 android:targetPackage="com.android.phone"
                 android:targetClass="com.android.phone.CallFeaturesSetting" />
-        </PreferenceScreen>
+        </com.android.settings.IconPreferenceScreen>
 
         <!-- Sound and Display -->
-        
-        <PreferenceScreen
-            android:title="@string/sound_and_display_settings"
-            android:summary="@string/sound_and_display_settings_summary">
+
+        <com.android.settings.IconPreferenceScreen
+            settings:icon="@drawable/ic_settings_sound_display"
+            android:title="@string/sound_and_display_settings">
             <intent
                 android:action="android.intent.action.MAIN"
                 android:targetPackage="com.android.settings"
                 android:targetClass="com.android.settings.SoundAndDisplaySettings" />
-        </PreferenceScreen>
+        </com.android.settings.IconPreferenceScreen>
 
-        <!-- Data Sync. The settings activity will ensure this is resolved to an
-             activity on the system image, otherwise it will remove this
-             preference. -->
-        
-        <PreferenceScreen
-            android:title="@string/sync_settings"
-            android:summary="@string/sync_settings_summary"
-            android:key="sync_settings">
-            <intent android:action="android.settings.SYNC_SETTINGS" />
-        </PreferenceScreen>
+        <!-- Security & Location -->
 
-        <!-- Security & Privacy -->
-        
-        <PreferenceScreen
+        <com.android.settings.IconPreferenceScreen
+            settings:icon="@drawable/ic_settings_security"
             android:title="@string/security_settings_title"
-            android:summary="@string/security_settings_summary">
+            android:key="security_settings">
             <intent
                 android:action="android.intent.action.MAIN"
                 android:targetPackage="com.android.settings"
                 android:targetClass="com.android.settings.SecuritySettings" />
-        </PreferenceScreen>
+        </com.android.settings.IconPreferenceScreen>
 
         <!-- Application Settings -->
-        
-        <PreferenceScreen
+
+        <com.android.settings.IconPreferenceScreen
+            settings:icon="@drawable/ic_settings_applications"
             android:title="@string/applications_settings"
-            android:summary="@string/applications_settings_summary"
             android:key="applications_settings">
             <intent
                 android:action="android.intent.action.MAIN"
                 android:targetPackage="com.android.settings"
                 android:targetClass="com.android.settings.ApplicationSettings" />
-        </PreferenceScreen>
+        </com.android.settings.IconPreferenceScreen>
+
+        <!-- Data Sync. The settings activity will ensure this is resolved to an
+             activity on the system image, otherwise it will remove this
+             preference. -->
+
+        <com.android.settings.IconPreferenceScreen
+            settings:icon="@drawable/ic_settings_sync"
+            android:title="@string/sync_settings"
+            android:key="sync_settings">
+            <intent android:action="android.settings.SYNC_SETTINGS" />
+        </com.android.settings.IconPreferenceScreen>
+
+        <!-- Privacy -->
+
+        <com.android.settings.IconPreferenceScreen
+            settings:icon="@drawable/ic_settings_privacy"
+            android:title="@string/privacy_settings"
+            android:key="privacy_settings">
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.PrivacySettings" />
+        </com.android.settings.IconPreferenceScreen>
 
         <!-- Storage -->
-        
-        <PreferenceScreen 
-            android:title="@string/storage_settings_title" 
-            android:summary="@string/storage_settings_summary">
+
+        <com.android.settings.IconPreferenceScreen 
+            settings:icon="@drawable/ic_settings_storage"
+            android:title="@string/storage_settings">
             <intent android:action="android.intent.action.MAIN"
                 android:targetPackage="com.android.settings"
                 android:targetClass="com.android.settings.deviceinfo.Memory" />
-        </PreferenceScreen>
-
-        <!-- Date & Time -->
-        
-        <PreferenceScreen
-            android:title="@string/date_and_time_settings_title"
-            android:summary="@string/date_and_time_settings_summary">
-            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.DateTimeSettings" />
-        </PreferenceScreen>
-
-        <!-- Language -->
-
-        <PreferenceScreen
-            android:title="@string/language_settings"
-            android:summary="@string/language_settings_summary">
-            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.LanguageSettings" />
-        </PreferenceScreen>
+        </com.android.settings.IconPreferenceScreen>
 
         <!-- Search. 
              The settings activity will ensure that this is resolved to an
@@ -123,44 +115,66 @@
              android.app.SearchManager.INTENT_ACTION_SEARCH_SETTINGS.
              -->
 
-        <PreferenceScreen
+        <com.android.settings.IconPreferenceScreen
+            settings:icon="@drawable/ic_settings_search"
             android:title="@string/search_settings"
-            android:summary="@string/search_settings_summary"
             android:key="search_settings">
             <intent android:action="android.search.action.SEARCH_SETTINGS" />
-        </PreferenceScreen>
+        </com.android.settings.IconPreferenceScreen>
+
+        <!-- Language -->
+
+        <com.android.settings.IconPreferenceScreen
+            settings:icon="@drawable/ic_settings_language"
+            android:title="@string/language_settings">
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.LanguageSettings" />
+        </com.android.settings.IconPreferenceScreen>
 
         <!-- Accessibility feedback -->
 
-        <PreferenceScreen
-            android:title="@string/accessibility_settings_title"
-            android:summary="@string/accessibility_settings_summary">
+        <com.android.settings.IconPreferenceScreen
+            settings:icon="@drawable/ic_settings_accessibility"
+            android:title="@string/accessibility_settings">
             <intent
                 android:action="android.intent.action.MAIN"
                 android:targetPackage="com.android.settings"
                 android:targetClass="com.android.settings.AccessibilitySettings" />
-        </PreferenceScreen>
+        </com.android.settings.IconPreferenceScreen>
 
         <!-- Text-To-Speech -->
-        
-        <PreferenceScreen
-            android:title="@string/tts_settings"
-            android:summary="@string/tts_settings_summary">
+
+        <com.android.settings.IconPreferenceScreen
+            settings:icon="@drawable/ic_settings_speech"
+            android:title="@string/tts_settings">
             <intent
                 android:action="android.intent.action.MAIN"
                 android:targetPackage="com.android.settings"
                 android:targetClass="com.android.settings.TextToSpeechSettings" />
-        </PreferenceScreen>
+        </com.android.settings.IconPreferenceScreen>
+
+        <!-- Date & Time -->
+
+        <com.android.settings.IconPreferenceScreen
+            settings:icon="@drawable/ic_settings_date_time"
+            android:title="@string/date_and_time_settings_title">
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.DateTimeSettings" />
+        </com.android.settings.IconPreferenceScreen>
 
         <!-- About Device -->
- 
-        <PreferenceScreen
-            android:title="@string/about_settings"
-            android:summary="@string/about_settings_summary">
+
+        <com.android.settings.IconPreferenceScreen
+            settings:icon="@drawable/ic_settings_about"
+            android:title="@string/about_settings">
             <intent
                 android:action="android.intent.action.MAIN"
                 android:targetPackage="com.android.settings"
                 android:targetClass="com.android.settings.DeviceInfoSettings" />
-        </PreferenceScreen>
+        </com.android.settings.IconPreferenceScreen>
 
 </PreferenceScreen>
diff --git a/res/xml/sound_and_display_settings.xml b/res/xml/sound_and_display_settings.xml
index 639204a8aa5..8544fee740c 100644
--- a/res/xml/sound_and_display_settings.xml
+++ b/res/xml/sound_and_display_settings.xml
@@ -84,6 +84,14 @@
                 android:dependency="silent"
                 android:defaultValue="true" />
 
+        <CheckBoxPreference
+                android:key="haptic_feedback"
+                android:title="@string/haptic_feedback_enable_title"
+                android:summaryOn="@string/haptic_feedback_enable_summary_on"
+                android:summaryOff="@string/haptic_feedback_enable_summary_off"
+                android:dependency="silent"
+                android:defaultValue="true" />
+
         <CheckBoxPreference
                 android:key="play_media_notification_sounds"
                 android:title="@string/play_media_notification_sounds_enable_title"
@@ -110,11 +118,12 @@
             android:summaryOn="@string/accelerometer_summary_on"
             android:summaryOff="@string/accelerometer_summary_off"/>
     
-        <CheckBoxPreference
-                android:key="animations"
-                android:title="@string/animations_title"
-                android:summaryOn="@string/animations_summary_on"
-                android:summaryOff="@string/animations_summary_off" />
+	    <ListPreference
+	        android:key="animations"
+	        android:title="@string/animations_title" 
+            android:persistent="false"
+            android:entries="@array/animations_entries"
+            android:entryValues="@array/animations_values" />
 
         <com.android.settings.BrightnessPreference
                 android:key="brightness"
diff --git a/res/xml/wifi_access_points.xml b/res/xml/wifi_access_points.xml
new file mode 100644
index 00000000000..281093c73ba
--- /dev/null
+++ b/res/xml/wifi_access_points.xml
@@ -0,0 +1,30 @@
+<?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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/wifi_settings_category">
+
+    <com.android.settings.ProgressCategory
+            android:key="access_points"
+            android:title="@string/wifi_access_points"
+            android:persistent="false" />
+
+    <Preference
+            android:key="add_other_network"
+            android:title="@string/wifi_add_other_network"
+            android:persistent="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/wifi_settings.xml b/res/xml/wifi_settings.xml
index 9101e46e5f7..8a766746834 100644
--- a/res/xml/wifi_settings.xml
+++ b/res/xml/wifi_settings.xml
@@ -33,7 +33,7 @@
     <com.android.settings.ProgressCategory
             android:key="access_points"
             android:dependency="wifi_enabled"
-            android:title="@string/wifi_access_points" 
+            android:title="@string/wifi_access_points"
             android:persistent="false" />
 
     <Preference
@@ -42,4 +42,4 @@
             android:title="@string/wifi_add_other_network"
             android:persistent="false" />
 
-</PreferenceScreen>   
+</PreferenceScreen>
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 4731fb3f8fd..1bb55ef4b0f 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -14,70 +14,68 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/radio_controls_title">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-                <!-- Programmatically will have dynamic summary, but we provide the fallback summary. -->
-                <CheckBoxPreference
-                    android:key="toggle_wifi"
-                    android:title="@string/wifi_quick_toggle_title"
-                    android:summary="@string/wifi_quick_toggle_summary"
-                    android:persistent="false"
-                    android:dependency="toggle_airplane" />
+    <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/wifi_settings"
-                    android:summary="@string/wifi_settings_summary"
-                    android:dependency="toggle_airplane">
-                    <intent
-                        android:action="android.intent.action.MAIN"
-                        android:targetPackage="com.android.settings"
-                        android:targetClass="com.android.settings.wifi.WifiSettings" />
-                </PreferenceScreen>
+    <!-- Programmatically will have dynamic summary, but we provide the fallback summary. -->
+    <CheckBoxPreference
+        android:key="toggle_wifi"
+        android:title="@string/wifi_quick_toggle_title"
+        android:summary="@string/wifi_quick_toggle_summary"
+        android:persistent="false" />
 
-                <CheckBoxPreference
-                    android:key="toggle_bluetooth"
-                    android:title="@string/bluetooth_quick_toggle_title"
-                    android:summary="@string/bluetooth_quick_toggle_summary"
-                    android:persistent="false"
-                    android:dependency="toggle_airplane" />
+    <PreferenceScreen
+        android:key="wifi_settings"
+        android:title="@string/wifi_settings"
+        android:summary="@string/wifi_settings_summary" >
+        <intent
+            android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.settings"
+            android:targetClass="com.android.settings.wifi.WifiSettings" />
+    </PreferenceScreen>
 
-                <PreferenceScreen
-                    android:title="@string/bluetooth_settings_title"
-                    android:summary="@string/bluetooth_settings_summary"
-                    android:dependency="toggle_airplane">
-                    <intent
-                        android:action="android.intent.action.MAIN"
-                        android:targetPackage="com.android.settings"
-                        android:targetClass="com.android.settings.bluetooth.BluetoothSettings" />
-                </PreferenceScreen>
+    <CheckBoxPreference
+        android:key="toggle_bluetooth"
+        android:title="@string/bluetooth_quick_toggle_title"
+        android:summary="@string/bluetooth_quick_toggle_summary"
+        android:persistent="false"
+        android:dependency="toggle_airplane" />
 
-                <PreferenceScreen
-                    android:title="@string/vpn_settings_title"
-                    android:summary="@string/vpn_settings_summary"
-                    android:dependency="toggle_airplane">
-                    <intent
-                        android:action="android.intent.action.MAIN"
-                        android:targetPackage="com.android.settings"
-                        android:targetClass="com.android.settings.vpn.VpnSettings" />
-                </PreferenceScreen>
+    <PreferenceScreen
+        android:key="bt_settings"
+        android:title="@string/bluetooth_settings_title"
+        android:summary="@string/bluetooth_settings_summary"
+        android:dependency="toggle_airplane">
+        <intent
+            android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.settings"
+            android:targetClass="com.android.settings.bluetooth.BluetoothSettings" />
+    </PreferenceScreen>
 
-                <PreferenceScreen
-                    android:title="@string/network_settings_title"
-                    android:summary="@string/network_settings_summary"
-                    android:dependency="toggle_airplane">
-                    <intent
-                        android:action="android.intent.action.MAIN"
-                        android:targetPackage="com.android.phone"
-                        android:targetClass="com.android.phone.Settings" />
-                </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:key="vpn_settings"
+        android:title="@string/vpn_settings_title"
+        android:summary="@string/vpn_settings_summary" >
+        <intent
+            android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.settings"
+            android:targetClass="com.android.settings.vpn.VpnSettings" />
+    </PreferenceScreen>
 
+    <PreferenceScreen
+        android:title="@string/network_settings_title"
+        android:summary="@string/network_settings_summary"
+        android:dependency="toggle_airplane">
+        <intent
+            android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.phone"
+            android:targetClass="com.android.phone.Settings" />
+    </PreferenceScreen>
 
 </PreferenceScreen>
diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index 54e3f14af39..6199e50928e 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -130,7 +130,11 @@ public class AccessibilitySettings extends PreferenceActivity {
 
         int count = mAccessibilityServicesCategory.getPreferenceCount();
         for (int i = 0; i < count; i++) {
-            mAccessibilityServicesCategory.getPreference(i).setEnabled(isEnabled);
+            Preference pref = mAccessibilityServicesCategory.getPreference(i);
+            pref.setEnabled(isEnabled);
+            if (!isEnabled){
+               ((CheckBoxPreference) pref).setChecked(false);
+            }
         }
     }
 
diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java
index f105712260f..ff4b27dcc98 100644
--- a/src/com/android/settings/AirplaneModeEnabler.java
+++ b/src/com/android/settings/AirplaneModeEnabler.java
@@ -22,11 +22,14 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Handler;
 import android.os.Message;
+import android.os.SystemProperties;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.provider.Settings;
 import android.telephony.ServiceState;
 
+import com.android.internal.telephony.TelephonyProperties;
+
 public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListener {
 
     private final Context mContext;
@@ -74,7 +77,7 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene
         mCheckBoxPref.setOnPreferenceChangeListener(null);
     }
     
-    static boolean isAirplaneModeOn(Context context) {
+    public static boolean isAirplaneModeOn(Context context) {
         return Settings.System.getInt(context.getContentResolver(),
                 Settings.System.AIRPLANE_MODE_ON, 0) != 0;
     }
@@ -111,8 +114,23 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene
      * Called when someone clicks on the checkbox preference.
      */
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        setAirplaneModeOn((Boolean) newValue);
+        if (Boolean.parseBoolean(
+                    SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) {
+            // In ECM mode, do not update database at this point
+        } else {
+            setAirplaneModeOn((Boolean) newValue);
+        }
         return true;
     }
 
+    public void setAirplaneModeInECM(boolean isECMExit, boolean isAirplaneModeOn) {
+        if (isECMExit) {
+            // update database based on the current checkbox state
+            setAirplaneModeOn(isAirplaneModeOn);
+        } else {
+            // update checkbox state based on database value
+            onAirplaneModeChanged();
+        }
+    }
+
 }
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index 0bd91a825de..62856d119e7 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -27,28 +27,31 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.SystemProperties;
 import android.preference.EditTextPreference;
+import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.provider.Telephony;
-import com.android.internal.telephony.TelephonyProperties;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import com.android.internal.telephony.TelephonyProperties;
 
-public class ApnEditor extends PreferenceActivity 
-        implements SharedPreferences.OnSharedPreferenceChangeListener {
-    
+
+public class ApnEditor extends PreferenceActivity
+        implements SharedPreferences.OnSharedPreferenceChangeListener,
+                    Preference.OnPreferenceChangeListener {
 
     private final static String TAG = ApnEditor.class.getSimpleName();
-    
+
     private final static String SAVED_POS = "pos";
-    
+    private final static String KEY_AUTH_TYPE = "auth_type";
+
     private static final int MENU_DELETE = Menu.FIRST;
     private static final int MENU_SAVE = Menu.FIRST + 1;
     private static final int MENU_CANCEL = Menu.FIRST + 2;
-    
+
     private static String sNotSet;
     private EditTextPreference mName;
     private EditTextPreference mApn;
@@ -62,16 +65,18 @@ public class ApnEditor extends PreferenceActivity
     private EditTextPreference mMnc;
     private EditTextPreference mMmsProxy;
     private EditTextPreference mMmsPort;
+    private ListPreference mAuthType;
     private EditTextPreference mApnType;
+
     private String mCurMnc;
     private String mCurMcc;
-    
+
     private Uri mUri;
     private Cursor mCursor;
     private boolean mNewApn;
     private boolean mFirstTime;
     private Resources mRes;
-    
+
     /**
      * Standard projection for the interesting columns of a normal note.
      */
@@ -90,9 +95,10 @@ public class ApnEditor extends PreferenceActivity
             Telephony.Carriers.NUMERIC, // 11
             Telephony.Carriers.MMSPROXY,// 12
             Telephony.Carriers.MMSPORT, // 13
-            Telephony.Carriers.TYPE, // 14
+            Telephony.Carriers.AUTH_TYPE, // 14
+            Telephony.Carriers.TYPE, // 15
     };
-    
+
     private static final int ID_INDEX = 0;
     private static final int NAME_INDEX = 1;
     private static final int APN_INDEX = 2;
@@ -106,8 +112,10 @@ public class ApnEditor extends PreferenceActivity
     private static final int MNC_INDEX = 10;
     private static final int MMSPROXY_INDEX = 12;
     private static final int MMSPORT_INDEX = 13;
-    private static final int TYPE_INDEX = 14;
-    
+    private static final int AUTH_TYPE_INDEX = 14;
+    private static final int TYPE_INDEX = 15;
+
+
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -128,21 +136,24 @@ public class ApnEditor extends PreferenceActivity
         mMcc = (EditTextPreference) findPreference("apn_mcc");
         mMnc = (EditTextPreference) findPreference("apn_mnc");
         mApnType = (EditTextPreference) findPreference("apn_type");
-        
+
+        mAuthType = (ListPreference) findPreference("auth_type");
+        mAuthType.setOnPreferenceChangeListener(this);
+
         mRes = getResources();
-        
+
         final Intent intent = getIntent();
         final String action = intent.getAction();
 
         mFirstTime = icicle == null;
-        
+
         if (action.equals(Intent.ACTION_EDIT)) {
             mUri = intent.getData();
         } else if (action.equals(Intent.ACTION_INSERT)) {
-            if (mFirstTime) {
+            if (mFirstTime || icicle.getInt(SAVED_POS) == 0) {
                 mUri = getContentResolver().insert(intent.getData(), new ContentValues());
             } else {
-                mUri = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI, 
+                mUri = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI,
                         icicle.getInt(SAVED_POS));
             }
             mNewApn = true;
@@ -155,7 +166,7 @@ public class ApnEditor extends PreferenceActivity
                 finish();
                 return;
             }
-            
+
             // The new entry was created, so assume all will end well and
             // set the result to be returned.
             setResult(RESULT_OK, (new Intent()).setAction(mUri.toString()));
@@ -167,24 +178,26 @@ public class ApnEditor extends PreferenceActivity
 
         mCursor = managedQuery(mUri, sProjection, null, null);
         mCursor.moveToFirst();
-        
+
         fillUi();
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
+        getPreferenceScreen().getSharedPreferences()
+                .registerOnSharedPreferenceChangeListener(this);
     }
-    
+
     @Override
     public void onPause() {
-        getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
-        super.onPause();        
+        getPreferenceScreen().getSharedPreferences()
+                .unregisterOnSharedPreferenceChangeListener(this);
+        super.onPause();
     }
-    
+
     private void fillUi() {
-        if (mFirstTime) {            
+        if (mFirstTime) {
             mFirstTime = false;
             // Fill in all the values from the db in both text editor and summary
             mName.setText(mCursor.getString(NAME_INDEX));
@@ -201,7 +214,7 @@ public class ApnEditor extends PreferenceActivity
             mMnc.setText(mCursor.getString(MNC_INDEX));
             mApnType.setText(mCursor.getString(TYPE_INDEX));
             if (mNewApn) {
-                String numeric = 
+                String numeric =
                     SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC);
                 // MCC is first 3 chars and then in 2 - 3 chars of MNC
                 if (numeric != null && numeric.length() > 4) {
@@ -216,8 +229,13 @@ public class ApnEditor extends PreferenceActivity
                     mCurMcc = mcc;
                 }
             }
+            int authVal = mCursor.getInt(AUTH_TYPE_INDEX);
+            if (authVal != -1) {
+                mAuthType.setValueIndex(authVal);
+            }
+
         }
-        
+
         mName.setSummary(checkNull(mName.getText()));
         mApn.setSummary(checkNull(mApn.getText()));
         mProxy.setSummary(checkNull(mProxy.getText()));
@@ -231,6 +249,33 @@ public class ApnEditor extends PreferenceActivity
         mMcc.setSummary(checkNull(mMcc.getText()));
         mMnc.setSummary(checkNull(mMnc.getText()));
         mApnType.setSummary(checkNull(mApnType.getText()));
+
+        String authVal = mAuthType.getValue();
+        if (authVal != null) {
+            int authValIndex = Integer.parseInt(authVal);
+            mAuthType.setValueIndex(authValIndex);
+
+            String []values = mRes.getStringArray(R.array.apn_auth_entries);
+            mAuthType.setSummary(values[authValIndex]);
+        } else {
+            mAuthType.setSummary(sNotSet);
+        }
+    }
+
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        String key = preference.getKey();
+        if (KEY_AUTH_TYPE.equals(key)) {
+            try {
+                int index = Integer.parseInt((String) newValue);
+                mAuthType.setValueIndex(index);
+
+                String []values = mRes.getStringArray(R.array.apn_auth_entries);
+                mAuthType.setSummary(values[index]);
+            } catch (NumberFormatException e) {
+                return false;
+            }
+        }
+        return true;
     }
 
     @Override
@@ -268,7 +313,7 @@ public class ApnEditor extends PreferenceActivity
         }
         return super.onOptionsItemSelected(item);
     }
-    
+
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         switch (keyCode) {
@@ -285,10 +330,11 @@ public class ApnEditor extends PreferenceActivity
     @Override
     protected void onSaveInstanceState(Bundle icicle) {
         super.onSaveInstanceState(icicle);
-        validateAndSave(true);
-        icicle.putInt(SAVED_POS, mCursor.getInt(ID_INDEX));
+        if (validateAndSave(true)) {
+            icicle.putInt(SAVED_POS, mCursor.getInt(ID_INDEX));
+        }
     }
-    
+
     /**
      * Check the key fields' validity and save if valid.
      * @param force save even if the fields are not valid, if the app is
@@ -300,7 +346,7 @@ public class ApnEditor extends PreferenceActivity
         String apn = checkNotSet(mApn.getText());
         String mcc = checkNotSet(mMcc.getText());
         String mnc = checkNotSet(mMnc.getText());
-        
+
         String errorMsg = null;
         if (name.length() < 1) {
             errorMsg = mRes.getString(R.string.error_name_empty);
@@ -311,21 +357,30 @@ public class ApnEditor extends PreferenceActivity
         } else if ((mnc.length() & 0xFFFE) != 2) {
             errorMsg = mRes.getString(R.string.error_mnc_not23);
         }
-        
+
         if (errorMsg != null && !force) {
             showErrorMessage(errorMsg);
             return false;
         }
-        
+
         if (!mCursor.moveToFirst()) {
             Log.w(TAG,
                     "Could not go to the first row in the Cursor when saving data.");
             return false;
         }
-        
+
+        // If it's a new APN and a name or apn haven't been entered, then erase the entry
+        if (force && mNewApn && name.length() < 1 && apn.length() < 1) {
+            getContentResolver().delete(mUri, null, null);
+            return false;
+        }
+
         ContentValues values = new ContentValues();
-        
-        values.put(Telephony.Carriers.NAME, name);
+
+        // Add a dummy name "Untitled", if the user exits the screen without adding a name but 
+        // entered other information worth keeping.
+        values.put(Telephony.Carriers.NAME,
+                name.length() < 1 ? getResources().getString(R.string.untitled_apn) : name);
         values.put(Telephony.Carriers.APN, apn);
         values.put(Telephony.Carriers.PROXY, checkNotSet(mProxy.getText()));
         values.put(Telephony.Carriers.PORT, checkNotSet(mPort.getText()));
@@ -334,22 +389,28 @@ public class ApnEditor extends PreferenceActivity
         values.put(Telephony.Carriers.USER, checkNotSet(mUser.getText()));
         values.put(Telephony.Carriers.SERVER, checkNotSet(mServer.getText()));
         values.put(Telephony.Carriers.PASSWORD, checkNotSet(mPassword.getText()));
-        values.put(Telephony.Carriers.MMSC, checkNotSet(mMmsc.getText()));            
+        values.put(Telephony.Carriers.MMSC, checkNotSet(mMmsc.getText()));
+
+        String authVal = mAuthType.getValue();
+        if (authVal != null) {
+            values.put(Telephony.Carriers.AUTH_TYPE, Integer.parseInt(authVal));
+        }
+
         values.put(Telephony.Carriers.TYPE, checkNotSet(mApnType.getText()));
 
         values.put(Telephony.Carriers.MCC, mcc);
         values.put(Telephony.Carriers.MNC, mnc);
-        
+
         values.put(Telephony.Carriers.NUMERIC, mcc + mnc);
-        
+
         if (mCurMnc != null && mCurMcc != null) {
             if (mCurMnc.equals(mnc) && mCurMcc.equals(mcc)) {
                 values.put(Telephony.Carriers.CURRENT, 1);
             }
         }
-        
+
         getContentResolver().update(mUri, values, null, null);
-        
+
         return true;
     }
 
@@ -365,7 +426,7 @@ public class ApnEditor extends PreferenceActivity
         getContentResolver().delete(mUri, null, null);
         finish();
     }
-    
+
     private String starify(String value) {
         if (value == null || value.length() == 0) {
             return sNotSet;
@@ -377,7 +438,7 @@ public class ApnEditor extends PreferenceActivity
             return new String(password);
         }
     }
-    
+
     private String checkNull(String value) {
         if (value == null || value.length() == 0) {
             return sNotSet;
@@ -385,7 +446,7 @@ public class ApnEditor extends PreferenceActivity
             return value;
         }
     }
-    
+
     private String checkNotSet(String value) {
         if (value == null || value.equals(sNotSet)) {
             return "";
@@ -393,7 +454,7 @@ public class ApnEditor extends PreferenceActivity
             return value;
         }
     }
-    
+
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         Preference pref = findPreference(key);
         if (pref != null) {
diff --git a/src/com/android/settings/ApnPreference.java b/src/com/android/settings/ApnPreference.java
index 74fb90216e2..710eda23c4d 100644
--- a/src/com/android/settings/ApnPreference.java
+++ b/src/com/android/settings/ApnPreference.java
@@ -107,7 +107,7 @@ public class ApnPreference extends Preference implements
         return getKey().equals(mSelectedKey);
     }
 
-    public void setChecked(boolean checked) {
+    public void setChecked() {
         mSelectedKey = getKey();
     }
 
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 2624990ca0c..00ef3a79695 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -178,7 +178,7 @@ public class ApnSettings extends PreferenceActivity implements
             pref.setSelectable(selectable);
             if (selectable) {
                 if ((mSelectedKey != null) && mSelectedKey.equals(key)) {
-                    pref.setChecked(true);
+                    pref.setChecked();
                 }
                 apnList.addPreference(pref);
             } else {
diff --git a/src/com/android/settings/BandMode.java b/src/com/android/settings/BandMode.java
index 1297cad5d6d..a8c78333bdb 100644
--- a/src/com/android/settings/BandMode.java
+++ b/src/com/android/settings/BandMode.java
@@ -97,7 +97,7 @@ public class BandMode extends Activity {
                 }
             };
 
-    private class BandListItem {
+    static private class BandListItem {
         private int mBandMode = Phone.BM_UNSPECIFIED;
 
         public BandListItem(int bm) {
diff --git a/src/com/android/settings/BatteryInfo.java b/src/com/android/settings/BatteryInfo.java
index eb7ddb49f1b..1cbe47f988a 100644
--- a/src/com/android/settings/BatteryInfo.java
+++ b/src/com/android/settings/BatteryInfo.java
@@ -36,6 +36,7 @@ import com.android.internal.app.IBatteryStats;
 
 public class BatteryInfo extends Activity {
     private TextView mStatus;
+    private TextView mPower;
     private TextView mLevel;
     private TextView mScale;
     private TextView mHealth;
@@ -67,7 +68,7 @@ public class BatteryInfo extends Activity {
      */
     private final String tenthsToFixedString(int x) {
         int tens = x / 10;
-        return new String("" + tens + "." + (x - 10*tens));
+        return Integer.toString(tens) + "." + (x - 10 * tens);
     }
 
    /**
@@ -111,6 +112,24 @@ public class BatteryInfo extends Activity {
                 }
                 mStatus.setText(statusString);
 
+                switch (plugType) {
+                    case 0:
+                        mPower.setText(getString(R.string.battery_info_power_unplugged));
+                        break;
+                    case BatteryManager.BATTERY_PLUGGED_AC:
+                        mPower.setText(getString(R.string.battery_info_power_ac));
+                        break;
+                    case BatteryManager.BATTERY_PLUGGED_USB:
+                        mPower.setText(getString(R.string.battery_info_power_usb));
+                        break;
+                    case (BatteryManager.BATTERY_PLUGGED_AC|BatteryManager.BATTERY_PLUGGED_USB):
+                        mPower.setText(getString(R.string.battery_info_power_ac_usb));
+                        break;
+                    default:
+                        mPower.setText(getString(R.string.battery_info_power_unknown));
+                        break;
+                }
+                
                 int health = intent.getIntExtra("health", BatteryManager.BATTERY_HEALTH_UNKNOWN);
                 String healthString;
                 if (health == BatteryManager.BATTERY_HEALTH_GOOD) {
@@ -148,6 +167,7 @@ public class BatteryInfo extends Activity {
         super.onResume();
 
         mStatus = (TextView)findViewById(R.id.status);
+        mPower = (TextView)findViewById(R.id.power);
         mLevel = (TextView)findViewById(R.id.level);
         mScale = (TextView)findViewById(R.id.scale);
         mHealth = (TextView)findViewById(R.id.health);
diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java
index 9f554632631..fe3b99763b9 100644
--- a/src/com/android/settings/BrightnessPreference.java
+++ b/src/com/android/settings/BrightnessPreference.java
@@ -18,7 +18,7 @@ package com.android.settings;
 
 import android.content.Context;
 import android.os.RemoteException;
-import android.os.IHardwareService;
+import android.os.IPowerManager;
 import android.os.ServiceManager;
 import android.preference.SeekBarPreference;
 import android.provider.Settings;
@@ -26,16 +26,22 @@ import android.provider.Settings.SettingNotFoundException;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.SeekBar;
 
 import java.util.Map;
 
 public class BrightnessPreference extends SeekBarPreference implements
-        SeekBar.OnSeekBarChangeListener {
+        SeekBar.OnSeekBarChangeListener, CheckBox.OnCheckedChangeListener {
 
     private SeekBar mSeekBar;
+    private CheckBox mCheckBox;
     
     private int mOldBrightness;
+    private int mOldAutomatic;
+
+    private boolean mAutomaticAvailable;
     
     // Backlight range is from 0 - 255. Need to make sure that user
     // doesn't set the backlight to 0 and get stuck
@@ -44,6 +50,11 @@ public class BrightnessPreference extends SeekBarPreference implements
 
     public BrightnessPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
+
+        mAutomaticAvailable = context.getResources().getBoolean(
+                com.android.internal.R.bool.config_automatic_brightness_available);
+
+        setDialogLayoutResource(R.layout.preference_dialog_brightness);
     }
 
     @Override
@@ -51,7 +62,6 @@ public class BrightnessPreference extends SeekBarPreference implements
         super.onBindDialogView(view);
 
         mSeekBar = getSeekBar(view);
-        mSeekBar.setOnSeekBarChangeListener(this);
         mSeekBar.setMax(MAXIMUM_BACKLIGHT - MINIMUM_BACKLIGHT);
         try {
             mOldBrightness = Settings.System.getInt(getContext().getContentResolver(), 
@@ -60,6 +70,21 @@ public class BrightnessPreference extends SeekBarPreference implements
             mOldBrightness = MAXIMUM_BACKLIGHT;
         }
         mSeekBar.setProgress(mOldBrightness - MINIMUM_BACKLIGHT);
+
+        mCheckBox = (CheckBox)view.findViewById(R.id.automatic_mode);
+        if (mAutomaticAvailable) {
+            mCheckBox.setOnCheckedChangeListener(this);
+            try {
+                mOldAutomatic = Settings.System.getInt(getContext().getContentResolver(),
+                        Settings.System.SCREEN_BRIGHTNESS_MODE);
+            } catch (SettingNotFoundException snfe) {
+                mOldAutomatic = 0;
+            }
+            mCheckBox.setChecked(mOldAutomatic != 0);
+        } else {
+            mCheckBox.setVisibility(View.GONE);
+        }
+        mSeekBar.setOnSeekBarChangeListener(this);
     }
 
     public void onProgressChanged(SeekBar seekBar, int progress,
@@ -75,6 +100,14 @@ public class BrightnessPreference extends SeekBarPreference implements
         // NA
     }
 
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        setMode(isChecked ? Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC
+                : Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL);
+        if (!isChecked) {
+            setBrightness(mSeekBar.getProgress() + MINIMUM_BACKLIGHT);
+        }
+    }
+
     @Override
     protected void onDialogClosed(boolean positiveResult) {
         super.onDialogClosed(positiveResult);
@@ -84,20 +117,35 @@ public class BrightnessPreference extends SeekBarPreference implements
                     Settings.System.SCREEN_BRIGHTNESS,
                     mSeekBar.getProgress() + MINIMUM_BACKLIGHT);
         } else {
-            setBrightness(mOldBrightness);
+            if (mAutomaticAvailable) {
+                setMode(mOldAutomatic);
+            }
+            if (!mAutomaticAvailable || mOldAutomatic == 0) {
+                setBrightness(mOldBrightness);
+            }
         }
     }
     
     private void setBrightness(int brightness) {
         try {
-            IHardwareService hardware = IHardwareService.Stub.asInterface(
-                    ServiceManager.getService("hardware"));
-            if (hardware != null) {
-                hardware.setBacklights(brightness);
+            IPowerManager power = IPowerManager.Stub.asInterface(
+                    ServiceManager.getService("power"));
+            if (power != null) {
+                power.setBacklightBrightness(brightness);
             }
         } catch (RemoteException doe) {
             
         }        
     }
+
+    private void setMode(int mode) {
+        if (mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
+            mSeekBar.setVisibility(View.GONE);
+        } else {
+            mSeekBar.setVisibility(View.VISIBLE);
+        }
+        Settings.System.putInt(getContext().getContentResolver(),
+                Settings.System.SCREEN_BRIGHTNESS_MODE, mode);
+    }
 }
 
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index d0c375844ae..f103c6b5927 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -21,6 +21,7 @@ import com.google.android.collect.Lists;
 import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.LockPatternView;
+import com.android.internal.widget.LockPatternView.Cell;
 import static com.android.internal.widget.LockPatternView.DisplayMode;
 
 import android.app.Activity;
@@ -124,6 +125,10 @@ public class ChooseLockPattern extends Activity implements View.OnClickListener{
                 }
             }
 
+            public void onPatternCellAdded(List<Cell> pattern) { 
+
+            }
+
             private void patternInProgress() {
                 mHeaderText.setText(R.string.lockpattern_recording_inprogress);
                 mFooterText.setText("");
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index 44baccc6504..a91b45fd56d 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -19,6 +19,7 @@ package com.android.settings;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.LockPatternView;
 import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
+import com.android.internal.widget.LockPatternView.Cell;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -216,6 +217,10 @@ public class ConfirmLockPattern extends Activity {
             mLockPatternView.removeCallbacks(mClearPatternRunnable);
         }
 
+        public void onPatternCellAdded(List<Cell> pattern) {
+
+        }
+
         public void onPatternDetected(List<LockPatternView.Cell> pattern) {
             if (mLockPatternUtils.checkPattern(pattern)) {
                 setResult(RESULT_OK);
diff --git a/src/com/android/settings/CredentialInstaller.java b/src/com/android/settings/CredentialInstaller.java
new file mode 100644
index 00000000000..5a457d7e65a
--- /dev/null
+++ b/src/com/android/settings/CredentialInstaller.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.security.Credentials;
+import android.security.KeyStore;
+import android.util.Log;
+
+/**
+ * Installs credentials to the system keystore. It reacts to the
+ * {@link Credentials#SYSTEM_INSTALL_ACTION} intent. All the key-value pairs in
+ * the intent are installed to the system keystore. For security reason, the
+ * current implementation limits that only com.android.certinstaller can use
+ * this service.
+ */
+public class CredentialInstaller extends Activity {
+    private static final String TAG = "CredentialInstaller";
+
+    private KeyStore mKeyStore = KeyStore.getInstance();
+    private boolean mUnlocking = false;
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        if (!"com.android.certinstaller".equals(getCallingPackage())) finish();
+
+        if (!isKeyStoreLocked()) {
+            install();
+            finish();
+        } else if (!mUnlocking) {
+            mUnlocking = true;
+            Credentials.getInstance().unlock(this);
+        } else {
+            finish();
+        }
+    }
+
+    private void install() {
+        Intent intent = getIntent();
+        Bundle bundle = (intent == null) ? null : intent.getExtras();
+        if (bundle == null) return;
+        for (String key : bundle.keySet()) {
+            byte[] data = bundle.getByteArray(key);
+            if (data == null) continue;
+            boolean success = mKeyStore.put(key.getBytes(), data);
+            Log.v(TAG, "install " + key + ": " + data.length + "  success? " + success);
+            if (!success) return;
+        }
+        setResult(RESULT_OK);
+    }
+
+    private boolean isKeyStoreLocked() {
+        return (mKeyStore.test() != KeyStore.NO_ERROR);
+    }
+}
diff --git a/src/com/android/settings/DefaultRingtonePreference.java b/src/com/android/settings/DefaultRingtonePreference.java
index 8eed5635018..0933d622ed8 100644
--- a/src/com/android/settings/DefaultRingtonePreference.java
+++ b/src/com/android/settings/DefaultRingtonePreference.java
@@ -42,11 +42,6 @@ public class DefaultRingtonePreference extends RingtonePreference {
          * doesn't make sense to show a 'Default' item.
          */
         ringtonePickerIntent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, false);
-        
-        /*
-         * Similarly, 'Silent' shouldn't be shown here. 
-         */
-        ringtonePickerIntent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, false);
     }
 
     @Override
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index c1da18a1413..753f9b9fd42 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -17,6 +17,7 @@
 package com.android.settings;
 
 import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.BatteryManager;
 import android.os.Bundle;
@@ -45,6 +46,8 @@ public class DevelopmentSettings extends PreferenceActivity
     // To track whether Yes was clicked in the adb warning dialog
     private boolean mOkClicked;
 
+    private Dialog mOkDialog;
+
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -80,14 +83,15 @@ public class DevelopmentSettings extends PreferenceActivity
         if (preference == mEnableAdb) {
             if (mEnableAdb.isChecked()) {
                 mOkClicked = false;
-                new AlertDialog.Builder(this).setMessage(
+                if (mOkDialog != null) dismissDialog();
+                mOkDialog = new AlertDialog.Builder(this).setMessage(
                         getResources().getString(R.string.adb_warning_message))
                         .setTitle(R.string.adb_warning_title)
                         .setIcon(android.R.drawable.ic_dialog_alert)
                         .setPositiveButton(android.R.string.yes, this)
                         .setNegativeButton(android.R.string.no, this)
-                        .show()
-                        .setOnDismissListener(this);
+                        .show();
+                mOkDialog.setOnDismissListener(this);
             } else {
                 Settings.Secure.putInt(getContentResolver(), Settings.Secure.ADB_ENABLED, 0);
             }
@@ -99,10 +103,16 @@ public class DevelopmentSettings extends PreferenceActivity
             Settings.Secure.putInt(getContentResolver(), Settings.Secure.ALLOW_MOCK_LOCATION,
                     mAllowMockLocation.isChecked() ? 1 : 0);
         }
-        
+
         return false;
     }
 
+    private void dismissDialog() {
+        if (mOkDialog == null) return;
+        mOkDialog.dismiss();
+        mOkDialog = null;
+    }
+
     public void onClick(DialogInterface dialog, int which) {
         if (which == DialogInterface.BUTTON_POSITIVE) {
             mOkClicked = true;
@@ -119,4 +129,10 @@ public class DevelopmentSettings extends PreferenceActivity
             mEnableAdb.setChecked(false);
         }
     }
+
+    @Override
+    public void onDestroy() {
+        dismissDialog();
+        super.onDestroy();
+    }
 }
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index be01f7dc57e..82b7f2879b4 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -48,6 +48,7 @@ public class DeviceInfoSettings extends PreferenceActivity {
     private static final String KEY_LICENSE = "license";
     private static final String KEY_COPYRIGHT = "copyright";
     private static final String KEY_SYSTEM_UPDATE_SETTINGS = "system_update_settings";
+    private static final String PROPERTY_URL_SAFETYLEGAL = "ro.url.safetylegal";
     
     @Override
     protected void onCreate(Bundle icicle) {
@@ -61,6 +62,10 @@ public class DeviceInfoSettings extends PreferenceActivity {
         setStringSummary("build_number", Build.DISPLAY);
         findPreference("kernel_version").setSummary(getFormattedKernelVersion());
 
+        // Remove Safety information preference if PROPERTY_URL_SAFETYLEGAL is not set
+        removePreferenceIfPropertyMissing(getPreferenceScreen(), "safetylegal",
+                PROPERTY_URL_SAFETYLEGAL);
+
         /*
          * Settings is a generic app and should not contain any device-specific
          * info.
@@ -85,7 +90,21 @@ public class DeviceInfoSettings extends PreferenceActivity {
         Utils.updatePreferenceToSpecificActivityOrRemove(this, parentPreference, KEY_CONTRIBUTORS,
                 Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
     }
-    
+
+    private void removePreferenceIfPropertyMissing(PreferenceGroup preferenceGroup,
+            String preference, String property ) {
+        if (SystemProperties.get(property).equals(""))
+        {
+            // Property is missing so remove preference from group
+            try {
+                preferenceGroup.removePreference(findPreference(preference));
+            } catch (RuntimeException e) {
+                Log.d(TAG, "Property '" + property + "' missing and no '"
+                        + preference + "' preference");
+            }
+        }
+    }
+
     private void setStringSummary(String preference, String value) {
         try {
             findPreference(preference).setSummary(value);
@@ -121,7 +140,7 @@ public class DeviceInfoSettings extends PreferenceActivity {
                 "\\w+\\s+" + /* ignore: version */
                 "([^\\s]+)\\s+" + /* group 1: 2.6.22-omap1 */
                 "\\(([^\\s@]+(?:@[^\\s.]+)?)[^)]*\\)\\s+" + /* group 2: (xxxxxx@xxxxx.constant) */
-                "\\([^)]+\\)\\s+" + /* ignore: (gcc ..) */
+                "\\(.*?(?:\\(.*?\\)).*?\\)\\s+" + /* ignore: (gcc ..) */
                 "([^\\s]+)\\s+" + /* group 3: #26 */
                 "(?:PREEMPT\\s+)?" + /* ignore: PREEMPT (optional) */
                 "(.+)"; /* group 4: date */
diff --git a/src/com/android/settings/EditPinPreference.java b/src/com/android/settings/EditPinPreference.java
index ee3143c3942..362bed1bd69 100644
--- a/src/com/android/settings/EditPinPreference.java
+++ b/src/com/android/settings/EditPinPreference.java
@@ -16,6 +16,7 @@
 
 package com.android.settings;
 
+import android.app.Dialog;
 import android.content.Context;
 import android.preference.EditTextPreference;
 import android.text.method.DigitsKeyListener;
@@ -24,15 +25,11 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.EditText;
 
-import java.util.Map;
-
 /**
  * TODO: Add a soft dialpad for PIN entry.
  */
 class EditPinPreference extends EditTextPreference {
 
-    private boolean mDialogOpen;
-    
     interface OnPinEnteredListener {
         void onPinEntered(EditPinPreference preference, boolean positiveResult);
     }
@@ -50,13 +47,13 @@ class EditPinPreference extends EditTextPreference {
     public void setOnPinEnteredListener(OnPinEnteredListener listener) {
         mPinListener = listener;
     }
-    
+
     @Override
     protected void onBindDialogView(View view) {
         super.onBindDialogView(view);
-        
+
         final EditText editText = (EditText) view.findViewById(android.R.id.edit);
-        
+
         if (editText != null) {
             editText.setSingleLine(true);
             editText.setTransformationMethod(PasswordTransformationMethod.getInstance());
@@ -65,20 +62,22 @@ class EditPinPreference extends EditTextPreference {
     }
 
     public boolean isDialogOpen() {
-        return mDialogOpen;
+        Dialog dialog = getDialog();
+        return dialog != null && dialog.isShowing();
     }
-    
+
     @Override
     protected void onDialogClosed(boolean positiveResult) {
         super.onDialogClosed(positiveResult);
-        mDialogOpen = false;
         if (mPinListener != null) {
             mPinListener.onPinEntered(this, positiveResult);
         }
     }
-    
+
     public void showPinDialog() {
-        mDialogOpen = true;
-        showDialog(null);
+        Dialog dialog = getDialog();
+        if (dialog == null || !dialog.isShowing()) {
+            showDialog(null);
+        }
     }
 }
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index 18beb3283ca..3a7a7088669 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -261,10 +261,13 @@ public class IccLockSettings extends PreferenceActivity
             mPinToggle.setChecked(!mToState);  
             mDialogState = ICC_LOCK_MODE;
             showPinDialog();
+        } else if (preference == mPinDialog) {
+            mDialogState = ICC_OLD_MODE;
+            return false;
         }
         return true;
     }
-    
+
     private void tryChangeIccLockState() {
         // Try to change icc lock. If it succeeds, toggle the lock state and 
         // reset dialog state. Else inject error message and show dialog again.
@@ -277,7 +280,6 @@ public class IccLockSettings extends PreferenceActivity
         if (success) {
             mPinToggle.setChecked(mToState);
         } else {
-            // TODO: I18N
             Toast.makeText(this, mRes.getString(R.string.sim_lock_failed), Toast.LENGTH_SHORT)
                     .show();
         }
@@ -286,7 +288,6 @@ public class IccLockSettings extends PreferenceActivity
 
     private void iccPinChanged(boolean success) {
         if (!success) {
-         // TODO: I18N
             Toast.makeText(this, mRes.getString(R.string.sim_change_failed),
                     Toast.LENGTH_SHORT)
                     .show();
@@ -304,7 +305,7 @@ public class IccLockSettings extends PreferenceActivity
         mPhone.getIccCard().changeIccLockPassword(mOldPin,
                 mNewPin, callback);
     }
-    
+
     private boolean reasonablePin(String pin) {
         if (pin == null || pin.length() < MIN_PIN_LENGTH || pin.length() > MAX_PIN_LENGTH) {
             return false;
@@ -312,11 +313,12 @@ public class IccLockSettings extends PreferenceActivity
             return true;
         }
     }
- 
+
     private void resetDialogState() {
         mError = null;
         mDialogState = ICC_OLD_MODE; // Default for when Change PIN is clicked
         mPin = "";
         setDialogValues();
+        mDialogState = OFF_MODE;
     }
 }
diff --git a/src/com/android/settings/IconPreferenceScreen.java b/src/com/android/settings/IconPreferenceScreen.java
new file mode 100644
index 00000000000..c7c53038ed9
--- /dev/null
+++ b/src/com/android/settings/IconPreferenceScreen.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.preference.Preference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+
+public class IconPreferenceScreen extends Preference {
+
+    private Drawable mIcon;
+
+    public IconPreferenceScreen(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public IconPreferenceScreen(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        setLayoutResource(R.layout.preference_icon);
+        TypedArray a = context.obtainStyledAttributes(attrs,
+                R.styleable.IconPreferenceScreen, defStyle, 0);
+        mIcon = a.getDrawable(R.styleable.IconPreferenceScreen_icon);
+    }
+
+    @Override
+    public void onBindView(View view) {
+        super.onBindView(view);
+        ImageView imageView = (ImageView) view.findViewById(R.id.icon);
+        if (imageView != null && mIcon != null) {
+            imageView.setImageDrawable(mIcon);
+        }
+    }
+}
diff --git a/src/com/android/settings/InstalledAppDetails.java b/src/com/android/settings/InstalledAppDetails.java
index 5a4e672b9d5..d05014bfc02 100644
--- a/src/com/android/settings/InstalledAppDetails.java
+++ b/src/com/android/settings/InstalledAppDetails.java
@@ -323,7 +323,8 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
         try {
             mAppInfo = mPm.getApplicationInfo(mAppInfo.packageName, 
                     PackageManager.GET_UNINSTALLED_PACKAGES);
-            pkgInfo = mPm.getPackageInfo(mAppInfo.packageName, 0);
+            pkgInfo = mPm.getPackageInfo(mAppInfo.packageName,
+                    PackageManager.GET_UNINSTALLED_PACKAGES);
         } catch (NameNotFoundException e) {
             Log.e(TAG, "Exception when retrieving package:" + mAppInfo.packageName, e);
             showDialogInner(DLG_APP_NOT_FOUND);
diff --git a/src/com/android/settings/LanguageSettings.java b/src/com/android/settings/LanguageSettings.java
index cbab3901981..4b805ed56ed 100644
--- a/src/com/android/settings/LanguageSettings.java
+++ b/src/com/android/settings/LanguageSettings.java
@@ -54,8 +54,6 @@ public class LanguageSettings extends PreferenceActivity {
     private String mLastInputMethodId;
     private String mLastTickedInputMethodId;
     
-    private String mRootDirectory;
-
     static public String getInputMethodIdFromKey(String key) {
         return key;
     }
diff --git a/src/com/android/settings/ManageApplications.java b/src/com/android/settings/ManageApplications.java
index 9cb421786a4..a71d17bb0aa 100644
--- a/src/com/android/settings/ManageApplications.java
+++ b/src/com/android/settings/ManageApplications.java
@@ -52,6 +52,8 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
+import android.widget.Filter;
+import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -64,7 +66,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.text.Collator;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -133,19 +134,19 @@ public class ManageApplications extends ListActivity implements
     // sort order that can be changed through the menu can be sorted alphabetically
     // or size(descending)
     private static final int MENU_OPTIONS_BASE = 0;
-    public static final int SORT_ORDER_ALPHA = MENU_OPTIONS_BASE + 0;
-    public static final int SORT_ORDER_SIZE = MENU_OPTIONS_BASE + 1;
     // Filter options used for displayed list of applications
-    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;
+    public static final int FILTER_APPS_ALL = MENU_OPTIONS_BASE + 0;
+    public static final int FILTER_APPS_RUNNING = MENU_OPTIONS_BASE + 1;
+    public static final int FILTER_APPS_THIRD_PARTY = MENU_OPTIONS_BASE + 2;
+    public static final int FILTER_OPTIONS = MENU_OPTIONS_BASE + 3;
+    public static final int SORT_ORDER_ALPHA = MENU_OPTIONS_BASE + 4;
+    public static final int SORT_ORDER_SIZE = MENU_OPTIONS_BASE + 5;
     // Alert Dialog presented to user to find out the filter option
-    AlertDialog mAlertDlg;
+    private AlertDialog mAlertDlg;
     // sort order
     private int mSortOrder = SORT_ORDER_ALPHA;
     // Filter value
-    int mFilterApps = FILTER_APPS_ALL;
+    private int mFilterApps = FILTER_APPS_THIRD_PARTY;
     
     // Custom Adapter used for managing items in the list
     private AppInfoAdapter mAppInfoAdapter;
@@ -176,7 +177,7 @@ public class ManageApplications extends ListActivity implements
     private boolean mComputeSizes = false;
     // default icon thats used when displaying applications initially before resource info is
     // retrieved
-    private Drawable mDefaultAppIcon;
+    private static Drawable mDefaultAppIcon;
     
     // temporary dialog displayed while the application info loads
     private static final int DLG_BASE = 0;
@@ -211,9 +212,6 @@ public class ManageApplications extends ListActivity implements
     // Cache application attributes
     private AppInfoCache mCache = new AppInfoCache();
     
-    // empty message displayed when list is empty
-    private TextView mEmptyView;
-    
     // Boolean variables indicating state
     private boolean mLoadLabels = false;
     private boolean mSizesFirst = false;
@@ -275,6 +273,7 @@ public class ManageApplications extends ListActivity implements
                 if(localLOGV) Log.i(TAG, "Message INIT_PKG_INFO, justCreated = " + mJustCreated);
                 List<ApplicationInfo> newList = null;
                 if (!mJustCreated) {
+                    if (localLOGV) Log.i(TAG, "List already created");
                     // Add or delete newly created packages by comparing lists
                     newList = getInstalledApps(FILTER_APPS_ALL);
                     updateAppList(newList);
@@ -370,8 +369,7 @@ public class ManageApplications extends ListActivity implements
                 if (status) {
                     size = data.getLong(ATTR_PKG_STATS);
                     formattedSize = data.getString(ATTR_PKG_SIZE_STR);
-                    int idx = mAppInfoAdapter.getIndex(pkgName);
-                    if (idx == -1) {
+                    if (!mAppInfoAdapter.isInstalled(pkgName)) {
                         mAppInfoAdapter.addToList(pkgName, size, formattedSize);
                     } else {
                         mAppInfoAdapter.updatePackage(pkgName, size, formattedSize);
@@ -565,7 +563,9 @@ public class ManageApplications extends ListActivity implements
         Set<String> existingList = new HashSet<String>();
         boolean ret = false;
         // Loop over new list and find out common elements between old and new lists
-        for (ApplicationInfo info : newList) {
+        int N = newList.size();
+        for (int i = (N-1); i >= 0; i--) {
+            ApplicationInfo info = newList.get(i);
             String pkgName = info.packageName;
             AppInfo aInfo = mCache.getEntry(pkgName);
             if (aInfo != null) {
@@ -574,10 +574,14 @@ public class ManageApplications extends ListActivity implements
                 // New package. update info by refreshing
                 if (localLOGV) Log.i(TAG, "New pkg :"+pkgName+" installed when paused");
                 updatePackageList(Intent.ACTION_PACKAGE_ADDED, pkgName);
+                // Remove from current list so that the newly added package can
+                // be handled later
+                newList.remove(i);
                 ret = true;
             }
         }
-        // Loop over old list and figure out state entries
+
+        // Loop over old list and figure out stale entries
         List<String> deletedList = null;
         Set<String> staleList = mCache.getPkgList();
         for (String pkgName : staleList) {
@@ -592,6 +596,7 @@ public class ManageApplications extends ListActivity implements
         }
         // Delete right away
         if (deletedList != null) {
+            if (localLOGV) Log.i(TAG, "Deleting right away");
             mAppInfoAdapter.removeFromList(deletedList);
         }
         return ret;
@@ -653,19 +658,29 @@ public class ManageApplications extends ListActivity implements
             return installedAppList;
         }
     }
+
+    private static boolean matchFilter(boolean filter, Map<String, String> filterMap, String pkg) {
+        boolean add = true;
+        if (filter) {
+            if (filterMap == null || !filterMap.containsKey(pkg)) {
+                add = false;
+            }
+        }
+        return add;
+    }
     
     /*
      * Utility method used to figure out list of apps based on filterOption
      * If the framework supports an additional flag to indicate running apps
      *  we can get away with some code here.
      */
-    List<ApplicationInfo> getFilteredApps(List<ApplicationInfo> pAppList, int filterOption) {
+    List<ApplicationInfo> getFilteredApps(List<ApplicationInfo> pAppList, int filterOption, boolean filter,
+            Map<String, String> filterMap) {
         List<ApplicationInfo> retList = new ArrayList<ApplicationInfo>();
         if(pAppList == null) {
             return retList;
         }
         if (filterOption == FILTER_APPS_THIRD_PARTY) {
-            List<ApplicationInfo> appList =new ArrayList<ApplicationInfo> ();
             for (ApplicationInfo appInfo : pAppList) {
                 boolean flag = false;
                 if ((appInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {
@@ -676,15 +691,16 @@ public class ManageApplications extends ListActivity implements
                     flag = true;
                 }
                 if (flag) {
-                    appList.add(appInfo);
+                    if (matchFilter(filter, filterMap, appInfo.packageName)) {
+                        retList.add(appInfo);
+                    }
                 }
             }
-            return appList;
+            return retList;
         } else if (filterOption == FILTER_APPS_RUNNING) {
-            List<ApplicationInfo> appList =new ArrayList<ApplicationInfo> ();
             List<ActivityManager.RunningAppProcessInfo> procList = getRunningAppProcessesList();
             if ((procList == null) || (procList.size() == 0)) {
-                return appList;
+                return retList;
             }
             // Retrieve running processes from ActivityManager
             HashMap<String, ActivityManager.RunningAppProcessInfo> runningMap = 
@@ -700,15 +716,22 @@ public class ManageApplications extends ListActivity implements
             // Query list to find running processes in current list
             for (ApplicationInfo appInfo : pAppList) {
                 if (runningMap.get(appInfo.packageName) != null) {
-                    appList.add(appInfo);
+                    if (matchFilter(filter, filterMap, appInfo.packageName)) {
+                        retList.add(appInfo);
+                    }
                 }
             }
-            return appList;
+            return retList;
         } else {
-            return pAppList;
+            for (ApplicationInfo appInfo : pAppList) {
+                if (matchFilter(filter, filterMap, appInfo.packageName)) {
+                    retList.add(appInfo);
+                }
+            }
+            return retList;
         }
     }
-    
+
     private List<ActivityManager.RunningAppProcessInfo> getRunningAppProcessesList() {
         ActivityManager am = (ActivityManager)getSystemService(Context.ACTIVITY_SERVICE);
         return am.getRunningAppProcesses();
@@ -750,20 +773,9 @@ public class ManageApplications extends ListActivity implements
         }
     }
     
-    private void showEmptyViewIfListEmpty() {
-        if (localLOGV) Log.i(TAG, "Checking for empty view");
-        if (mAppInfoAdapter.getCount() > 0) {
-            mListView.setVisibility(View.VISIBLE);
-            mEmptyView.setVisibility(View.GONE);
-        } else {
-            mListView.setVisibility(View.GONE);
-            mEmptyView.setVisibility(View.VISIBLE);
-        }
-    }
-    
     // internal structure used to track added and deleted packages when
     // the activity has focus
-    class AddRemoveInfo {
+    static class AddRemoveInfo {
         String pkgName;
         boolean add;
         public AddRemoveInfo(String pPkgName, boolean pAdd) {
@@ -847,7 +859,7 @@ public class ManageApplications extends ListActivity implements
     /* Internal class representing an application or packages displayable attributes
      * 
      */
-    class AppInfo {
+    static private class AppInfo {
         public String pkgName;
         int index;
         public  CharSequence appName;
@@ -927,11 +939,63 @@ public class ManageApplications extends ListActivity implements
      * the getId methods via the package name into the internal maps and indices.
      * The order of applications in the list is mirrored in mAppLocalList
      */
-    class AppInfoAdapter extends BaseAdapter {        
+    class AppInfoAdapter extends BaseAdapter implements Filterable {   
         private List<ApplicationInfo> mAppList;
         private List<ApplicationInfo> mAppLocalList;
+        private Map<String, String> mFilterMap = new HashMap<String, String>();
         AlphaComparator mAlphaComparator = new AlphaComparator();
         SizeComparator mSizeComparator = new SizeComparator();
+        private Filter mAppFilter = new AppFilter();
+        final private Object mFilterLock = new Object();
+        private Map<String, String> mCurrentFilterMap = null;
+
+        private void generateFilterListLocked(List<ApplicationInfo> list) {
+            mAppLocalList = new ArrayList<ApplicationInfo>(list);
+            synchronized(mFilterLock) {
+                for (ApplicationInfo info : mAppLocalList) {
+                    String label = info.packageName;
+                    AppInfo aInfo = mCache.getEntry(info.packageName);
+                    if ((aInfo != null) && (aInfo.appName != null)) {
+                        label = aInfo.appName.toString();
+                    }
+                    mFilterMap.put(info.packageName, label.toLowerCase());
+                }
+            }
+        }
+
+        private void addFilterListLocked(int newIdx, ApplicationInfo info, CharSequence pLabel) {
+            mAppLocalList.add(newIdx, info);
+            synchronized (mFilterLock) {
+                String label = info.packageName;
+                if (pLabel != null) {
+                    label = pLabel.toString();
+                }
+                mFilterMap.put(info.packageName, label.toLowerCase());
+            }
+        }
+
+        private boolean removeFilterListLocked(String removePkg) {
+            // Remove from filtered list
+            int N = mAppLocalList.size();
+            int i;
+            for (i = (N-1); i >= 0; i--) {
+                ApplicationInfo info = mAppLocalList.get(i);
+                if (info.packageName.equalsIgnoreCase(removePkg)) {
+                    if (localLOGV) Log.i(TAG, "Removing " + removePkg + " from local list");
+                    mAppLocalList.remove(i);
+                    synchronized (mFilterLock) {
+                        mFilterMap.remove(removePkg);
+                    }
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        private void reverseGenerateList() {
+            generateFilterListLocked(getFilteredApps(mAppList, mFilterApps, mCurrentFilterMap!= null, mCurrentFilterMap));
+            sortListInner(mSortOrder);
+        }
 
         // Make sure the cache or map contains entries for all elements
         // in appList for a valid sort.
@@ -942,11 +1006,11 @@ public class ManageApplications extends ListActivity implements
                 // Just refresh the list
                 appList = mAppList;
             } else {
-                mAppList = pAppList;
+                mAppList = new ArrayList<ApplicationInfo>(pAppList);
                 appList = pAppList;
                 notify = true;
             }
-            mAppLocalList = getFilteredApps(appList, filterOption);
+            generateFilterListLocked(getFilteredApps(appList, filterOption, mCurrentFilterMap!= null, mCurrentFilterMap));
             // This loop verifies and creates new entries for new packages in list
             int imax = appList.size();
             for (int i = 0; i < imax; i++) {
@@ -977,24 +1041,19 @@ public class ManageApplications extends ListActivity implements
             return mAppLocalList.get(position);
         }
         
-        /*
-         * This method returns the index of the package position in the application list
-         */
-        public int getIndex(String pkgName) {
+        public boolean isInstalled(String pkgName) {
             if(pkgName == null) {
-                Log.w(TAG, "Getting index of null package in List Adapter");
+                if (localLOGV) Log.w(TAG, "Null pkg name when checking if installed");
+                return false;
             }
-            int imax = mAppLocalList.size();
-            ApplicationInfo appInfo;
-            for(int i = 0; i < imax; i++) {
-                appInfo = mAppLocalList.get(i);
-                if(appInfo.packageName.equalsIgnoreCase(pkgName)) {
-                    return i;
+            for (ApplicationInfo info : mAppList) {
+                if (info.packageName.equalsIgnoreCase(pkgName)) {
+                    return true;
                 }
             }
-            return -1;
+            return false;
         }
-        
+
         public ApplicationInfo getApplicationInfo(int position) {
             int imax = mAppLocalList.size();
             if( (position < 0) || (position >= imax)) {
@@ -1083,7 +1142,7 @@ public class ManageApplications extends ListActivity implements
         public void sortBaseList(int sortOrder) {
             if (localLOGV) Log.i(TAG, "Sorting base list based on sortOrder = "+sortOrder);
             sortAppList(mAppList, sortOrder);
-            mAppLocalList = getFilteredApps(mAppList, mFilterApps);
+            generateFilterListLocked(getFilteredApps(mAppList, mFilterApps, mCurrentFilterMap!= null, mCurrentFilterMap));
             adjustIndex();
         }
 
@@ -1106,7 +1165,7 @@ public class ManageApplications extends ListActivity implements
          */
         public boolean resetAppList(int filterOption) {
            // Change application list based on filter option
-           mAppLocalList = getFilteredApps(mAppList, filterOption);
+           generateFilterListLocked(getFilteredApps(mAppList, filterOption, mCurrentFilterMap!= null, mCurrentFilterMap));
            // Check for all properties in map before sorting. Populate values from cache
            for(ApplicationInfo applicationInfo : mAppLocalList) {
                AppInfo appInfo = mCache.getEntry(applicationInfo.packageName);
@@ -1119,7 +1178,6 @@ public class ManageApplications extends ListActivity implements
            } else {
                notifyDataSetChanged();
            }
-           showEmptyViewIfListEmpty();
            return true;
         }
         
@@ -1202,7 +1260,6 @@ public class ManageApplications extends ListActivity implements
             if (pkgName == null) {
                 return;
             }
-            boolean notInList = true;
             // Get ApplicationInfo
             ApplicationInfo info = null;
             try {
@@ -1216,29 +1273,38 @@ public class ManageApplications extends ListActivity implements
                 Log.i(TAG, "Null ApplicationInfo for package:"+pkgName);
                 return;
             }
-            // Add entry to local list
+            // Add entry to base list
             mAppList.add(info);
             // Add entry to map. Note that the index gets adjusted later on based on
             // whether the newly added package is part of displayed list
+            CharSequence label = info.loadLabel(mPm);
             mCache.addEntry(new AppInfo(pkgName, -1,
-                    info.loadLabel(mPm), info.loadIcon(mPm), size, formattedSize));
+                    label, info.loadIcon(mPm), size, formattedSize));
+            if (addLocalEntry(info, label)) {
+                notifyDataSetChanged();
+            }
+        }
+
+        private boolean addLocalEntry(ApplicationInfo info, CharSequence label) {
+            String pkgName = info.packageName;
             // Add to list
-            if (notInList && (shouldBeInList(mFilterApps, info))) {
+            if (shouldBeInList(mFilterApps, info)) {
                 // Binary search returns a negative index (ie -index) of the position where
                 // this might be inserted. 
                 int newIdx = Collections.binarySearch(mAppLocalList, info, 
                         getAppComparator(mSortOrder));
                 if(newIdx >= 0) {
-                    Log.i(TAG, "Strange. Package:"+pkgName+" is not new");
-                    return;
+                    if (localLOGV) Log.i(TAG, "Strange. Package:" + pkgName + " is not new");
+                    return false;
                 }
                 // New entry
                 newIdx = -newIdx-1;
-                mAppLocalList.add(newIdx, info);
+                addFilterListLocked(newIdx, info, label);
                 // Adjust index
                 adjustIndex();
-                notifyDataSetChanged();
+                return true;
             }
+            return false;
         }
 
         public void updatePackage(String pkgName,
@@ -1252,9 +1318,13 @@ public class ManageApplications extends ListActivity implements
             }
             AppInfo aInfo = mCache.getEntry(pkgName);
             if (aInfo != null) {
-                aInfo.refreshLabel(info.loadLabel(mPm));
+                CharSequence label = info.loadLabel(mPm);
+                aInfo.refreshLabel(label);
                 aInfo.refreshIcon(info.loadIcon(mPm));
                 aInfo.setSize(size, formattedSize);
+                // Check if the entry has to be added to the displayed list
+                addLocalEntry(info, label);
+                // Refresh list since size might have changed
                 notifyDataSetChanged();
             }
         }
@@ -1286,15 +1356,8 @@ public class ManageApplications extends ListActivity implements
                 if (localLOGV) Log.i(TAG, "Removing " + pkg + " from cache");
                 mCache.removeEntry(pkg);
                 // Remove from filtered list
-                int i = 0;
-                for (ApplicationInfo info : mAppLocalList) {
-                    if (info.packageName.equalsIgnoreCase(pkg)) {
-                        mAppLocalList.remove(i);
-                        if (localLOGV) Log.i(TAG, "Removing " + pkg + " from local list");
-                        found = true;
-                        break;
-                    }
-                    i++;
+                if (removeFilterListLocked(pkg)) {
+                    found = true;
                 }
             }
             // Adjust indices of list entries
@@ -1324,6 +1387,50 @@ public class ManageApplications extends ListActivity implements
                 notifyDataSetChanged();
             }
         }
+
+        public Filter getFilter() {
+            return mAppFilter;
+        }
+
+        private class AppFilter extends Filter {
+            @Override
+            protected FilterResults performFiltering(CharSequence prefix) {
+                FilterResults results = new FilterResults();
+                if (prefix == null || prefix.length() == 0) {
+                    synchronized (mFilterLock) {
+                        results.values = new HashMap<String, String>(mFilterMap);
+                        results.count = mFilterMap.size();
+                    }
+                } else {
+                    final String prefixString = prefix.toString().toLowerCase();
+                    Map<String, String> newMap = new HashMap<String, String>();
+                    synchronized (mFilterLock) {
+                        Map<String, String> localMap = mFilterMap;
+                        Set<String> keys = mFilterMap.keySet();
+                        for (String key : keys) {
+                            String label = localMap.get(key);
+                            if (label.indexOf(prefixString) != -1) {
+                                newMap.put(key, label);
+                            }
+                        }
+                    }
+                    results.values = newMap;
+                    results.count = newMap.size();
+                }
+                return results;
+            }
+
+            @Override
+            protected void publishResults(CharSequence constraint, FilterResults results) {
+                mCurrentFilterMap = (Map<String, String>) results.values;
+                reverseGenerateList();
+                if (results.count > 0) {
+                    notifyDataSetChanged();
+                } else {
+                    notifyDataSetInvalidated();
+                }
+            }
+        }
     }
     
     /*
@@ -1455,6 +1562,7 @@ public class ManageApplications extends ListActivity implements
         String action = intent.getAction();
         if (action.equals(Intent.ACTION_MANAGE_PACKAGE_STORAGE)) {
             mSortOrder = SORT_ORDER_SIZE;
+            mFilterApps = FILTER_APPS_ALL;
             mSizesFirst = true;
         }
         mPm = getPackageManager();
@@ -1471,7 +1579,6 @@ public class ManageApplications extends ListActivity implements
         // initialize the inflater
         mInflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         mReceiver = new PackageIntentReceiver();
-        mEmptyView = (TextView) findViewById(R.id.empty_view);
         mObserver = new PkgSizeObserver();
         // Create adapter and list view here
         List<ApplicationInfo> appList = getInstalledApps(mSortOrder);
@@ -1481,6 +1588,7 @@ public class ManageApplications extends ListActivity implements
         lv.setSaveEnabled(true);
         lv.setItemsCanFocus(true);
         lv.setOnItemClickListener(this);
+        lv.setTextFilterEnabled(true);
         mListView = lv;
         if (DEBUG_TIME) {
             Log.i(TAG, "Total time in Activity.create:: " +
@@ -1829,6 +1937,8 @@ public class ManageApplications extends ListActivity implements
         if ((menuId == SORT_ORDER_ALPHA) || (menuId == SORT_ORDER_SIZE)) {
             sendMessageToHandler(REORDER_LIST, menuId);
         } else if (menuId == FILTER_OPTIONS) {
+            // Pick up the selection value from the list of added choice items.
+            int selection = mFilterApps - MENU_OPTIONS_BASE;
             if (mAlertDlg == null) {
                 mAlertDlg = new AlertDialog.Builder(this).
                         setTitle(R.string.filter_dlg_title).
@@ -1836,7 +1946,7 @@ public class ManageApplications extends ListActivity implements
                         setSingleChoiceItems(new CharSequence[] {getText(R.string.filter_apps_all),
                                 getText(R.string.filter_apps_running),
                                 getText(R.string.filter_apps_third_party)},
-                                -1, this).
+                                selection, this).
                         create();
             }
             mAlertDlg.show();
@@ -1861,18 +1971,16 @@ public class ManageApplications extends ListActivity implements
         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;
+        case FILTER_APPS_ALL:
             break;
-        case 1:
-            newOption = FILTER_APPS_RUNNING;
+        case FILTER_APPS_RUNNING:
             break;
-        case 2:
-            newOption = FILTER_APPS_THIRD_PARTY;
+        case FILTER_APPS_THIRD_PARTY:
             break;
         default:
             return;
         }
+        newOption = which;
         mAlertDlg.dismiss();
         sendMessageToHandler(REORDER_LIST, newOption);
     }
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
new file mode 100644
index 00000000000..2edb3284055
--- /dev/null
+++ b/src/com/android/settings/PrivacySettings.java
@@ -0,0 +1,260 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.backup.IBackupManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.text.method.LinkMovementMethod;
+import android.widget.TextView;
+
+/**
+ * Gesture lock pattern settings.
+ */
+public class PrivacySettings extends PreferenceActivity implements
+        DialogInterface.OnDismissListener, DialogInterface.OnClickListener {
+
+    private static final String PREFS_NAME = "location_prefs";
+    private static final String PREFS_USE_LOCATION = "use_location";
+
+    // Vendor specific
+    private static final String GSETTINGS_PROVIDER = "com.google.android.providers.settings";
+    private static final String LOCATION_CATEGORY = "location_category";
+    private static final String SETTINGS_CATEGORY = "settings_category";
+    private static final String USE_LOCATION = "use_location";
+    private static final String BACKUP_SETTINGS = "backup_settings";
+    private static final String KEY_DONE_USE_LOCATION = "doneLocation";
+    private CheckBoxPreference mUseLocation;
+    private CheckBoxPreference mBackup;
+    private boolean mOkClicked;
+    private Dialog mConfirmDialog;
+
+    private static final int DIALOG_USE_LOCATION = 1;
+    private static final int DIALOG_ERASE_BACKUP = 2;
+    private int     mDialogType;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.privacy_settings);
+
+        mUseLocation = (CheckBoxPreference) getPreferenceScreen().findPreference(USE_LOCATION);
+        mBackup = (CheckBoxPreference) getPreferenceScreen().findPreference(BACKUP_SETTINGS);
+
+        // Vendor specific
+        try {
+            if (mUseLocation != null) {
+                getPackageManager().getPackageInfo(GSETTINGS_PROVIDER, 0);
+            }
+        } catch (NameNotFoundException nnfe) {
+            getPreferenceScreen().removePreference(findPreference(LOCATION_CATEGORY));
+            getPreferenceScreen().removePreference(findPreference(SETTINGS_CATEGORY));
+        }
+        updateToggles();
+
+        boolean doneUseLocation = savedInstanceState == null
+                ? false : savedInstanceState.getBoolean(KEY_DONE_USE_LOCATION, true);
+        if (!doneUseLocation && (getIntent().getBooleanExtra("SHOW_USE_LOCATION", false)
+                || savedInstanceState != null)) {
+            showUseLocationDialog(true);
+        }
+    }
+
+    @Override
+    public void onStop() {
+        if (mConfirmDialog != null && mConfirmDialog.isShowing()) {
+            mConfirmDialog.dismiss();
+        }
+        mConfirmDialog = null;
+        mDialogType = 0;
+        super.onStop();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle icicle) {
+        if (mConfirmDialog != null && mConfirmDialog.isShowing()
+                && mDialogType == DIALOG_USE_LOCATION) {
+            icicle.putBoolean(KEY_DONE_USE_LOCATION, false);
+        }
+        super.onSaveInstanceState(icicle);
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
+            Preference preference) {
+        if (preference == mUseLocation) {
+            //normally called on the toggle click
+            if (mUseLocation.isChecked()) {
+                showUseLocationDialog(false);
+            } else {
+                updateUseLocation();
+            }
+        } else if (preference == mBackup) {
+            if (!mBackup.isChecked()) {
+                showEraseBackupDialog();
+            } else {
+                setBackupEnabled(true);
+            }
+        }
+
+        return false;
+    }
+
+    private void showUseLocationDialog(boolean force) {
+        // Show a warning to the user that location data will be shared
+        mOkClicked = false;
+        if (force) {
+            mUseLocation.setChecked(true);
+        }
+
+        if (hasAgreedToUseLocation()) {
+            updateUseLocation();
+            return;
+        }
+
+        mDialogType = DIALOG_USE_LOCATION;
+        CharSequence msg = getResources().getText(R.string.use_location_warning_message);
+        mConfirmDialog = new AlertDialog.Builder(this).setMessage(msg)
+                .setTitle(R.string.use_location_title)
+                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setPositiveButton(R.string.agree, this)
+                .setNegativeButton(R.string.disagree, this)
+                .show();
+        ((TextView)mConfirmDialog.findViewById(android.R.id.message))
+                .setMovementMethod(LinkMovementMethod.getInstance());
+        mConfirmDialog.setOnDismissListener(this);
+    }
+
+    private void showEraseBackupDialog() {
+        // Show a warning to the user that location data will be shared
+        mOkClicked = false;
+        mBackup.setChecked(true);
+
+        mDialogType = DIALOG_ERASE_BACKUP;
+        CharSequence msg = getResources().getText(R.string.backup_erase_dialog_message);
+        mConfirmDialog = new AlertDialog.Builder(this).setMessage(msg)
+                .setTitle(R.string.backup_erase_dialog_title)
+                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setPositiveButton(android.R.string.ok, this)
+                .setNegativeButton(android.R.string.cancel, this)
+                .show();
+        mConfirmDialog.setOnDismissListener(this);
+    }
+
+    /*
+     * Creates toggles for each available location provider
+     */
+    private void updateToggles() {
+        ContentResolver res = getContentResolver();
+        mUseLocation.setChecked(Settings.Secure.getInt(res,
+                Settings.Secure.USE_LOCATION_FOR_SERVICES, 2) == 1);
+        mBackup.setChecked(Settings.Secure.getInt(res,
+                Settings.Secure.BACKUP_ENABLED, 0) == 1);
+    }
+
+    private void updateUseLocation() {
+        boolean use = mUseLocation.isChecked();
+        Settings.Secure.putInt(getContentResolver(),
+                Settings.Secure.USE_LOCATION_FOR_SERVICES, use ? 1 : 0);
+    }
+
+    public void onClick(DialogInterface dialog, int which) {
+        if (which == DialogInterface.BUTTON_POSITIVE) {
+            //updateProviders();
+            mOkClicked = true;
+            if (mDialogType == DIALOG_USE_LOCATION) {
+                setAgreedToUseLocation(true);
+            } else if (mDialogType == DIALOG_ERASE_BACKUP) {
+                setBackupEnabled(false);
+            }
+        } else {
+            if (mDialogType == DIALOG_USE_LOCATION) {
+                // Reset the toggle
+                mUseLocation.setChecked(false);
+            } else if (mDialogType == DIALOG_ERASE_BACKUP) {
+                mBackup.setChecked(true);
+            }
+        }
+        updateUseLocation();
+        mDialogType = 0;
+    }
+
+    public void onDismiss(DialogInterface dialog) {
+        // Assuming that onClick gets called first
+        if (!mOkClicked) {
+            if (mDialogType == DIALOG_USE_LOCATION) {
+                mUseLocation.setChecked(false);
+            }
+        }
+    }
+
+    /**
+     * Checks if the user has agreed to the dialog in the past.
+     */
+    private boolean hasAgreedToUseLocation() {
+        SharedPreferences sp = getSharedPreferences(PREFS_NAME, 0);
+        if (sp == null) {
+            return false;
+        }
+        return sp.getBoolean(PREFS_USE_LOCATION, false);
+    }
+
+    /**
+     * Notes that the user has agreed to the dialog and won't need to be prompted in the
+     * future.
+     */
+    private void setAgreedToUseLocation(boolean agreed) {
+        if (agreed) {
+            SharedPreferences settings = getSharedPreferences(PREFS_NAME, 0);
+            SharedPreferences.Editor editor = settings.edit();
+            editor.putBoolean(PREFS_USE_LOCATION, true);
+            editor.commit();
+        }
+    }
+
+    /**
+     * Informs the BackupManager of a change in backup state - if backup is disabled,
+     * the data on the server will be erased.
+     * @param enable whether to enable backup
+     */
+    private void setBackupEnabled(boolean enable) {
+        IBackupManager bm = IBackupManager.Stub.asInterface(
+                ServiceManager.getService(Context.BACKUP_SERVICE));
+        if (bm != null) {
+            try {
+                bm.setBackupEnabled(enable);
+            } catch (RemoteException e) {
+                mBackup.setChecked(!enable);
+                return;
+            }
+        }
+        mBackup.setChecked(enable);
+    }
+}
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index 257122bbdf6..ce236fd2244 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -37,6 +37,7 @@ import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
 import android.telephony.TelephonyManager;
 import android.telephony.NeighboringCellInfo;
+import android.telephony.cdma.CdmaCellLocation;
 import android.telephony.gsm.GsmCellLocation;
 import android.text.format.DateUtils;
 import android.util.Log;
@@ -51,6 +52,7 @@ import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.EditText;
 
+import com.android.internal.telephony.DataConnection;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneFactory;
 import com.android.internal.telephony.PhoneStateIntentReceiver;
@@ -72,7 +74,7 @@ import java.util.List;
 
 public class RadioInfo extends Activity {
     private final String TAG = "phone";
-    
+
     private static final int EVENT_PHONE_STATE_CHANGED = 100;
     private static final int EVENT_SIGNAL_STRENGTH_CHANGED = 200;
     private static final int EVENT_SERVICE_STATE_CHANGED = 300;
@@ -200,7 +202,7 @@ public class RadioInfo extends Activity {
                         int type = ((int[])ar.result)[0];
                         preferredNetworkType.setSelection(type, true);
                     } else {
-                        preferredNetworkType.setSelection(3, true);
+                        preferredNetworkType.setSelection(8, true);
                     }
                     break;
                 case EVENT_SET_PREFERRED_TYPE_DONE:
@@ -222,7 +224,7 @@ public class RadioInfo extends Activity {
                     ar= (AsyncResult) msg.obj;
                     if (ar.exception == null) {
                         mQxdmLogEnabled = !mQxdmLogEnabled;
-                        
+
                         updateQxdmState(mQxdmLogEnabled);
                         displayQxdmEnableResult();
                     }
@@ -256,22 +258,22 @@ public class RadioInfo extends Activity {
         }
     };
 
-    private class OemCommands {
+    static private class OemCommands {
 
-        public  final int OEM_QXDM_SDLOG_DEFAULT_FILE_SIZE = 32;
-        public  final int OEM_QXDM_SDLOG_DEFAULT_MASK = 0;
-        public  final int OEM_QXDM_SDLOG_DEFAULT_MAX_INDEX = 8;
+        public static final int OEM_QXDM_SDLOG_DEFAULT_FILE_SIZE = 32;
+        public static final int OEM_QXDM_SDLOG_DEFAULT_MASK = 0;
+        public static final int OEM_QXDM_SDLOG_DEFAULT_MAX_INDEX = 8;
 
-        final int SIZE_OF_INT = 4;
-        final int OEM_FEATURE_ENABLE = 1;
-        final int OEM_FEATURE_DISABLE = 0;
-        final int OEM_SIMPE_FEAUTURE_LEN = 1;
+        static final int SIZE_OF_INT = 4;
+        static final int OEM_FEATURE_ENABLE = 1;
+        static final int OEM_FEATURE_DISABLE = 0;
+        static final int OEM_SIMPE_FEAUTURE_LEN = 1;
+
+        static final int OEM_QXDM_SDLOG_FUNCTAG = 0x00010000;
+        static final int OEM_QXDM_SDLOG_LEN = 4;
+        static final int OEM_PS_AUTO_ATTACH_FUNCTAG = 0x00020000;
+        static final int OEM_CIPHERING_FUNCTAG = 0x00020001;
 
-        final int OEM_QXDM_SDLOG_FUNCTAG = 0x00010000;
-        final int OEM_QXDM_SDLOG_LEN = 4;
-        final int OEM_PS_AUTO_ATTACH_FUNCTAG = 0x00020000;
-        final int OEM_CIPHERING_FUNCTAG = 0x00020001;
-        
         /**
          * The OEM interface to store QXDM to SD.
          *
@@ -342,7 +344,7 @@ public class RadioInfo extends Activity {
         byte[] getCipheringData(boolean enable) {
             return getSimpleFeatureData(OEM_CIPHERING_FUNCTAG, enable);
         }
-        
+
         private byte[] getSimpleFeatureData(int tag, boolean enable) {
             ByteArrayOutputStream bos = new ByteArrayOutputStream();
             DataOutputStream dos = new DataOutputStream(bos);
@@ -407,7 +409,7 @@ public class RadioInfo extends Activity {
         preferredNetworkType = (Spinner) findViewById(R.id.preferredNetworkType);
         ArrayAdapter<String> adapter = new ArrayAdapter<String> (this,
                 android.R.layout.simple_spinner_item, mPreferredNetworkLabels);
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);        
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         preferredNetworkType.setAdapter(adapter);
         preferredNetworkType.setOnItemSelectedListener(mPreferredNetworkHandler);
 
@@ -427,12 +429,12 @@ public class RadioInfo extends Activity {
         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);
         mPhoneStateReceiver.notifyServiceState(EVENT_SERVICE_STATE_CHANGED);
         mPhoneStateReceiver.notifyPhoneCallState(EVENT_PHONE_STATE_CHANGED);
-                         
+
         updateQxdmState(null);
         mOem = new OemCommands();
 
@@ -544,7 +546,7 @@ public class RadioInfo extends Activity {
     private boolean isRadioOn() {
         return phone.getServiceState().getState() != ServiceState.STATE_POWER_OFF;
     }
-    
+
     private void updatePowerState() {
         String buttonText = isRadioOn() ?
                             getString(R.string.turn_off_radio) :
@@ -553,18 +555,18 @@ public class RadioInfo extends Activity {
     }
 
     private void updateQxdmState(Boolean newQxdmStatus) {
-        SharedPreferences sp = 
+        SharedPreferences sp =
           PreferenceManager.getDefaultSharedPreferences(phone.getContext());
         mQxdmLogEnabled = sp.getBoolean("qxdmstatus", false);
         // This is called from onCreate, onResume, and the handler when the status
-        // is updated. 
+        // is updated.
         if (newQxdmStatus != null) {
             SharedPreferences.Editor editor = sp.edit();
             editor.putBoolean("qxdmstatus", newQxdmStatus);
             editor.commit();
             mQxdmLogEnabled = newQxdmStatus;
         }
-        
+
         String buttonText = mQxdmLogEnabled ?
                             getString(R.string.turn_off_qxdm) :
                             getString(R.string.turn_on_qxdm);
@@ -620,38 +622,59 @@ public class RadioInfo extends Activity {
     }
 
     private final void updateLocation(CellLocation location) {
-        int lac = -1;
-        int cid = -1;
+        Resources r = getResources();
         if (location instanceof GsmCellLocation) {
             GsmCellLocation loc = (GsmCellLocation)location;
-            lac = loc.getLac();
-            cid = loc.getCid();
+            int lac = loc.getLac();
+            int cid = loc.getCid();
+            mLocation.setText(r.getString(R.string.radioInfo_lac) + " = "
+                    + ((lac == -1) ? "unknown" : Integer.toHexString(lac))
+                    + "   "
+                    + r.getString(R.string.radioInfo_cid) + " = "
+                    + ((cid == -1) ? "unknown" : Integer.toHexString(cid)));
+        } else if (location instanceof CdmaCellLocation) {
+            CdmaCellLocation loc = (CdmaCellLocation)location;
+            int bid = loc.getBaseStationId();
+            int sid = loc.getSystemId();
+            int nid = loc.getNetworkId();
+            int lat = loc.getBaseStationLatitude();
+            int lon = loc.getBaseStationLongitude();
+            mLocation.setText("BID = "
+                    + ((bid == -1) ? "unknown" : Integer.toHexString(bid))
+                    + "   "
+                    + "SID = "
+                    + ((sid == -1) ? "unknown" : Integer.toHexString(sid))
+                    + "   "
+                    + "NID = "
+                    + ((nid == -1) ? "unknown" : Integer.toHexString(nid))
+                    + "\n"
+                    + "LAT = "
+                    + ((lat == -1) ? "unknown" : Integer.toHexString(lat))
+                    + "   "
+                    + "LONG = "
+                    + ((lon == -1) ? "unknown" : Integer.toHexString(lon)));
+        } else {
+            mLocation.setText("unknown");
         }
 
-        Resources r = getResources();
 
-        mLocation.setText(r.getString(R.string.radioInfo_lac) + " = "
-                          + ((lac == -1) ? "unknown" : Integer.toHexString(lac))
-                          + "   "
-                          + r.getString(R.string.radioInfo_cid) + " = "
-                + ((cid == -1) ? "unknown" : Integer.toHexString(cid)));
     }
 
     private final void updateNeighboringCids(ArrayList<NeighboringCellInfo> cids) {
-        String neighborings = "";
+        StringBuilder sb = new StringBuilder();
+
         if (cids != null) {
             if ( cids.isEmpty() ) {
-                neighborings = "no neighboring cells";
+                sb.append("no neighboring cells");
             } else {
                 for (NeighboringCellInfo cell : cids) {
-                    neighborings += "{" + Integer.toHexString(cell.getCid()) 
-                    + "@" + cell.getRssi() + "} ";
+                    sb.append(cell.toString()).append(" ");
                 }
             }
         } else {
-            neighborings = "unknown";
+            sb.append("unknown");
         }
-        mNeighboringCids.setText(neighborings);
+        mNeighboringCids.setText(sb.toString());
     }
 
     private final void
@@ -671,7 +694,7 @@ public class RadioInfo extends Activity {
         int state = serviceState.getState();
         Resources r = getResources();
         String display = r.getString(R.string.radioInfo_unknown);
-        
+
         switch (state) {
             case ServiceState.STATE_IN_SERVICE:
                 display = r.getString(R.string.radioInfo_service_in);
@@ -684,9 +707,9 @@ public class RadioInfo extends Activity {
                 display = r.getString(R.string.radioInfo_service_off);
                 break;
         }
-        
+
         gsmState.setText(display);
-        
+
         if (serviceState.getRoaming()) {
             roamingState.setText(R.string.radioInfo_roaming_in);
         } else {
@@ -737,7 +760,7 @@ public class RadioInfo extends Activity {
                 display = r.getString(R.string.radioInfo_data_suspended);
                 break;
         }
-        
+
         gprsState.setText(display);
     }
 
@@ -755,12 +778,12 @@ public class RadioInfo extends Activity {
         Resources r = getResources();
 
         s = phone.getDeviceId();
-        if (s == null) s = r.getString(R.string.radioInfo_unknown); 
+        if (s == null) s = r.getString(R.string.radioInfo_unknown);
         mDeviceId.setText(s);
-        
+
 
         s = phone.getLine1Number();
-        if (s == null) s = r.getString(R.string.radioInfo_unknown); 
+        if (s == null) s = r.getString(R.string.radioInfo_unknown);
         number.setText(s);
     }
 
@@ -791,10 +814,10 @@ public class RadioInfo extends Activity {
             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);
-    
+
             sent.setText(txPackets + " " + packets + ", " + txBytes + " " + bytes);
             received.setText(rxPackets + " " + packets + ", " + rxBytes + " " + bytes);
         } catch (RemoteException e) {
@@ -828,7 +851,7 @@ public class RadioInfo extends Activity {
      */
     private final void pingHostname() {
         try {
-            Process p = Runtime.getRuntime().exec("ping -c 1 www.google.com"); 
+            Process p = Runtime.getRuntime().exec("ping -c 1 www.google.com");
             int status = p.waitFor();
             if (status == 0) {
                 mPingHostnameResult = "Pass";
@@ -916,20 +939,24 @@ public class RadioInfo extends Activity {
     private final void updatePdpList() {
         StringBuilder sb = new StringBuilder("========DATA=======\n");
 
-        List<PdpConnection> pdps = phone.getCurrentPdpList();
+        List<DataConnection> dcs = phone.getCurrentDataConnectionList();
 
-        for (PdpConnection pdp : pdps) {
-            sb.append("    State: ").append(pdp.getState().toString()).append("\n");
-            if (pdp.getState().isActive()) {
+        for (DataConnection dc : dcs) {
+            sb.append("    State: ").append(dc.getState().toString()).append("\n");
+            if (dc.getState().isActive()) {
                 long timeElapsed =
-                    (System.currentTimeMillis() - pdp.getConnectionTime())/1000;
+                    (System.currentTimeMillis() - dc.getConnectionTime())/1000;
                 sb.append("    connected at ")
-                  .append(DateUtils.timeString(pdp.getConnectionTime()))
+                  .append(DateUtils.timeString(dc.getConnectionTime()))
                   .append(" and elapsed ")
-                  .append(DateUtils.formatElapsedTime(timeElapsed))
-                  .append("\n    to ")
-                  .append(pdp.getApn().toString())
-                  .append("\ninterface: ")
+                  .append(DateUtils.formatElapsedTime(timeElapsed));
+
+                if (dc instanceof PdpConnection) {
+                    PdpConnection pdp = (PdpConnection)dc;
+                    sb.append("\n    to ")
+                      .append(pdp.getApn().toString());
+                }
+                sb.append("\ninterface: ")
                   .append(phone.getInterfaceName(phone.getActiveApnTypes()[0]))
                   .append("\naddress: ")
                   .append(phone.getIpAddress(phone.getActiveApnTypes()[0]))
@@ -939,14 +966,19 @@ public class RadioInfo extends Activity {
                 if (dns != null) {
                     sb.append("\ndns: ").append(dns[0]).append(", ").append(dns[1]);
                 }
-            } else if (pdp.getState().isInactive()) {
+            } else if (dc.getState().isInactive()) {
                 sb.append("    disconnected with last try at ")
-                  .append(DateUtils.timeString(pdp.getLastFailTime()))
+                  .append(DateUtils.timeString(dc.getLastFailTime()))
                   .append("\n    fail because ")
-                  .append(pdp.getLastFailCause().toString());
+                  .append(dc.getLastFailCause().toString());
             } else {
-                sb.append("    is connecting to ")
-                  .append(pdp.getApn().toString());
+                if (dc instanceof PdpConnection) {
+                    PdpConnection pdp = (PdpConnection)dc;
+                    sb.append("    is connecting to ")
+                      .append(pdp.getApn().toString());
+                } else {
+                    sb.append("    is connecting");
+                }
             }
             sb.append("\n===================");
         }
@@ -958,8 +990,7 @@ public class RadioInfo extends Activity {
     private void displayQxdmEnableResult() {
         String status = mQxdmLogEnabled ? "Start QXDM Log" : "Stop QXDM Log";
 
-        DialogInterface mProgressPanel = new AlertDialog.
-                Builder(this).setMessage(status).show();
+        new AlertDialog.Builder(this).setMessage(status).show();
 
         mHandler.postDelayed(
                 new Runnable() {
@@ -1036,7 +1067,7 @@ public class RadioInfo extends Activity {
             return true;
         }
     };
-    
+
     private MenuItem.OnMenuItemClickListener mToggleData = new MenuItem.OnMenuItemClickListener() {
         public boolean onMenuItemClick(MenuItem item) {
             int state = mTelephonyManager.getDataState();
@@ -1082,7 +1113,7 @@ public class RadioInfo extends Activity {
         public void onClick(View v) {
             mCipherOn = !getCiphPref();
             byte[] data = mOem.getCipheringData(mCipherOn);
-            
+
             if (data == null)
                 return;
 
@@ -1091,14 +1122,14 @@ public class RadioInfo extends Activity {
                     mHandler.obtainMessage(EVENT_SET_CIPHER_DONE));
         }
     };
-    
+
     OnClickListener mDnsCheckButtonHandler = new OnClickListener() {
         public void onClick(View v) {
             phone.disableDnsCheck(!phone.isDnsCheckDisabled());
             updateDnsCheckState();
         }
     };
-    
+
     OnClickListener mPingButtonHandler = new OnClickListener() {
         public void onClick(View v) {
             updatePingState();
@@ -1149,5 +1180,13 @@ public class RadioInfo extends Activity {
     };
 
     private String[] mPreferredNetworkLabels = {
-            "WCDMA preferred", "GSM only", "WCDMA only", "Unknown"};
+            "WCDMA preferred",
+            "GSM only",
+            "WCDMA only",
+            "GSM auto (PRL)",
+            "CDMA auto (PRL)",
+            "CDMA only",
+            "EvDo only",
+            "GSM/CDMA auto (PRL)",
+            "Unknown"};
 }
diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index 2d21ec6e997..0d01965732f 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -16,10 +16,12 @@
 
 package com.android.settings;
 
+import android.app.Dialog;
 import android.content.Context;
 import android.media.AudioManager;
+import android.os.Parcel;
+import android.os.Parcelable;
 import android.preference.VolumePreference;
-import android.preference.VolumePreference.SeekBarVolumizer;
 import android.provider.Settings;
 import android.util.AttributeSet;
 import android.view.View;
@@ -121,9 +123,79 @@ public class RingerVolumePreference extends VolumePreference implements
     
     private void cleanup() {
         if (mNotificationSeekBarVolumizer != null) {
+            Dialog dialog = getDialog();
+            if (dialog != null && dialog.isShowing()) {
+                // Stopped while dialog was showing, revert changes
+                mNotificationSeekBarVolumizer.revertVolume();
+            }
             mNotificationSeekBarVolumizer.stop();
             mNotificationSeekBarVolumizer = null;
         }
     }
-    
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        final Parcelable superState = super.onSaveInstanceState();
+        if (isPersistent()) {
+            // No need to save instance state since it's persistent
+            return superState;
+        }
+
+        final SavedState myState = new SavedState(superState);
+        if (mNotificationSeekBarVolumizer != null) {
+            mNotificationSeekBarVolumizer.onSaveInstanceState(myState.getVolumeStore());
+        }
+        return myState;
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Parcelable state) {
+        if (state == null || !state.getClass().equals(SavedState.class)) {
+            // Didn't save state for us in onSaveInstanceState
+            super.onRestoreInstanceState(state);
+            return;
+        }
+
+        SavedState myState = (SavedState) state;
+        super.onRestoreInstanceState(myState.getSuperState());
+        if (mNotificationSeekBarVolumizer != null) {
+            mNotificationSeekBarVolumizer.onRestoreInstanceState(myState.getVolumeStore());
+        }
+    }
+
+    private static class SavedState extends BaseSavedState {
+        VolumeStore mVolumeStore = new VolumeStore();
+
+        public SavedState(Parcel source) {
+            super(source);
+            mVolumeStore.volume = source.readInt();
+            mVolumeStore.originalVolume = source.readInt();
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            super.writeToParcel(dest, flags);
+            dest.writeInt(mVolumeStore.volume);
+            dest.writeInt(mVolumeStore.originalVolume);
+        }
+
+        VolumeStore getVolumeStore() {
+            return mVolumeStore;
+        }
+
+        public SavedState(Parcelable superState) {
+            super(superState);
+        }
+
+        public static final Parcelable.Creator<SavedState> CREATOR =
+                new Parcelable.Creator<SavedState>() {
+            public SavedState createFromParcel(Parcel in) {
+                return new SavedState(in);
+            }
+
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+    }
 }
diff --git a/src/com/android/settings/RunningServices.java b/src/com/android/settings/RunningServices.java
new file mode 100644
index 00000000000..6c11ea0ce37
--- /dev/null
+++ b/src/com/android/settings/RunningServices.java
@@ -0,0 +1,953 @@
+/*
+ * 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 com.android.settings.R;
+import android.app.ActivityManager;
+import android.app.ActivityManagerNative;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.ListActivity;
+import android.app.PendingIntent;
+import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentSender;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageItemInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ServiceInfo;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.Debug;
+import android.os.Handler;
+import android.os.Message;
+import android.os.RemoteException;
+import android.os.SystemClock;
+import android.os.SystemProperties;
+import android.text.format.DateUtils;
+import android.text.format.Formatter;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.SparseArray;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AbsListView;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import java.io.FileInputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+public class RunningServices extends ListActivity
+        implements AbsListView.RecyclerListener,
+        DialogInterface.OnClickListener {
+    static final String TAG = "RunningServices";
+    
+    /** Maximum number of services to retrieve */
+    static final int MAX_SERVICES = 100;
+    
+    static final int MSG_UPDATE_TIMES = 1;
+    static final int MSG_UPDATE_CONTENTS = 2;
+    
+    static final long TIME_UPDATE_DELAY = 1000;
+    static final long CONTENTS_UPDATE_DELAY = 2000;
+    
+    // Memory pages are 4K.
+    static final long PAGE_SIZE = 4*1024;
+    
+    long SECONDARY_SERVER_MEM;
+    
+    final HashMap<View, ActiveItem> mActiveItems = new HashMap<View, ActiveItem>();
+    
+    ActivityManager mAm;
+    
+    State mState;
+    
+    StringBuilder mBuilder = new StringBuilder(128);
+    
+    BaseItem mCurSelected;
+    
+    int mProcessBgColor;
+    
+    TextView mBackgroundProcessText;
+    TextView mForegroundProcessText;
+    
+    int mLastNumBackgroundProcesses = -1;
+    int mLastNumForegroundProcesses = -1;
+    long mLastBackgroundProcessMemory = -1;
+    long mLastForegroundProcessMemory = -1;
+    long mLastAvailMemory = -1;
+    
+    Dialog mCurDialog;
+    
+    byte[] mBuffer = new byte[1024];
+    
+    class ActiveItem {
+        View mRootView;
+        BaseItem mItem;
+        ActivityManager.RunningServiceInfo mService;
+        ViewHolder mHolder;
+        long mFirstRunTime;
+        
+        void updateTime(Context context) {
+            if (mItem.mIsProcess) {
+                String size = mItem.mSizeStr != null ? mItem.mSizeStr : "";
+                if (!size.equals(mItem.mCurSizeStr)) {
+                    mItem.mCurSizeStr = size;
+                    mHolder.size.setText(size);
+                }
+            } else {
+                if (mItem.mActiveSince >= 0) {
+                    mHolder.size.setText(DateUtils.formatElapsedTime(mBuilder,
+                            (SystemClock.uptimeMillis()-mFirstRunTime)/1000));
+                } else {
+                    mHolder.size.setText(context.getResources().getText(
+                            R.string.service_restarting));
+                }
+            }
+        }
+    }
+    
+    static class BaseItem {
+        final boolean mIsProcess;
+        
+        PackageItemInfo mPackageInfo;
+        CharSequence mDisplayLabel;
+        String mLabel;
+        String mDescription;
+        
+        int mCurSeq;
+        
+        long mActiveSince;
+        long mSize;
+        String mSizeStr;
+        String mCurSizeStr;
+        boolean mNeedDivider;
+        
+        public BaseItem(boolean isProcess) {
+            mIsProcess = isProcess;
+        }
+    }
+    
+    static class ServiceItem extends BaseItem {
+        ActivityManager.RunningServiceInfo mRunningService;
+        ServiceInfo mServiceInfo;
+        boolean mShownAsStarted;
+        
+        public ServiceItem() {
+            super(false);
+        }
+    }
+    
+    static class ProcessItem extends BaseItem {
+        final HashMap<ComponentName, ServiceItem> mServices
+                = new HashMap<ComponentName, ServiceItem>();
+        final SparseArray<ProcessItem> mDependentProcesses
+                = new SparseArray<ProcessItem>();
+        
+        final int mUid;
+        final String mProcessName;
+        int mPid;
+        
+        ProcessItem mClient;
+        int mLastNumDependentProcesses;
+        
+        int mRunningSeq;
+        ActivityManager.RunningAppProcessInfo mRunningProcessInfo;
+        
+        public ProcessItem(Context context, int uid, String processName) {
+            super(true);
+            mDescription = context.getResources().getString(
+                    R.string.service_process_name, processName);
+            mUid = uid;
+            mProcessName = processName;
+        }
+        
+        void ensureLabel(PackageManager pm) {
+            if (mLabel != null) {
+                return;
+            }
+            
+            try {
+                ApplicationInfo ai = pm.getApplicationInfo(mProcessName, 0);
+                if (ai.uid == mUid) {
+                    mDisplayLabel = ai.loadLabel(pm);
+                    mLabel = mDisplayLabel.toString();
+                    mPackageInfo = ai;
+                    return;
+                }
+            } catch (PackageManager.NameNotFoundException e) {
+            }
+            
+            // If we couldn't get information about the overall
+            // process, try to find something about the uid.
+            String[] pkgs = pm.getPackagesForUid(mUid);
+            
+            // If there is one package with this uid, that is what we want.
+            if (pkgs.length == 1) {
+                try {
+                    ApplicationInfo ai = pm.getApplicationInfo(pkgs[0], 0);
+                    mDisplayLabel = ai.loadLabel(pm);
+                    mLabel = mDisplayLabel.toString();
+                    mPackageInfo = ai;
+                    return;
+                } catch (PackageManager.NameNotFoundException e) {
+                }
+            }
+            
+            // If there are multiple, see if one gives us the official name
+            // for this uid.
+            for (String name : pkgs) {
+                try {
+                    PackageInfo pi = pm.getPackageInfo(name, 0);
+                    if (pi.sharedUserLabel != 0) {
+                        CharSequence nm = pm.getText(name,
+                                pi.sharedUserLabel, pi.applicationInfo);
+                        if (nm != null) {
+                            mDisplayLabel = nm;
+                            mLabel = nm.toString();
+                            mPackageInfo = pi.applicationInfo;
+                            return;
+                        }
+                    }
+                } catch (PackageManager.NameNotFoundException e) {
+                }
+            }
+            
+            // If still don't have anything to display, just use the
+            // service info.
+            if (mServices.size() > 0) {
+                mPackageInfo = mServices.values().iterator().next()
+                        .mServiceInfo.applicationInfo;
+                mDisplayLabel = mPackageInfo.loadLabel(pm);
+                mLabel = mDisplayLabel.toString();
+                return;
+            }
+            
+            // Finally... whatever, just pick the first package's name.
+            try {
+                ApplicationInfo ai = pm.getApplicationInfo(pkgs[0], 0);
+                mDisplayLabel = ai.loadLabel(pm);
+                mLabel = mDisplayLabel.toString();
+                mPackageInfo = ai;
+                return;
+            } catch (PackageManager.NameNotFoundException e) {
+            }
+        }
+        
+        boolean updateService(Context context,
+                ActivityManager.RunningServiceInfo service) {
+            final PackageManager pm = context.getPackageManager();
+            
+            boolean changed = false;
+            ServiceItem si = mServices.get(service.service);
+            if (si == null) {
+                changed = true;
+                si = new ServiceItem();
+                si.mRunningService = service;
+                try {
+                    si.mServiceInfo = pm.getServiceInfo(service.service, 0);
+                } catch (PackageManager.NameNotFoundException e) {
+                }
+                if (si.mServiceInfo != null && (si.mServiceInfo.labelRes != 0
+                        || si.mServiceInfo.nonLocalizedLabel != null)) {
+                    si.mDisplayLabel = si.mServiceInfo.loadLabel(pm);
+                    si.mLabel = si.mDisplayLabel.toString();
+                } else {
+                    si.mLabel = si.mRunningService.service.getClassName();
+                    int tail = si.mLabel.lastIndexOf('.');
+                    if (tail >= 0) {
+                        si.mLabel = si.mLabel.substring(tail+1, si.mLabel.length());
+                    }
+                    si.mDisplayLabel = si.mLabel;
+                }
+                si.mPackageInfo = si.mServiceInfo.applicationInfo;
+                mServices.put(service.service, si);
+            }
+            si.mCurSeq = mCurSeq;
+            si.mRunningService = service;
+            long activeSince = service.restarting == 0 ? service.activeSince : -1;
+            if (si.mActiveSince != activeSince) {
+                si.mActiveSince = activeSince;
+                changed = true;
+            }
+            if (service.clientPackage != null && service.clientLabel != 0) {
+                if (si.mShownAsStarted) {
+                    si.mShownAsStarted = false;
+                    changed = true;
+                }
+                try {
+                    Resources clientr = pm.getResourcesForApplication(service.clientPackage);
+                    String label = clientr.getString(service.clientLabel);
+                    si.mDescription = context.getResources().getString(
+                            R.string.service_client_name, label);
+                } catch (PackageManager.NameNotFoundException e) {
+                    si.mDescription = null;
+                }
+            } else {
+                if (!si.mShownAsStarted) {
+                    si.mShownAsStarted = true;
+                    changed = true;
+                }
+                si.mDescription = context.getResources().getString(
+                        R.string.service_started_by_app);
+            }
+            
+            return changed;
+        }
+        
+        boolean updateSize(Context context, Debug.MemoryInfo mem, int curSeq) {
+            mSize = ((long)mem.getTotalPss()) * 1024;
+            if (mCurSeq == curSeq) {
+                String sizeStr = Formatter.formatShortFileSize(
+                        context, mSize);
+                if (!sizeStr.equals(mSizeStr)){
+                    mSizeStr = sizeStr;
+                    // We update this on the second tick where we update just
+                    // the text in the current items, so no need to say we
+                    // changed here.
+                    return false;
+                }
+            }
+            return false;
+        }
+        
+        boolean buildDependencyChain(Context context, PackageManager pm, int curSeq) {
+            final int NP = mDependentProcesses.size();
+            boolean changed = false;
+            for (int i=0; i<NP; i++) {
+                ProcessItem proc = mDependentProcesses.valueAt(i);
+                if (proc.mClient != this) {
+                    changed = true;
+                    proc.mClient = this;
+                }
+                proc.mCurSeq = curSeq;
+                proc.ensureLabel(pm);
+                changed |= proc.buildDependencyChain(context, pm, curSeq);
+            }
+            
+            if (mLastNumDependentProcesses != mDependentProcesses.size()) {
+                changed = true;
+                mLastNumDependentProcesses = mDependentProcesses.size();
+            }
+            
+            return changed;
+        }
+        
+        void addDependentProcesses(ArrayList<BaseItem> dest,
+                ArrayList<ProcessItem> destProc) {
+            final int NP = mDependentProcesses.size();
+            for (int i=0; i<NP; i++) {
+                ProcessItem proc = mDependentProcesses.valueAt(i);
+                proc.addDependentProcesses(dest, destProc);
+                dest.add(proc);
+                if (proc.mPid > 0) {
+                    destProc.add(proc);
+                }
+            }
+        }
+    }
+    
+    static class State {
+        final SparseArray<HashMap<String, ProcessItem>> mProcesses
+                = new SparseArray<HashMap<String, ProcessItem>>();
+        final SparseArray<ProcessItem> mActiveProcesses
+                = new SparseArray<ProcessItem>();
+        
+        // Temporary for finding process dependencies.
+        final SparseArray<ProcessItem> mRunningProcesses
+                = new SparseArray<ProcessItem>();
+        
+        final ArrayList<BaseItem> mItems = new ArrayList<BaseItem>();
+        final ArrayList<ProcessItem> mProcessItems = new ArrayList<ProcessItem>();
+        final ArrayList<ProcessItem> mAllProcessItems = new ArrayList<ProcessItem>();
+        
+        int mSequence = 0;
+        
+        int mNumBackgroundProcesses;
+        long mBackgroundProcessMemory;
+        int mNumForegroundProcesses;
+        long mForegroundProcessMemory;
+        
+        boolean update(Context context, ActivityManager am) {
+            final PackageManager pm = context.getPackageManager();
+            
+            mSequence++;
+            
+            boolean changed = false;
+            
+            List<ActivityManager.RunningServiceInfo> services 
+                    = am.getRunningServices(MAX_SERVICES);
+            final int NS = services != null ? services.size() : 0;
+            for (int i=0; i<NS; i++) {
+                ActivityManager.RunningServiceInfo si = services.get(i);
+                // We are not interested in services that have not been started
+                // and don't have a known client, because
+                // there is nothing the user can do about them.
+                if (!si.started && si.clientLabel == 0) {
+                    continue;
+                }
+                // We likewise don't care about services running in a
+                // persistent process like the system or phone.
+                if ((si.flags&ActivityManager.RunningServiceInfo.FLAG_PERSISTENT_PROCESS)
+                        != 0) {
+                    continue;
+                }
+                
+                HashMap<String, ProcessItem> procs = mProcesses.get(si.uid);
+                if (procs == null) {
+                    procs = new HashMap<String, ProcessItem>();
+                    mProcesses.put(si.uid, procs);
+                }
+                ProcessItem proc = procs.get(si.process);
+                if (proc == null) {
+                    changed = true;
+                    proc = new ProcessItem(context, si.uid, si.process);
+                    procs.put(si.process, proc);
+                }
+                
+                if (proc.mCurSeq != mSequence) {
+                    int pid = si.restarting == 0 ? si.pid : 0;
+                    if (pid != proc.mPid) {
+                        changed = true;
+                        if (proc.mPid != pid) {
+                            if (proc.mPid != 0) {
+                                mActiveProcesses.remove(proc.mPid);
+                            }
+                            if (pid != 0) {
+                                mActiveProcesses.put(pid, proc);
+                            }
+                            proc.mPid = pid;
+                        }
+                    }
+                    proc.mDependentProcesses.clear();
+                    proc.mCurSeq = mSequence;
+                }
+                changed |= proc.updateService(context, si);
+            }
+            
+            // Now update the map of other processes that are running (but
+            // don't have services actively running inside them).
+            List<ActivityManager.RunningAppProcessInfo> processes
+                    = am.getRunningAppProcesses();
+            final int NP = processes != null ? processes.size() : 0;
+            for (int i=0; i<NP; i++) {
+                ActivityManager.RunningAppProcessInfo pi = processes.get(i);
+                ProcessItem proc = mActiveProcesses.get(pi.pid);
+                if (proc == null) {
+                    // This process is not one that is a direct container
+                    // of a service, so look for it in the secondary
+                    // running list.
+                    proc = mRunningProcesses.get(pi.pid);
+                    if (proc == null) {
+                        proc = new ProcessItem(context, pi.uid, pi.processName);
+                        proc.mPid = pi.pid;
+                        mRunningProcesses.put(pi.pid, proc);
+                    }
+                    proc.mDependentProcesses.clear();
+                }
+                proc.mRunningSeq = mSequence;
+                proc.mRunningProcessInfo = pi;
+            }
+            
+            // Build the chains from client processes to the process they are
+            // dependent on; also remove any old running processes.
+            int NRP = mRunningProcesses.size();
+            for (int i=0; i<NRP; i++) {
+                ProcessItem proc = mRunningProcesses.valueAt(i);
+                if (proc.mRunningSeq == mSequence) {
+                    int clientPid = proc.mRunningProcessInfo.importanceReasonPid;
+                    if (clientPid != 0) {
+                        ProcessItem client = mActiveProcesses.get(clientPid);
+                        if (client == null) {
+                            client = mRunningProcesses.get(clientPid);
+                        }
+                        if (client != null) {
+                            client.mDependentProcesses.put(proc.mPid, proc);
+                        }
+                    } else {
+                        // In this pass the process doesn't have a client.
+                        // Clear to make sure if it later gets the same one
+                        // that we will detect the change.
+                        proc.mClient = null;
+                    }
+                } else {
+                    mRunningProcesses.remove(mRunningProcesses.keyAt(i));
+                }
+            }
+            
+            // Follow the tree from all primary service processes to all
+            // processes they are dependent on, marking these processes as
+            // still being active and determining if anything has changed.
+            final int NAP = mActiveProcesses.size();
+            for (int i=0; i<NAP; i++) {
+                ProcessItem proc = mActiveProcesses.valueAt(i);
+                if (proc.mCurSeq == mSequence) {
+                    changed |= proc.buildDependencyChain(context, pm, mSequence);
+                }
+            }
+            
+            // Look for services and their primary processes that no longer exist...
+            for (int i=0; i<mProcesses.size(); i++) {
+                HashMap<String, ProcessItem> procs = mProcesses.valueAt(i);
+                Iterator<ProcessItem> pit = procs.values().iterator();
+                while (pit.hasNext()) {
+                    ProcessItem pi = pit.next();
+                    if (pi.mCurSeq == mSequence) {
+                        pi.ensureLabel(pm);
+                        if (pi.mPid == 0) {
+                            // Sanity: a non-process can't be dependent on
+                            // anything.
+                            pi.mDependentProcesses.clear();
+                        }
+                    } else {
+                        changed = true;
+                        pit.remove();
+                        if (procs.size() == 0) {
+                            mProcesses.remove(mProcesses.keyAt(i));
+                        }
+                        if (pi.mPid != 0) {
+                            mActiveProcesses.remove(pi.mPid);
+                        }
+                        continue;
+                    }
+                    Iterator<ServiceItem> sit = pi.mServices.values().iterator();
+                    while (sit.hasNext()) {
+                        ServiceItem si = sit.next();
+                        if (si.mCurSeq != mSequence) {
+                            changed = true;
+                            sit.remove();
+                        }
+                    }
+                }
+            }
+            
+            if (changed) {
+                mItems.clear();
+                mProcessItems.clear();
+                for (int i=0; i<mProcesses.size(); i++) {
+                    for (ProcessItem pi : mProcesses.valueAt(i).values()) {
+                        pi.mNeedDivider = false;
+                        // First add processes we are dependent on.
+                        pi.addDependentProcesses(mItems, mProcessItems);
+                        // And add the process itself.
+                        mItems.add(pi);
+                        if (pi.mPid > 0) {
+                            mProcessItems.add(pi);
+                        }
+                        // And finally the services running in it.
+                        boolean needDivider = false;
+                        for (ServiceItem si : pi.mServices.values()) {
+                            si.mNeedDivider = needDivider;
+                            needDivider = true;
+                            mItems.add(si);
+                        }
+                    }
+                }
+            }
+            
+            // Count number of interesting other (non-active) processes, and
+            // build a list of all processes we will retrieve memory for.
+            mAllProcessItems.clear();
+            mAllProcessItems.addAll(mProcessItems);
+            mNumBackgroundProcesses = 0;
+            mNumForegroundProcesses = 0;
+            NRP = mRunningProcesses.size();
+            for (int i=0; i<NRP; i++) {
+                ProcessItem proc = mRunningProcesses.valueAt(i);
+                if (proc.mCurSeq != mSequence) {
+                    // We didn't hit this process as a dependency on one
+                    // of our active ones, so add it up if needed.
+                    if (proc.mRunningProcessInfo.importance >=
+                            ActivityManager.RunningAppProcessInfo.IMPORTANCE_BACKGROUND) {
+                        mNumBackgroundProcesses++;
+                        mAllProcessItems.add(proc);
+                    } else if (proc.mRunningProcessInfo.importance <=
+                            ActivityManager.RunningAppProcessInfo.IMPORTANCE_VISIBLE) {
+                        mNumForegroundProcesses++;
+                        mAllProcessItems.add(proc);
+                    }
+                }
+            }
+            
+            try {
+                mBackgroundProcessMemory = 0;
+                mForegroundProcessMemory = 0;
+                final int numProc = mAllProcessItems.size();
+                int[] pids = new int[numProc];
+                for (int i=0; i<numProc; i++) {
+                    pids[i] = mAllProcessItems.get(i).mPid;
+                }
+                Debug.MemoryInfo[] mem = ActivityManagerNative.getDefault()
+                        .getProcessMemoryInfo(pids);
+                for (int i=pids.length-1; i>=0; i--) {
+                    ProcessItem proc = mAllProcessItems.get(i);
+                    changed |= proc.updateSize(context, mem[i], mSequence);
+                    if (proc.mCurSeq == mSequence) {
+                        continue;
+                    }
+                    if (proc.mRunningProcessInfo.importance >=
+                            ActivityManager.RunningAppProcessInfo.IMPORTANCE_BACKGROUND) {
+                        mBackgroundProcessMemory += proc.mSize;
+                    } else if (proc.mRunningProcessInfo.importance <=
+                            ActivityManager.RunningAppProcessInfo.IMPORTANCE_VISIBLE) {
+                        mForegroundProcessMemory += proc.mSize;
+                    }
+                }
+            } catch (RemoteException e) {
+            }
+            
+            return changed;
+        }
+    }
+    
+    static class TimeTicker extends TextView {
+        public TimeTicker(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+    }
+    
+    static class ViewHolder {
+        ImageView separator;
+        ImageView icon;
+        TextView name;
+        TextView description;
+        TextView size;
+    }
+    
+    class ServiceListAdapter extends BaseAdapter {
+        final State mState;
+        final LayoutInflater mInflater;
+        
+        ServiceListAdapter(State state) {
+            mState = state;
+            mInflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        }
+
+        public boolean hasStableIds() {
+            return true;
+        }
+        
+        public int getCount() {
+            return mState.mItems.size();
+        }
+
+        public Object getItem(int position) {
+            return mState.mItems.get(position);
+        }
+
+        public long getItemId(int position) {
+            return position;
+        }
+
+        public boolean areAllItemsEnabled() {
+            return false;
+        }
+
+        public boolean isEnabled(int position) {
+            return !mState.mItems.get(position).mIsProcess;
+        }
+
+        public View getView(int position, View convertView, ViewGroup parent) {
+            View v;
+            if (convertView == null) {
+                v = newView(parent);
+            } else {
+                v = convertView;
+            }
+            bindView(v, position);
+            return v;
+        }
+        
+        public View newView(ViewGroup parent) {
+            View v = mInflater.inflate(R.layout.running_services_item, parent, false);
+            ViewHolder h = new ViewHolder();
+            h.separator = (ImageView)v.findViewById(R.id.separator);
+            h.icon = (ImageView)v.findViewById(R.id.icon);
+            h.name = (TextView)v.findViewById(R.id.name);
+            h.description = (TextView)v.findViewById(R.id.description);
+            h.size = (TextView)v.findViewById(R.id.size);
+            v.setTag(h);
+            return v;
+        }
+        
+        public void bindView(View view, int position) {
+            ViewHolder vh = (ViewHolder) view.getTag();
+            BaseItem item = mState.mItems.get(position);
+            vh.name.setText(item.mDisplayLabel);
+            vh.separator.setVisibility(item.mNeedDivider
+                    ? View.VISIBLE : View.INVISIBLE);
+            ActiveItem ai = new ActiveItem();
+            ai.mRootView = view;
+            ai.mItem = item;
+            ai.mHolder = vh;
+            ai.mFirstRunTime = item.mActiveSince;
+            vh.description.setText(item.mDescription);
+            if (item.mIsProcess) {
+                view.setBackgroundColor(mProcessBgColor);
+                vh.icon.setImageDrawable(null);
+                vh.icon.setVisibility(View.GONE);
+                vh.description.setText(item.mDescription);
+                item.mCurSizeStr = null;
+            } else {
+                view.setBackgroundDrawable(null);
+                vh.icon.setImageDrawable(item.mPackageInfo.loadIcon(getPackageManager()));
+                vh.icon.setVisibility(View.VISIBLE);
+                vh.description.setText(item.mDescription);
+                ai.mFirstRunTime = item.mActiveSince;
+            }
+            ai.updateTime(RunningServices.this);
+            mActiveItems.put(view, ai);
+        }
+    }
+    
+    final Handler mHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case MSG_UPDATE_TIMES:
+                    Iterator<ActiveItem> it = mActiveItems.values().iterator();
+                    while (it.hasNext()) {
+                        ActiveItem ai = it.next();
+                        if (ai.mRootView.getWindowToken() == null) {
+                            // Clean out any dead views, just in case.
+                            it.remove();
+                            continue;
+                        }
+                        ai.updateTime(RunningServices.this);
+                    }
+                    removeMessages(MSG_UPDATE_TIMES);
+                    msg = obtainMessage(MSG_UPDATE_TIMES);
+                    sendMessageDelayed(msg, TIME_UPDATE_DELAY);
+                    break;
+                case MSG_UPDATE_CONTENTS:
+                    updateList();
+                    removeMessages(MSG_UPDATE_CONTENTS);
+                    msg = obtainMessage(MSG_UPDATE_CONTENTS);
+                    sendMessageDelayed(msg, CONTENTS_UPDATE_DELAY);
+                    break;
+            }
+        }
+    };
+    
+    private boolean matchText(byte[] buffer, int index, String text) {
+        int N = text.length();
+        if ((index+N) >= buffer.length) {
+            return false;
+        }
+        for (int i=0; i<N; i++) {
+            if (buffer[index+i] != text.charAt(i)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    
+    private long extractMemValue(byte[] buffer, int index) {
+        while (index < buffer.length && buffer[index] != '\n') {
+            if (buffer[index] >= '0' && buffer[index] <= '9') {
+                int start = index;
+                index++;
+                while (index < buffer.length && buffer[index] >= '0'
+                    && buffer[index] <= '9') {
+                    index++;
+                }
+                String str = new String(buffer, 0, start, index-start);
+                return ((long)Integer.parseInt(str)) * 1024;
+            }
+            index++;
+        }
+        return 0;
+    }
+    
+    private long readAvailMem() {
+        try {
+            long memFree = 0;
+            long memCached = 0;
+            FileInputStream is = new FileInputStream("/proc/meminfo");
+            int len = is.read(mBuffer);
+            is.close();
+            final int BUFLEN = mBuffer.length;
+            for (int i=0; i<len && (memFree == 0 || memCached == 0); i++) {
+                if (matchText(mBuffer, i, "MemFree")) {
+                    i += 7;
+                    memFree = extractMemValue(mBuffer, i);
+                } else if (matchText(mBuffer, i, "Cached")) {
+                    i += 6;
+                    memCached = extractMemValue(mBuffer, i);
+                }
+                while (i < BUFLEN && mBuffer[i] != '\n') {
+                    i++;
+                }
+            }
+            return memFree + memCached;
+        } catch (java.io.FileNotFoundException e) {
+        } catch (java.io.IOException e) {
+        }
+        return 0;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mAm = (ActivityManager)getSystemService(Context.ACTIVITY_SERVICE);
+        mState = (State)getLastNonConfigurationInstance();
+        if (mState == null) {
+            mState = new State();
+        }
+        mProcessBgColor = 0xff505050;
+        setContentView(R.layout.running_services);
+        getListView().setDivider(null);
+        getListView().setAdapter(new ServiceListAdapter(mState));
+        mBackgroundProcessText = (TextView)findViewById(R.id.backgroundText);
+        mForegroundProcessText = (TextView)findViewById(R.id.foregroundText);
+        
+        // Magic!  Implementation detail!  Don't count on this!
+        SECONDARY_SERVER_MEM =
+            Integer.valueOf(SystemProperties.get("ro.SECONDARY_SERVER_MEM"))*PAGE_SIZE;
+    }
+
+    void updateList() {
+        if (mState.update(this, mAm)) {
+            ((ServiceListAdapter)(getListView().getAdapter())).notifyDataSetChanged();
+        }
+        
+        // This is the amount of available memory until we start killing
+        // background services.
+        long availMem = readAvailMem() - SECONDARY_SERVER_MEM;
+        if (availMem < 0) {
+            availMem = 0;
+        }
+        
+        if (mLastNumBackgroundProcesses != mState.mNumBackgroundProcesses
+                || mLastBackgroundProcessMemory != mState.mBackgroundProcessMemory
+                || mLastAvailMemory != availMem) {
+            mLastNumBackgroundProcesses = mState.mNumBackgroundProcesses;
+            mLastBackgroundProcessMemory = mState.mBackgroundProcessMemory;
+            mLastAvailMemory = availMem;
+            String availStr = availMem != 0
+                    ? Formatter.formatShortFileSize(this, availMem) : "0";
+            String sizeStr = Formatter.formatShortFileSize(this, mLastBackgroundProcessMemory);
+            mBackgroundProcessText.setText(getResources().getString(
+                    R.string.service_background_processes,
+                    mLastNumBackgroundProcesses, availStr, sizeStr));
+        }
+        if (mLastNumForegroundProcesses != mState.mNumForegroundProcesses
+                || mLastForegroundProcessMemory != mState.mForegroundProcessMemory) {
+            mLastNumForegroundProcesses = mState.mNumForegroundProcesses;
+            mLastForegroundProcessMemory = mState.mForegroundProcessMemory;
+            String sizeStr = Formatter.formatShortFileSize(this, mLastForegroundProcessMemory);
+            mForegroundProcessText.setText(getResources().getString(
+                    R.string.service_foreground_processes, mLastNumForegroundProcesses, sizeStr));
+        }
+    }
+    
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+        BaseItem bi = (BaseItem)l.getAdapter().getItem(position);
+        if (!bi.mIsProcess) {
+            ServiceItem si = (ServiceItem)bi;
+            if (si.mRunningService.clientLabel != 0) {
+                mCurSelected = null;
+                PendingIntent pi = mAm.getRunningServiceControlPanel(
+                        si.mRunningService.service);
+                if (pi != null) {
+                    try {
+                        this.startIntentSender(pi.getIntentSender(), null,
+                                Intent.FLAG_ACTIVITY_NEW_TASK
+                                        | Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET,
+                                Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET, 0);
+                    } catch (IntentSender.SendIntentException e) {
+                        Log.w(TAG, e);
+                    } catch (IllegalArgumentException e) {
+                        Log.w(TAG, e);
+                    } catch (ActivityNotFoundException e) {
+                        Log.w(TAG, e);
+                    }
+                }
+            } else {
+                mCurSelected = bi;
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                builder.setTitle(R.string.confirm_stop_service);
+                String msg = getResources().getString(
+                        R.string.confirm_stop_service_msg,
+                        si.mPackageInfo.loadLabel(getPackageManager()));
+                builder.setMessage(msg);
+                builder.setPositiveButton(R.string.confirm_stop_stop, this);
+                builder.setNegativeButton(R.string.confirm_stop_cancel, null);
+                builder.setCancelable(true);
+                mCurDialog = builder.show();
+            }
+        } else {
+            mCurSelected = null;
+        }
+    }
+
+    public void onClick(DialogInterface dialog, int which) {
+        if (mCurSelected != null) {
+            stopService(new Intent().setComponent(
+                    ((ServiceItem)mCurSelected).mRunningService.service));
+            updateList();
+        }
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        mHandler.removeMessages(MSG_UPDATE_TIMES);
+        mHandler.removeMessages(MSG_UPDATE_CONTENTS);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        updateList();
+        mHandler.removeMessages(MSG_UPDATE_TIMES);
+        Message msg = mHandler.obtainMessage(MSG_UPDATE_TIMES);
+        mHandler.sendMessageDelayed(msg, TIME_UPDATE_DELAY);
+        mHandler.removeMessages(MSG_UPDATE_CONTENTS);
+        msg = mHandler.obtainMessage(MSG_UPDATE_CONTENTS);
+        mHandler.sendMessageDelayed(msg, CONTENTS_UPDATE_DELAY);
+    }
+
+    @Override
+    public Object onRetainNonConfigurationInstance() {
+        return mState;
+    }
+
+    public void onMovedToScrapHeap(View view) {
+        mActiveItems.remove(view);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (mCurDialog != null) {
+            mCurDialog.dismiss();
+        }
+    }
+}
diff --git a/src/com/android/settings/SdCardSettings.java b/src/com/android/settings/SdCardSettings.java
index 637babefe44..67f3550c06e 100644
--- a/src/com/android/settings/SdCardSettings.java
+++ b/src/com/android/settings/SdCardSettings.java
@@ -108,48 +108,41 @@ public class SdCardSettings extends Activity
         } catch (RemoteException ex) {
         }
 
-        String scanVolume = null; // this no longer exists: SystemProperties.get(MediaScanner.CURRENT_VOLUME_PROPERTY, "");
-        boolean scanning = "external".equals(scanVolume);
+        String status = Environment.getExternalStorageState();
+        boolean readOnly = false;
 
-        if (scanning) {
-            setLayout(mScanningLayout);
-        } else {
-            String status = Environment.getExternalStorageState();
-            boolean readOnly = false;
+        if (status.equals(Environment.MEDIA_MOUNTED_READ_ONLY)) {
+            status = Environment.MEDIA_MOUNTED;
+            readOnly = true;
+        }
 
-            if (status.equals(Environment.MEDIA_MOUNTED_READ_ONLY)) {
-                status = Environment.MEDIA_MOUNTED;
-                readOnly = true;
+        if (status.equals(Environment.MEDIA_MOUNTED)) {
+            try {
+                File path = Environment.getExternalStorageDirectory();
+                StatFs stat = new StatFs(path.getPath());
+                long blockSize = stat.getBlockSize();
+                long totalBlocks = stat.getBlockCount();
+                long availableBlocks = stat.getAvailableBlocks();
+
+                mTotalSize.setText(formatSize(totalBlocks * blockSize));
+                mUsedSize.setText(formatSize((totalBlocks - availableBlocks) * blockSize));
+                mAvailableSize.setText(formatSize(availableBlocks * blockSize));
+            } catch (IllegalArgumentException e) {
+                // this can occur if the SD card is removed, but we haven't received the
+                // ACTION_MEDIA_REMOVED Intent yet.
+                status = Environment.MEDIA_REMOVED;
             }
 
-            if (status.equals(Environment.MEDIA_MOUNTED)) {
-                try {
-                    File path = Environment.getExternalStorageDirectory();
-                    StatFs stat = new StatFs(path.getPath());
-                    long blockSize = stat.getBlockSize();
-                    long totalBlocks = stat.getBlockCount();
-                    long availableBlocks = stat.getAvailableBlocks();
-
-                    mTotalSize.setText(formatSize(totalBlocks * blockSize));
-                    mUsedSize.setText(formatSize((totalBlocks - availableBlocks) * blockSize));
-                    mAvailableSize.setText(formatSize(availableBlocks * blockSize));
-                } catch (IllegalArgumentException e) {
-                    // this can occur if the SD card is removed, but we haven't received the
-                    // ACTION_MEDIA_REMOVED Intent yet.
-                    status = Environment.MEDIA_REMOVED;
-                }
-
-                mReadOnlyStatus.setVisibility(readOnly ? View.VISIBLE : View.GONE);
-                setLayout(mMountedLayout);
-            } else if (status.equals(Environment.MEDIA_UNMOUNTED)) {
-                setLayout(mUnmountedLayout);
-            } else if (status.equals(Environment.MEDIA_REMOVED)) {
-                setLayout(mRemovedLayout);
-            } else if (status.equals(Environment.MEDIA_SHARED)) {
-                setLayout(mSharedLayout);
-            } else if (status.equals(Environment.MEDIA_BAD_REMOVAL)) {
-                setLayout(mBadRemovalLayout);
-            }
+            mReadOnlyStatus.setVisibility(readOnly ? View.VISIBLE : View.GONE);
+            setLayout(mMountedLayout);
+        } else if (status.equals(Environment.MEDIA_UNMOUNTED)) {
+            setLayout(mUnmountedLayout);
+        } else if (status.equals(Environment.MEDIA_REMOVED)) {
+            setLayout(mRemovedLayout);
+        } else if (status.equals(Environment.MEDIA_SHARED)) {
+            setLayout(mSharedLayout);
+        } else if (status.equals(Environment.MEDIA_BAD_REMOVAL)) {
+            setLayout(mBadRemovalLayout);
         }
     }
 
@@ -191,8 +184,6 @@ public class SdCardSettings extends Activity
         }
     };
 
-
-    private int         mStatus;
     private IMountService   mMountService;
 
     private CheckBox    mMassStorage;
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index d9f49527f2f..fcacccc16d4 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -25,6 +25,7 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.database.Cursor;
 import android.location.LocationManager;
@@ -37,8 +38,8 @@ import android.preference.PreferenceCategory;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
-import android.security.CertTool;
-import android.security.Keystore;
+import android.security.Credentials;
+import android.security.KeyStore;
 import android.text.Html;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
@@ -58,8 +59,7 @@ import java.util.Observer;
 /**
  * Gesture lock pattern settings.
  */
-public class SecuritySettings extends PreferenceActivity implements
-        DialogInterface.OnDismissListener, DialogInterface.OnClickListener {
+public class SecuritySettings extends PreferenceActivity {
 
     // Lock Settings
 
@@ -68,6 +68,9 @@ public class SecuritySettings extends PreferenceActivity implements
     private static final String KEY_TACTILE_FEEDBACK_ENABLED = "tactilefeedback";
     private static final int CONFIRM_PATTERN_THEN_DISABLE_AND_CLEAR_REQUEST_CODE = 55;
 
+    private static final String PREFS_NAME = "location_prefs";
+    private static final String PREFS_USE_LOCATION = "use_location";
+
     private LockPatternUtils mLockPatternUtils;
     private CheckBoxPreference mLockEnabled;
     private CheckBoxPreference mVisiblePattern;
@@ -80,36 +83,21 @@ public class SecuritySettings extends PreferenceActivity implements
     private static final String LOCATION_CATEGORY = "location_category";
     private static final String LOCATION_NETWORK = "location_network";
     private static final String LOCATION_GPS = "location_gps";
+    private static final String ASSISTED_GPS = "assisted_gps";
 
     // Credential storage
-    public static final String ACTION_ADD_CREDENTIAL =
-            "android.security.ADD_CREDENTIAL";
-    public static final String ACTION_UNLOCK_CREDENTIAL_STORAGE =
-            "android.security.UNLOCK_CREDENTIAL_STORAGE";
-    private static final String KEY_CSTOR_TYPE_NAME = "typeName";
-    private static final String KEY_CSTOR_ITEM = "item";
-    private static final String KEY_CSTOR_NAMESPACE = "namespace";
-    private static final String KEY_CSTOR_DESCRIPTION = "description";
     private static final int CSTOR_MIN_PASSWORD_LENGTH = 8;
 
     private static final int CSTOR_INIT_DIALOG = 1;
     private static final int CSTOR_CHANGE_PASSWORD_DIALOG = 2;
     private static final int CSTOR_UNLOCK_DIALOG = 3;
     private static final int CSTOR_RESET_DIALOG = 4;
-    private static final int CSTOR_NAME_CREDENTIAL_DIALOG = 5;
 
-    private CstorHelper mCstorHelper = new CstorHelper();
-
-    // Vendor specific
-    private static final String GSETTINGS_PROVIDER = "com.google.android.providers.settings";
-    private static final String USE_LOCATION = "use_location";
-    private static final String KEY_DONE_USE_LOCATION = "doneLocation";
-    private CheckBoxPreference mUseLocation;
-    private boolean mOkClicked;
-    private Dialog mUseLocationDialog;
+    private CredentialStorage mCredentialStorage = new CredentialStorage();
 
     private CheckBoxPreference mNetwork;
     private CheckBoxPreference mGps;
+    private CheckBoxPreference mAssistedGps;
 
     // These provide support for receiving notification when Location Manager settings change.
     // This is necessary because the Network Location Provider can change settings
@@ -132,17 +120,8 @@ public class SecuritySettings extends PreferenceActivity implements
 
         mNetwork = (CheckBoxPreference) getPreferenceScreen().findPreference(LOCATION_NETWORK);
         mGps = (CheckBoxPreference) getPreferenceScreen().findPreference(LOCATION_GPS);
-        mUseLocation = (CheckBoxPreference) getPreferenceScreen().findPreference(USE_LOCATION);
+        mAssistedGps = (CheckBoxPreference) getPreferenceScreen().findPreference(ASSISTED_GPS);
 
-        // Vendor specific
-        try {
-            if (mUseLocation != null
-                    && getPackageManager().getPackageInfo(GSETTINGS_PROVIDER, 0) == null) {
-                ((PreferenceGroup)findPreference(LOCATION_CATEGORY))
-                        .removePreference(mUseLocation);
-            }
-        } catch (NameNotFoundException nnfe) {
-        }
         updateToggles();
 
         // listen for Location Manager settings changes
@@ -152,14 +131,8 @@ public class SecuritySettings extends PreferenceActivity implements
                 null);
         mContentQueryMap = new ContentQueryMap(settingsCursor, Settings.System.NAME, true, null);
         mContentQueryMap.addObserver(new SettingsObserver());
-        boolean doneUseLocation = savedInstanceState == null
-                ? false : savedInstanceState.getBoolean(KEY_DONE_USE_LOCATION, true);
-        if (!doneUseLocation && (getIntent().getBooleanExtra("SHOW_USE_LOCATION", false)
-                || savedInstanceState != null)) {
-            showUseLocationDialog(true);
-        }
 
-        mCstorHelper.handleCstorIntents(getIntent());
+        mCredentialStorage.handleIntent(getIntent());
     }
 
     private PreferenceScreen createPreferenceHierarchy() {
@@ -171,6 +144,14 @@ public class SecuritySettings extends PreferenceActivity implements
         inlinePrefCat.setTitle(R.string.lock_settings_title);
         root.addPreference(inlinePrefCat);
 
+        // change pattern lock
+        Intent intent = new Intent();
+        intent.setClassName("com.android.settings",
+                    "com.android.settings.ChooseLockPatternTutorial");
+        mChoosePattern = getPreferenceManager().createPreferenceScreen(this);
+        mChoosePattern.setIntent(intent);
+        inlinePrefCat.addPreference(mChoosePattern);
+
         // autolock toggle
         mLockEnabled = new LockEnabledPref(this);
         mLockEnabled.setTitle(R.string.lockpattern_settings_enable_title);
@@ -190,14 +171,6 @@ public class SecuritySettings extends PreferenceActivity implements
         mTactileFeedback.setTitle(R.string.lockpattern_settings_enable_tactile_feedback_title);
         inlinePrefCat.addPreference(mTactileFeedback);
 
-        // change pattern lock
-        Intent intent = new Intent();
-        intent.setClassName("com.android.settings",
-                    "com.android.settings.ChooseLockPatternTutorial");
-        mChoosePattern = getPreferenceManager().createPreferenceScreen(this);
-        mChoosePattern.setIntent(intent);
-        inlinePrefCat.addPreference(mChoosePattern);
-
         int activePhoneType = TelephonyManager.getDefault().getPhoneType();
 
         // do not display SIM lock for CDMA phone
@@ -230,13 +203,10 @@ public class SecuritySettings extends PreferenceActivity implements
         passwordsCat.addPreference(showPassword);
 
         // Credential storage
-        PreferenceCategory credStoreCat = new PreferenceCategory(this);
-        credStoreCat.setTitle(R.string.cstor_settings_category);
-        root.addPreference(credStoreCat);
-        int s = mCstorHelper.getCstorState();
-        credStoreCat.addPreference(mCstorHelper.createAccessCheckBox(s));
-        credStoreCat.addPreference(mCstorHelper.createSetPasswordPreference());
-        credStoreCat.addPreference(mCstorHelper.createResetPreference(s));
+        PreferenceCategory credentialsCat = new PreferenceCategory(this);
+        credentialsCat.setTitle(R.string.credentials_category);
+        root.addPreference(credentialsCat);
+        mCredentialStorage.createPreferences(credentialsCat);
 
         return root;
     }
@@ -259,26 +229,10 @@ public class SecuritySettings extends PreferenceActivity implements
                 R.string.lockpattern_settings_choose_lock_pattern;
         mChoosePattern.setTitle(chooseStringRes);
 
-        mShowPassword
-                .setChecked(Settings.System.getInt(getContentResolver(),
+        mShowPassword.setChecked(Settings.System.getInt(getContentResolver(),
                 Settings.System.TEXT_SHOW_PASSWORD, 1) != 0);
-    }
 
-    @Override
-    public void onStop() {
-        if (mUseLocationDialog != null && mUseLocationDialog.isShowing()) {
-            mUseLocationDialog.dismiss();
-        }
-        mUseLocationDialog = null;
-        super.onStop();
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle icicle) {
-        if (mUseLocationDialog != null && mUseLocationDialog.isShowing()) {
-            icicle.putBoolean(KEY_DONE_USE_LOCATION, false);
-        }
-        super.onSaveInstanceState(icicle);
+        mCredentialStorage.resume();
     }
 
     @Override
@@ -299,15 +253,15 @@ public class SecuritySettings extends PreferenceActivity implements
             Settings.Secure.setLocationProviderEnabled(getContentResolver(),
                     LocationManager.NETWORK_PROVIDER, mNetwork.isChecked());
         } else if (preference == mGps) {
+            boolean enabled = mGps.isChecked();
             Settings.Secure.setLocationProviderEnabled(getContentResolver(),
-                    LocationManager.GPS_PROVIDER, mGps.isChecked());
-        } else if (preference == mUseLocation) {
-            //normally called on the toggle click
-            if (mUseLocation.isChecked()) {
-                showUseLocationDialog(false);
-            } else {
-                updateUseLocation();
+                    LocationManager.GPS_PROVIDER, enabled);
+            if (mAssistedGps != null) {
+                mAssistedGps.setEnabled(enabled);
             }
+        } else if (preference == mAssistedGps) {
+            Settings.Secure.putInt(getContentResolver(), Settings.Secure.ASSISTED_GPS_ENABLED,
+                    mAssistedGps.isChecked() ? 1 : 0);
         }
 
         return false;
@@ -318,49 +272,27 @@ public class SecuritySettings extends PreferenceActivity implements
         startActivity(intent);
     }
 
-    private void showUseLocationDialog(boolean force) {
-        // Show a warning to the user that location data will be shared
-        mOkClicked = false;
-        if (force) {
-            mUseLocation.setChecked(true);
-        }
-
-        CharSequence msg = getResources().getText(R.string.use_location_warning_message);
-        mUseLocationDialog = new AlertDialog.Builder(this).setMessage(msg)
-                .setTitle(R.string.use_location_title)
-                .setIcon(android.R.drawable.ic_dialog_alert)
-                .setPositiveButton(R.string.agree, this)
-                .setNegativeButton(R.string.disagree, this)
-                .show();
-        ((TextView)mUseLocationDialog.findViewById(android.R.id.message))
-                .setMovementMethod(LinkMovementMethod.getInstance());
-        mUseLocationDialog.setOnDismissListener(this);
-    }
-
     /*
      * Creates toggles for each available location provider
      */
     private void updateToggles() {
         ContentResolver res = getContentResolver();
+        boolean gpsEnabled = Settings.Secure.isLocationProviderEnabled(
+                res, LocationManager.GPS_PROVIDER);
         mNetwork.setChecked(Settings.Secure.isLocationProviderEnabled(
                 res, LocationManager.NETWORK_PROVIDER));
-        mGps.setChecked(Settings.Secure.isLocationProviderEnabled(
-                res, LocationManager.GPS_PROVIDER));
-        mUseLocation.setChecked(Settings.Secure.getInt(res,
-                Settings.Secure.USE_LOCATION_FOR_SERVICES, 2) == 1);
+        mGps.setChecked(gpsEnabled);
+        if (mAssistedGps != null) {
+            mAssistedGps.setChecked(Settings.Secure.getInt(res,
+                    Settings.Secure.ASSISTED_GPS_ENABLED, 2) == 1);
+            mAssistedGps.setEnabled(gpsEnabled);
+        }
     }
 
     private boolean isToggled(Preference pref) {
         return ((CheckBoxPreference) pref).isChecked();
     }
 
-    private void updateUseLocation() {
-        boolean use = mUseLocation.isChecked();
-        Settings.Secure.putInt(getContentResolver(),
-                Settings.Secure.USE_LOCATION_FOR_SERVICES, use ? 1 : 0);
-    }
-
-
     /**
      * For the user to disable keyguard, we first make them verify their
      * existing pattern.
@@ -407,631 +339,296 @@ public class SecuritySettings extends PreferenceActivity implements
         }
     }
 
-    public void onClick(DialogInterface dialog, int which) {
-        if (which == DialogInterface.BUTTON_POSITIVE) {
-            //updateProviders();
-            mOkClicked = true;
-        } else {
-            // Reset the toggle
-            mUseLocation.setChecked(false);
-        }
-        updateUseLocation();
-    }
-
-    public void onDismiss(DialogInterface dialog) {
-        // Assuming that onClick gets called first
-        if (!mOkClicked) {
-            mUseLocation.setChecked(false);
-        }
-    }
-
     @Override
-    protected Dialog onCreateDialog (int id) {
-        switch (id) {
-            case CSTOR_INIT_DIALOG:
-            case CSTOR_CHANGE_PASSWORD_DIALOG:
-                return mCstorHelper.createSetPasswordDialog(id);
-
-            case CSTOR_UNLOCK_DIALOG:
-                return mCstorHelper.createUnlockDialog();
-
-            case CSTOR_RESET_DIALOG:
-                return mCstorHelper.createResetDialog();
-
-            case CSTOR_NAME_CREDENTIAL_DIALOG:
-                return mCstorHelper.createNameCredentialDialog();
-
-            default:
-                return null;
-        }
+    protected Dialog onCreateDialog(int id) {
+        return mCredentialStorage.createDialog(id);
     }
 
-    private class CstorHelper implements DialogInterface.OnClickListener,
-            DialogInterface.OnDismissListener,
-            DialogInterface.OnCancelListener {
-        private Keystore mKeystore = Keystore.getInstance();
-        private View mView;
+    private class CredentialStorage implements DialogInterface.OnClickListener,
+            DialogInterface.OnDismissListener, Preference.OnPreferenceChangeListener,
+            Preference.OnPreferenceClickListener {
+        private static final int MINIMUM_PASSWORD_LENGTH = 8;
+        private static final int UNLOCK_DIALOG = 1;
+        private static final int PASSWORD_DIALOG = 2;
+        private static final int RESET_DIALOG = 3;
+
+        private KeyStore mKeyStore = KeyStore.getInstance();
+        private int mState = mKeyStore.test();
         private int mDialogId;
-        private boolean mConfirm = true;
+        private boolean mSubmit;
 
         private CheckBoxPreference mAccessCheckBox;
+        private Preference mInstallButton;
+        private Preference mPasswordButton;
         private Preference mResetButton;
 
-        private Intent mSpecialIntent;
-        private CstorAddCredentialHelper mCstorAddCredentialHelper;
+        private Intent mExternalIntent;
 
-        void handleCstorIntents(Intent intent) {
-            if (intent == null) return;
-            String action = intent.getAction();
-
-            if (ACTION_ADD_CREDENTIAL.equals(action)) {
-                mCstorAddCredentialHelper = new CstorAddCredentialHelper(intent);
-                showCstorDialog(CSTOR_NAME_CREDENTIAL_DIALOG);
-            } else if (ACTION_UNLOCK_CREDENTIAL_STORAGE.equals(action)) {
-                mSpecialIntent = intent;
-                showCstorDialog(mCstorHelper.isCstorInitialized()
-                        ? CSTOR_UNLOCK_DIALOG
-                        : CSTOR_INIT_DIALOG);
-            }
-        }
-
-        private void showCstorDialog(int dialogId) {
-            mDialogId = dialogId;
-            showDialog(dialogId);
-
-            if (dialogId == CSTOR_NAME_CREDENTIAL_DIALOG) {
-                // set mView back as mView may be replaced by CSTOR_INIT_DIALOG
-                // or CSTOR_UNLOCK_DIALOG
-                mView = mCstorAddCredentialHelper.mView;
-            }
-        }
-
-        private int getCstorState() {
-            return mKeystore.getState();
-        }
-
-        private boolean isCstorUnlocked() {
-            return (mKeystore.getState() == Keystore.UNLOCKED);
-        }
-
-        private boolean isCstorInitialized() {
-            return (mKeystore.getState() != Keystore.UNINITIALIZED);
-        }
-
-        private void lockCstor() {
-            mKeystore.lock();
-            mAccessCheckBox.setChecked(false);
-        }
-
-        private int unlockCstor(String passwd) {
-            int ret = mKeystore.unlock(passwd);
-            if (ret == -1) resetCstor();
-            if (ret == 0) {
-                Toast.makeText(SecuritySettings.this, R.string.cstor_is_enabled,
-                        Toast.LENGTH_SHORT).show();
-            }
-            return ret;
-        }
-
-        private int changeCstorPassword(String oldPasswd, String newPasswd) {
-            int ret = mKeystore.changePassword(oldPasswd, newPasswd);
-            if (ret == -1) resetCstor();
-            return ret;
-        }
-
-        private void initCstor(String passwd) {
-            mKeystore.setPassword(passwd);
-            enablePreferences(true);
-            mAccessCheckBox.setChecked(true);
-            Toast.makeText(SecuritySettings.this, R.string.cstor_is_enabled,
-                    Toast.LENGTH_SHORT).show();
-        }
-
-        private void resetCstor() {
-            mKeystore.reset();
-            enablePreferences(false);
-            mAccessCheckBox.setChecked(false);
-            Toast.makeText(SecuritySettings.this, R.string.cstor_is_reset,
-                    Toast.LENGTH_LONG).show();
-        }
-
-        private boolean addCredential() {
-            if (mCstorAddCredentialHelper.saveToStorage() != 0) {
-                // set mView back as mView may be replaced by CSTOR_INIT_DIALOG
-                // or CSTOR_UNLOCK_DIALOG
-                mView = mCstorAddCredentialHelper.mView;
-                if (mCstorAddCredentialHelper.isPkcs12Keystore()) {
-                    showError(R.string.cstor_password_error);
-                } else {
-                    showError(R.string.cstor_storage_error);
+        void handleIntent(Intent intent) {
+            if (intent != null) {
+                if (Credentials.UNLOCK_ACTION.equals(intent.getAction())) {
+                    mExternalIntent = intent;
+                    showDialog((mState == KeyStore.UNINITIALIZED) ?
+                            PASSWORD_DIALOG : UNLOCK_DIALOG);
                 }
-                Log.d("CSTOR", "failed to add credential");
+            }
+        }
+
+        void resume() {
+            mState = mKeyStore.test();
+            updatePreferences(mState);
+        }
+
+        Dialog createDialog(int id) {
+            mDialogId = id;
+            switch (id) {
+                case UNLOCK_DIALOG:
+                    return createUnlockDialog();
+                case PASSWORD_DIALOG:
+                    return createPasswordDialog();
+                case RESET_DIALOG:
+                    return createResetDialog();
+            }
+            return null;
+        }
+
+        private void initialize(String password) {
+            mKeyStore.password(password);
+            updatePreferences(KeyStore.NO_ERROR);
+        }
+
+        private void reset() {
+            mKeyStore.reset();
+            updatePreferences(KeyStore.UNINITIALIZED);
+        }
+
+        private void lock() {
+            mKeyStore.lock();
+            updatePreferences(KeyStore.LOCKED);
+        }
+
+        private int unlock(String password) {
+            mKeyStore.unlock(password);
+            return mKeyStore.getLastError();
+        }
+
+        private int changePassword(String oldPassword, String newPassword) {
+            mKeyStore.password(oldPassword, newPassword);
+            return mKeyStore.getLastError();
+        }
+
+        public boolean onPreferenceChange(Preference preference, Object value) {
+            if (preference == mAccessCheckBox) {
+                if ((Boolean) value) {
+                    showDialog((mState == KeyStore.UNINITIALIZED) ?
+                            PASSWORD_DIALOG : UNLOCK_DIALOG);
+                } else {
+                    lock();
+                }
+                return true;
+            }
+            return false;
+        }
+
+        public boolean onPreferenceClick(Preference preference) {
+            if (preference == mInstallButton) {
+                Credentials.getInstance().installFromSdCard(SecuritySettings.this);
+            } else if (preference == mPasswordButton) {
+                showDialog(PASSWORD_DIALOG);
+            } else if (preference == mResetButton) {
+                showDialog(RESET_DIALOG);
+            } else {
                 return false;
             }
-            Log.d("CSTOR", "credential is added: "
-                    + mCstorAddCredentialHelper.getName());
-            String formatString =
-                    getString(R.string.cstor_is_added);
-            String message = String.format(formatString,
-                    mCstorAddCredentialHelper.getName());
-            Toast.makeText(SecuritySettings.this, message,
-                    Toast.LENGTH_LONG).show();
             return true;
         }
 
-        public void onCancel(DialogInterface dialog) {
-            if (mCstorAddCredentialHelper == null) return;
-
-            switch (mDialogId) {
-                case CSTOR_INIT_DIALOG:
-                case CSTOR_UNLOCK_DIALOG:
-                    Toast.makeText(SecuritySettings.this,
-                            R.string.cstor_unable_to_save_cert,
-                            Toast.LENGTH_LONG).show();
-                    break;
-
-                case CSTOR_NAME_CREDENTIAL_DIALOG:
-                    Toast.makeText(SecuritySettings.this,
-                            R.string.cstor_cert_not_saved,
-                            Toast.LENGTH_LONG).show();
-                    break;
-            }
-            mCstorAddCredentialHelper = null;
-            finish();
-        }
-
-        public void onClick(DialogInterface dialog, int which) {
-            if (which == DialogInterface.BUTTON_NEGATIVE) {
-                onCancel(dialog);
-                return;
-            }
-
-            switch (mDialogId) {
-                case CSTOR_INIT_DIALOG:
-                case CSTOR_CHANGE_PASSWORD_DIALOG:
-                    mConfirm = checkPasswords((Dialog) dialog);
-                    break;
-
-                case CSTOR_UNLOCK_DIALOG:
-                    mConfirm = checkUnlockPassword((Dialog) dialog);
-                    break;
-
-                case CSTOR_RESET_DIALOG:
-                    resetCstor();
-                    break;
-
-                case CSTOR_NAME_CREDENTIAL_DIALOG:
-                    mConfirm = checkAddCredential();
-                    break;
+        public void onClick(DialogInterface dialog, int button) {
+            mSubmit = (button == DialogInterface.BUTTON_POSITIVE);
+            if (button == DialogInterface.BUTTON_NEUTRAL) {
+                reset();
             }
         }
 
         public void onDismiss(DialogInterface dialog) {
-            if (!mConfirm) {
-                mConfirm = true;
-                showCstorDialog(mDialogId);
-            } else {
-                if (mDialogId == CSTOR_UNLOCK_DIALOG) {
-                    mAccessCheckBox.setChecked(isCstorUnlocked());
-                }
-
-                if (mCstorAddCredentialHelper != null) {
-                    if (!isCstorInitialized()) {
-                        showCstorDialog(CSTOR_INIT_DIALOG);
-                    } else if (!isCstorUnlocked()) {
-                        showCstorDialog(CSTOR_UNLOCK_DIALOG);
-                    } else {
-                        if (addCredential()) {
-                            // succeeded
-                            finish();
-                        } else {
-                            // failed
-                            if (mDialogId != CSTOR_NAME_CREDENTIAL_DIALOG) {
-                                removeDialog(mDialogId);
-                            }
-                            showCstorDialog(CSTOR_NAME_CREDENTIAL_DIALOG);
-                        }
-                    }
+            if (mSubmit && !isFinishing()) {
+                mSubmit = false;
+                if (!checkPassword((Dialog) dialog)) {
+                    showDialog(mDialogId);
                     return;
-                } else if (mSpecialIntent != null) {
-                    finish();
                 }
-                removeDialog(mDialogId);
+            }
+            removeDialog(mDialogId);
+            updatePreferences(mState);
+            if (mExternalIntent != null) {
+                mExternalIntent = null;
+                finish();
             }
         }
 
-        private void showResetWarning(int count) {
-            TextView v = showError(count <= 3
-                    ? R.string.cstor_password_error_reset_warning
-                    : R.string.cstor_password_error);
-            if (count <= 3) {
-                if (count == 1) {
-                    v.setText(R.string.cstor_password_error_reset_warning);
-                } else {
-                    String format = getString(
-                            R.string.cstor_password_error_reset_warning_plural);
-                    v.setText(String.format(format, count));
-                }
+        // Return true if there is no error.
+        private boolean checkPassword(Dialog dialog) {
+            String oldPassword = getText(dialog, R.id.old_password);
+            String newPassword = getText(dialog, R.id.new_password);
+            String confirmPassword = getText(dialog, R.id.confirm_password);
+
+            if (oldPassword != null && oldPassword.length() == 0) {
+                showError(dialog, R.string.credentials_password_empty);
+                return false;
+            } else if (newPassword == null) {
+                return !checkError(dialog, unlock(oldPassword));
+            } else if (newPassword.length() == 0 || confirmPassword.length() == 0) {
+                showError(dialog, R.string.credentials_passwords_empty);
+            } else if (newPassword.length() < MINIMUM_PASSWORD_LENGTH) {
+                showError(dialog, R.string.credentials_password_too_short);
+            } else if (!newPassword.equals(confirmPassword)) {
+                showError(dialog, R.string.credentials_passwords_mismatch);
+            } else if (oldPassword == null) {
+                initialize(newPassword);
+                return true;
+            } else {
+                return !checkError(dialog, changePassword(oldPassword, newPassword));
             }
+            return false;
         }
 
-        private boolean checkAddCredential() {
-            hideError();
-
-            String name = getText(R.id.cstor_credential_name);
-            if (TextUtils.isEmpty(name)) {
-                showError(R.string.cstor_name_empty_error);
+        // Return false if there is no error.
+        private boolean checkError(Dialog dialog, int error) {
+            if (error == KeyStore.NO_ERROR) {
+                updatePreferences(KeyStore.NO_ERROR);
                 return false;
             }
-
-            for (int i = 0, len = name.length(); i < len; i++) {
-                if (!Character.isLetterOrDigit(name.charAt(i))) {
-                    showError(R.string.cstor_name_char_error);
-                    return false;
-                }
+            if (error == KeyStore.UNINITIALIZED) {
+                updatePreferences(KeyStore.UNINITIALIZED);
+                return false;
             }
-
-            mCstorAddCredentialHelper.setName(name);
-
-            if (mCstorAddCredentialHelper.isPkcs12Keystore()) {
-                String password = getText(R.id.cstor_credential_password);
-                if (TextUtils.isEmpty(password)) {
-                    showError(R.string.cstor_password_empty_error);
-                    return false;
-                }
-
-                mCstorAddCredentialHelper.setPassword(password);
+            if (error < KeyStore.WRONG_PASSWORD) {
+                return false;
+            }
+            int count = error - KeyStore.WRONG_PASSWORD + 1;
+            if (count > 3) {
+                showError(dialog, R.string.credentials_wrong_password);
+            } else if (count == 1) {
+                showError(dialog, R.string.credentials_reset_warning);
+            } else {
+                showError(dialog, R.string.credentials_reset_warning_plural, count);
             }
-
             return true;
         }
 
-        // returns true if the password is long enough and does not contain
-        // characters that we don't like
-        private boolean verifyPassword(String passwd) {
-            if (passwd == null) {
-                showError(R.string.cstor_passwords_empty_error);
-                return false;
-            } else if ((passwd.length() < CSTOR_MIN_PASSWORD_LENGTH)
-                    || passwd.contains(" ")) {
-                showError(R.string.cstor_password_verification_error);
-                return false;
-            } else {
-                return true;
-            }
+        private String getText(Dialog dialog, int viewId) {
+            TextView view = (TextView) dialog.findViewById(viewId);
+            return (view == null || view.getVisibility() == View.GONE) ? null :
+                            view.getText().toString();
         }
 
-        // returns true if the password is ok
-        private boolean checkUnlockPassword(Dialog d) {
-            hideError();
-
-            String passwd = getText(R.id.cstor_password);
-            if (TextUtils.isEmpty(passwd)) {
-                showError(R.string.cstor_password_empty_error);
-                return false;
-            }
-
-            int count = unlockCstor(passwd);
-            if (count > 0) {
-                showResetWarning(count);
-                return false;
-            } else {
-                // done or reset
-                return true;
-            }
-        }
-
-        // returns true if the passwords are ok
-        private boolean checkPasswords(Dialog d) {
-            hideError();
-
-            String oldPasswd = getText(R.id.cstor_old_password);
-            String newPasswd = getText(R.id.cstor_new_password);
-            String confirmPasswd = getText(R.id.cstor_confirm_password);
-
-            if ((mDialogId == CSTOR_CHANGE_PASSWORD_DIALOG)
-                    && TextUtils.isEmpty(oldPasswd)) {
-                showError(R.string.cstor_password_empty_error);
-                return false;
-            }
-
-            if (TextUtils.isEmpty(newPasswd)
-                    && TextUtils.isEmpty(confirmPasswd)) {
-                showError(R.string.cstor_passwords_empty_error);
-                return false;
-            }
-
-            if (!verifyPassword(newPasswd)) {
-                return false;
-            } else if (!newPasswd.equals(confirmPasswd)) {
-                showError(R.string.cstor_passwords_error);
-                return false;
-            }
-
-            if (mDialogId == CSTOR_CHANGE_PASSWORD_DIALOG) {
-                int count = changeCstorPassword(oldPasswd, newPasswd);
-                if (count > 0) {
-                    showResetWarning(count);
-                    return false;
+        private void showError(Dialog dialog, int stringId, Object... formatArgs) {
+            TextView view = (TextView) dialog.findViewById(R.id.error);
+            if (view != null) {
+                if (formatArgs == null || formatArgs.length == 0) {
+                    view.setText(stringId);
                 } else {
-                    // done or reset
-                    return true;
+                    view.setText(dialog.getContext().getString(stringId, formatArgs));
                 }
-            } else {
-                initCstor(newPasswd);
-                return true;
+                view.setVisibility(View.VISIBLE);
             }
         }
 
-        private TextView showError(int messageId) {
-            TextView v = (TextView) mView.findViewById(R.id.cstor_error);
-            v.setText(messageId);
-            if (v != null) v.setVisibility(View.VISIBLE);
-            return v;
+        private void createPreferences(PreferenceCategory category) {
+            mAccessCheckBox = new CheckBoxPreference(SecuritySettings.this);
+            mAccessCheckBox.setTitle(R.string.credentials_access);
+            mAccessCheckBox.setSummary(R.string.credentials_access_summary);
+            mAccessCheckBox.setOnPreferenceChangeListener(this);
+            category.addPreference(mAccessCheckBox);
+
+            mInstallButton = new Preference(SecuritySettings.this);
+            mInstallButton.setTitle(R.string.credentials_install_certificates);
+            mInstallButton.setSummary(R.string.credentials_install_certificates_summary);
+            mInstallButton.setOnPreferenceClickListener(this);
+            category.addPreference(mInstallButton);
+
+            mPasswordButton = new Preference(SecuritySettings.this);
+            mPasswordButton.setTitle(R.string.credentials_set_password);
+            mPasswordButton.setSummary(R.string.credentials_set_password_summary);
+            mPasswordButton.setOnPreferenceClickListener(this);
+            category.addPreference(mPasswordButton);
+
+            mResetButton = new Preference(SecuritySettings.this);
+            mResetButton.setTitle(R.string.credentials_reset);
+            mResetButton.setSummary(R.string.credentials_reset_summary);
+            mResetButton.setOnPreferenceClickListener(this);
+            category.addPreference(mResetButton);
         }
 
-        private void hide(int viewId) {
-            View v = mView.findViewById(viewId);
-            if (v != null) v.setVisibility(View.GONE);
-        }
+        private void updatePreferences(int state) {
+            mAccessCheckBox.setEnabled(state != KeyStore.UNINITIALIZED);
+            mAccessCheckBox.setChecked(state == KeyStore.NO_ERROR);
+            mResetButton.setEnabled(state != KeyStore.UNINITIALIZED);
 
-        private void hideError() {
-            hide(R.id.cstor_error);
-        }
-
-        private String getText(int viewId) {
-            return ((TextView) mView.findViewById(viewId)).getText().toString();
-        }
-
-        private void setText(int viewId, String text) {
-            TextView v = (TextView) mView.findViewById(viewId);
-            if (v != null) v.setText(text);
-        }
-
-        private void setText(int viewId, int textId) {
-            TextView v = (TextView) mView.findViewById(viewId);
-            if (v != null) v.setText(textId);
-        }
-
-        private void enablePreferences(boolean enabled) {
-            mAccessCheckBox.setEnabled(enabled);
-            mResetButton.setEnabled(enabled);
-        }
-
-        private Preference createAccessCheckBox(int state) {
-            CheckBoxPreference pref = new CheckBoxPreference(
-                    SecuritySettings.this);
-            pref.setTitle(R.string.cstor_access_title);
-            pref.setSummary(R.string.cstor_access_summary);
-            pref.setEnabled(state != Keystore.UNINITIALIZED);
-            pref.setChecked(state == Keystore.UNLOCKED);
-            pref.setOnPreferenceChangeListener(
-                    new Preference.OnPreferenceChangeListener() {
-                        public boolean onPreferenceChange(
-                                Preference pref, Object value) {
-                            if (((Boolean) value)) {
-                                showCstorDialog(CSTOR_UNLOCK_DIALOG);
-                            } else {
-                                lockCstor();
-                            }
-                            return true;
-                        }
-                    });
-            mAccessCheckBox = pref;
-            return pref;
-        }
-
-        private Preference createSetPasswordPreference() {
-            Preference pref = new Preference(SecuritySettings.this);
-            pref.setTitle(R.string.cstor_set_passwd_title);
-            pref.setSummary(R.string.cstor_set_passwd_summary);
-            pref.setOnPreferenceClickListener(
-                    new Preference.OnPreferenceClickListener() {
-                        public boolean onPreferenceClick(Preference pref) {
-                            showCstorDialog(isCstorInitialized()
-                                    ? CSTOR_CHANGE_PASSWORD_DIALOG
-                                    : CSTOR_INIT_DIALOG);
-                            return true;
-                        }
-                    });
-            return pref;
-        }
-
-        private Preference createResetPreference(int state) {
-            Preference pref = new Preference(SecuritySettings.this);
-            pref.setTitle(R.string.cstor_reset_title);
-            pref.setSummary(R.string.cstor_reset_summary);
-            pref.setOnPreferenceClickListener(
-                    new Preference.OnPreferenceClickListener() {
-                        public boolean onPreferenceClick(Preference pref) {
-                            showCstorDialog(CSTOR_RESET_DIALOG);
-                            return true;
-                        }
-                    });
-            pref.setEnabled(state != Keystore.UNINITIALIZED);
-            mResetButton = pref;
-            return pref;
+            // Show a toast message if the state is changed.
+            if (mState == state) {
+                return;
+            } else if (state == KeyStore.NO_ERROR) {
+                Toast.makeText(SecuritySettings.this, R.string.credentials_enabled,
+                        Toast.LENGTH_SHORT).show();
+            } else if (state == KeyStore.UNINITIALIZED) {
+                Toast.makeText(SecuritySettings.this, R.string.credentials_erased,
+                        Toast.LENGTH_SHORT).show();
+            } else if (state == KeyStore.LOCKED) {
+                Toast.makeText(SecuritySettings.this, R.string.credentials_disabled,
+                        Toast.LENGTH_SHORT).show();
+            }
+            mState = state;
         }
 
         private Dialog createUnlockDialog() {
-            mView = View.inflate(SecuritySettings.this,
-                    R.layout.cstor_unlock_dialog_view, null);
-            hideError();
+            View view = View.inflate(SecuritySettings.this,
+                    R.layout.credentials_unlock_dialog, null);
 
             // show extra hint only when the action comes from outside
-            if ((mSpecialIntent == null)
-                    && (mCstorAddCredentialHelper == null)) {
-                hide(R.id.cstor_access_dialog_hint_from_action);
+            if (mExternalIntent != null) {
+                view.findViewById(R.id.hint).setVisibility(View.VISIBLE);
             }
 
-            Dialog d = new AlertDialog.Builder(SecuritySettings.this)
-                    .setView(mView)
-                    .setTitle(R.string.cstor_access_dialog_title)
+            Dialog dialog = new AlertDialog.Builder(SecuritySettings.this)
+                    .setView(view)
+                    .setTitle(R.string.credentials_unlock)
                     .setPositiveButton(android.R.string.ok, this)
                     .setNegativeButton(android.R.string.cancel, this)
-                    .setOnCancelListener(this)
                     .create();
-            d.setOnDismissListener(this);
-            return d;
+            dialog.setOnDismissListener(this);
+            return dialog;
         }
 
-        private Dialog createSetPasswordDialog(int id) {
-            mView = View.inflate(SecuritySettings.this,
-                    R.layout.cstor_set_password_dialog_view, null);
-            hideError();
+        private Dialog createPasswordDialog() {
+            View view = View.inflate(SecuritySettings.this,
+                    R.layout.credentials_password_dialog, null);
 
-            // show extra hint only when the action comes from outside
-            if ((mSpecialIntent != null)
-                    || (mCstorAddCredentialHelper != null)) {
-                setText(R.id.cstor_first_time_hint,
-                        R.string.cstor_first_time_hint_from_action);
+            if (mState == KeyStore.UNINITIALIZED) {
+                view.findViewById(R.id.hint).setVisibility(View.VISIBLE);
+            } else {
+                view.findViewById(R.id.old_password_prompt).setVisibility(View.VISIBLE);
+                view.findViewById(R.id.old_password).setVisibility(View.VISIBLE);
             }
 
-            switch (id) {
-                case CSTOR_INIT_DIALOG:
-                    mView.findViewById(R.id.cstor_old_password_block)
-                            .setVisibility(View.GONE);
-                    break;
-
-                case CSTOR_CHANGE_PASSWORD_DIALOG:
-                    mView.findViewById(R.id.cstor_first_time_hint)
-                            .setVisibility(View.GONE);
-                    break;
-
-                default:
-                    throw new RuntimeException(
-                            "Unknown dialog id: " + mDialogId);
-            }
-
-            Dialog d = new AlertDialog.Builder(SecuritySettings.this)
-                    .setView(mView)
-                    .setTitle(R.string.cstor_set_passwd_dialog_title)
+            Dialog dialog = new AlertDialog.Builder(SecuritySettings.this)
+                    .setView(view)
+                    .setTitle(R.string.credentials_set_password)
                     .setPositiveButton(android.R.string.ok, this)
                     .setNegativeButton(android.R.string.cancel, this)
-                    .setOnCancelListener(this)
                     .create();
-            d.setOnDismissListener(this);
-            return d;
+            dialog.setOnDismissListener(this);
+            return dialog;
         }
 
         private Dialog createResetDialog() {
             return new AlertDialog.Builder(SecuritySettings.this)
                     .setTitle(android.R.string.dialog_alert_title)
                     .setIcon(android.R.drawable.ic_dialog_alert)
-                    .setMessage(R.string.cstor_reset_hint)
-                    .setPositiveButton(getString(android.R.string.ok), this)
+                    .setMessage(R.string.credentials_reset_hint)
+                    .setNeutralButton(getString(android.R.string.ok), this)
                     .setNegativeButton(getString(android.R.string.cancel), this)
                     .create();
         }
-
-        private Dialog createNameCredentialDialog() {
-            mView = View.inflate(SecuritySettings.this,
-                    R.layout.cstor_name_credential_dialog_view, null);
-            if (mCstorAddCredentialHelper != null) {
-                mCstorAddCredentialHelper.mView = mView;
-            }
-
-            hideError();
-            if (!mCstorAddCredentialHelper.isPkcs12Keystore()) {
-                hide(R.id.cstor_credential_password_container);
-            }
-
-            setText(R.id.cstor_credential_name_title,
-                    R.string.cstor_credential_name);
-            setText(R.id.cstor_credential_info_title,
-                    R.string.cstor_credential_info);
-            setText(R.id.cstor_credential_info,
-                    mCstorAddCredentialHelper.getDescription().toString());
-
-            Dialog d = new AlertDialog.Builder(SecuritySettings.this)
-                    .setView(mView)
-                    .setTitle(R.string.cstor_name_credential_dialog_title)
-                    .setPositiveButton(android.R.string.ok, this)
-                    .setNegativeButton(android.R.string.cancel, this)
-                    .setOnCancelListener(this)
-                    .create();
-            d.setOnDismissListener(this);
-            return d;
-        }
-    }
-
-    private class CstorAddCredentialHelper {
-        private String mTypeName;
-        private List<byte[]> mItemList;
-        private List<String> mNamespaceList;
-        private String mDescription;
-        private String mName;
-        private String mPassword;
-        private View mView;
-
-        CstorAddCredentialHelper(Intent intent) {
-            parse(intent);
-        }
-
-        String getTypeName() {
-            return mTypeName;
-        }
-
-        boolean isPkcs12Keystore() {
-            return CertTool.TITLE_PKCS12_KEYSTORE.equals(mTypeName);
-        }
-
-        CharSequence getDescription() {
-            return Html.fromHtml(mDescription);
-        }
-
-        void setName(String name) {
-            mName = name;
-        }
-
-        String getName() {
-            return mName;
-        }
-
-        void setPassword(String password) {
-            mPassword = password;
-        }
-
-        String getPassword() {
-            return mPassword;
-        }
-
-        int saveToStorage() {
-            if (isPkcs12Keystore()) {
-                return CertTool.getInstance().addPkcs12Keystore(
-                        mItemList.get(0), mPassword, mName);
-            } else {
-                Keystore ks = Keystore.getInstance();
-                for (int i = 0, count = mItemList.size(); i < count; i++) {
-                    byte[] blob = mItemList.get(i);
-                    int ret = ks.put(mNamespaceList.get(i), mName,
-                            new String(blob));
-                    if (ret != 0) return ret;
-                }
-            }
-            return 0;
-        }
-
-        private void parse(Intent intent) {
-            mTypeName = intent.getStringExtra(KEY_CSTOR_TYPE_NAME);
-            mItemList = new ArrayList<byte[]>();
-            mNamespaceList = new ArrayList<String>();
-            for (int i = 0; ; i++) {
-                byte[] blob = intent.getByteArrayExtra(KEY_CSTOR_ITEM + i);
-                if (blob == null) break;
-                mItemList.add(blob);
-                mNamespaceList.add(intent.getStringExtra(
-                        KEY_CSTOR_NAMESPACE + i));
-            }
-
-            // build description string
-            StringBuilder sb = new StringBuilder();
-            for (int i = 0; ; i++) {
-                String s = intent.getStringExtra(KEY_CSTOR_DESCRIPTION + i);
-                if (s == null) break;
-                sb.append(s).append("<br>");
-            }
-            mDescription = sb.toString();
-        }
     }
 }
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 4f888ff2375..c0a86135770 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -20,6 +20,7 @@ import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceGroup;
 import android.provider.Settings.System;
+import android.telephony.TelephonyManager;
 
 public class Settings extends PreferenceActivity {
 
@@ -34,6 +35,8 @@ public class Settings extends PreferenceActivity {
         
         addPreferencesFromResource(R.xml.settings);
         
+        int activePhoneType = TelephonyManager.getDefault().getPhoneType();
+
         PreferenceGroup parent = (PreferenceGroup) findPreference(KEY_PARENT);
         Utils.updatePreferenceToSpecificActivityOrRemove(this, parent, KEY_SYNC_SETTINGS, 0);
         Utils.updatePreferenceToSpecificActivityOrRemove(this, parent, KEY_SEARCH_SETTINGS, 0);
diff --git a/src/com/android/settings/SettingsSafetyLegalActivity.java b/src/com/android/settings/SettingsSafetyLegalActivity.java
new file mode 100644
index 00000000000..619dc945f67
--- /dev/null
+++ b/src/com/android/settings/SettingsSafetyLegalActivity.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.SystemProperties;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.view.KeyEvent;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import com.android.internal.app.AlertActivity;
+import com.android.internal.app.AlertController;
+import android.content.DialogInterface;
+
+/**
+ * The "dialog" that shows from "Safety information" in the Settings app.
+ */
+public class SettingsSafetyLegalActivity extends AlertActivity 
+        implements DialogInterface.OnCancelListener, DialogInterface.OnClickListener {
+    private static final String PROPERTY_LSAFETYLEGAL_URL = "ro.url.safetylegal";
+
+    private WebView mWebView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        String userSafetylegalUrl = SystemProperties.get(PROPERTY_LSAFETYLEGAL_URL);
+
+        final Configuration configuration = getResources().getConfiguration();
+        final String language = configuration.locale.getLanguage();
+        final String country = configuration.locale.getCountry();
+
+        String loc = String.format("locale=%s-%s", language, country);
+
+        userSafetylegalUrl = String.format("%s&%s", userSafetylegalUrl, loc);
+
+        mWebView = new WebView(this);
+
+        // Begin accessing
+        mWebView.getSettings().setJavaScriptEnabled(true);
+        mWebView.loadUrl(userSafetylegalUrl);
+        mWebView.setWebViewClient(new WebViewClient() {
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                // Change from 'Loading...' to the real title
+                mAlert.setTitle(getString(R.string.settings_safetylegal_activity_title));
+            }
+
+            @Override
+            public void onReceivedError(WebView view, int errorCode,
+                    String description, String failingUrl) {
+                showErrorAndFinish(failingUrl);
+            }
+        });
+
+        final AlertController.AlertParams p = mAlertParams;
+        p.mTitle = getString(R.string.settings_safetylegal_activity_loading);
+        p.mView = mWebView;
+        p.mForceInverseBackground = true;
+        setupAlert();
+    }
+
+    private void showErrorAndFinish(String url) {
+        new AlertDialog.Builder(this)
+                .setMessage(getResources()
+                        .getString(R.string.settings_safetylegal_activity_unreachable, url))
+                .setTitle(R.string.settings_safetylegal_activity_title)
+                .setPositiveButton(android.R.string.ok, this)
+                .setOnCancelListener(this)
+                .setCancelable(true)
+                .show();
+    }
+
+    @Override
+    public boolean dispatchKeyEvent(KeyEvent event) {
+        if (event.getKeyCode() == KeyEvent.KEYCODE_BACK 
+                && event.getAction() == KeyEvent.ACTION_DOWN) {
+            if (mWebView.canGoBack()) {
+                mWebView.goBack();
+                return true;
+            }
+        }
+        return super.dispatchKeyEvent(event);
+    }
+
+    public void onClick(DialogInterface dialog, int whichButton) {
+        finish();
+    }
+
+    public void onCancel(DialogInterface dialog) {
+        finish();
+    }
+}
diff --git a/src/com/android/settings/SoundAndDisplaySettings.java b/src/com/android/settings/SoundAndDisplaySettings.java
index 4417f240c33..92297de9180 100644
--- a/src/com/android/settings/SoundAndDisplaySettings.java
+++ b/src/com/android/settings/SoundAndDisplaySettings.java
@@ -52,6 +52,7 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
     private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
     private static final String KEY_DTMF_TONE = "dtmf_tone";
     private static final String KEY_SOUND_EFFECTS = "sound_effects";
+    private static final String KEY_HAPTIC_FEEDBACK = "haptic_feedback";
     private static final String KEY_ANIMATIONS = "animations";
     private static final String KEY_ACCELEROMETER = "accelerometer";
     private static final String KEY_PLAY_MEDIA_NOTIFICATION_SOUNDS = "play_media_notification_sounds";
@@ -73,7 +74,8 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
     private CheckBoxPreference mVibrate;
     private CheckBoxPreference mDtmfTone;
     private CheckBoxPreference mSoundEffects;
-    private CheckBoxPreference mAnimations;
+    private CheckBoxPreference mHapticFeedback;
+    private ListPreference mAnimations;
     private CheckBoxPreference mAccelerometer;
     private float[] mAnimationScales;
     
@@ -118,8 +120,12 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
         mSoundEffects.setPersistent(false);
         mSoundEffects.setChecked(Settings.System.getInt(resolver,
                 Settings.System.SOUND_EFFECTS_ENABLED, 0) != 0);
-        mAnimations = (CheckBoxPreference) findPreference(KEY_ANIMATIONS);
-        mAnimations.setPersistent(false);
+        mHapticFeedback = (CheckBoxPreference) findPreference(KEY_HAPTIC_FEEDBACK);
+        mHapticFeedback.setPersistent(false);
+        mHapticFeedback.setChecked(Settings.System.getInt(resolver,
+                Settings.System.HAPTIC_FEEDBACK_ENABLED, 0) != 0);
+        mAnimations = (ListPreference) findPreference(KEY_ANIMATIONS);
+        mAnimations.setOnPreferenceChangeListener(this);
         mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER);
         mAccelerometer.setPersistent(false);
         
@@ -187,29 +193,49 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
                 R.string.silent_mode_incl_alarm_summary :
                 R.string.silent_mode_summary);
         
-        boolean animations = true;
+        int animations = 0;
         try {
             mAnimationScales = mWindowManager.getAnimationScales();
         } catch (RemoteException e) {
         }
         if (mAnimationScales != null) {
-            // We will leave the window animations alone (always set),
-            // and only use this to change the transition animations.
-            for (int i=1; i<mAnimationScales.length; i++) {
-                if (mAnimationScales[i] == 0) {
-                    animations = false;
-                    break;
-                }
+            if (mAnimationScales.length >= 1) {
+                animations = ((int)(mAnimationScales[0]+.5f)) % 10;
+            }
+            if (mAnimationScales.length >= 2) {
+                animations += (((int)(mAnimationScales[1]+.5f)) & 0x7) * 10;
             }
         }
-        if (animations != mAnimations.isChecked() || force) {
-            mAnimations.setChecked(animations);
+        int idx = 0;
+        int best = 0;
+        CharSequence[] aents = mAnimations.getEntryValues();
+        for (int i=0; i<aents.length; i++) {
+            int val = Integer.parseInt(aents[i].toString());
+            if (val <= animations && val > best) {
+                best = val;
+                idx = i;
+            }
         }
+        mAnimations.setValueIndex(idx);
+        updateAnimationsSummary(mAnimations.getValue());
         mAccelerometer.setChecked(Settings.System.getInt(
                 getContentResolver(), 
                 Settings.System.ACCELEROMETER_ROTATION, 0) != 0);
     }
 
+    private void updateAnimationsSummary(Object value) {
+        CharSequence[] summaries = getResources().getTextArray(R.array.animations_summaries);
+        CharSequence[] values = mAnimations.getEntryValues();
+        for (int i=0; i<values.length; i++) {
+            //Log.i("foo", "Comparing entry "+ values[i] + " to current "
+            //        + mAnimations.getValue());
+            if (values[i].equals(value)) {
+                mAnimations.setSummary(summaries[i]);
+                break;
+            }
+        }
+    }
+    
     private void setRingerMode(boolean silent, boolean vibrate) {
         if (silent) {
             mAudioManager.setRingerMode(vibrate ? AudioManager.RINGER_MODE_VIBRATE :
@@ -224,7 +250,6 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
 
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-
         if (preference == mSilent || preference == mVibrate) {
             setRingerMode(mSilent.isChecked(), mVibrate.isChecked());
             if (preference == mSilent) updateState(false);
@@ -245,19 +270,10 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
             }
             Settings.System.putInt(getContentResolver(), Settings.System.SOUND_EFFECTS_ENABLED,
                     mSoundEffects.isChecked() ? 1 : 0);
-            
-        } else if (preference == mAnimations) {
-            if (mAnimationScales.length > 0) {
-                // Window animations are always on.
-                mAnimationScales[0] = 1;
-            }
-            for (int i=1; i<mAnimationScales.length; i++) {
-                mAnimationScales[i] = mAnimations.isChecked() ? 1 : 0;
-            }
-            try {
-                mWindowManager.setAnimationScales(mAnimationScales);
-            } catch (RemoteException e) {
-            }
+
+        } else if (preference == mHapticFeedback) {
+            Settings.System.putInt(getContentResolver(), Settings.System.HAPTIC_FEEDBACK_ENABLED,
+                    mHapticFeedback.isChecked() ? 1 : 0);
             
         } else if (preference == mAccelerometer) {
             Settings.System.putInt(getContentResolver(),
@@ -268,6 +284,25 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
     }
 
     public boolean onPreferenceChange(Preference preference, Object objValue) {
+        if (KEY_ANIMATIONS.equals(preference.getKey())) {
+            try {
+                int value = Integer.parseInt((String) objValue);
+                if (mAnimationScales.length >= 1) {
+                    mAnimationScales[0] = value%10;
+                }
+                if (mAnimationScales.length >= 2) {
+                    mAnimationScales[1] = (value/10)%10;
+                }
+                try {
+                    mWindowManager.setAnimationScales(mAnimationScales);
+                } catch (RemoteException e) {
+                }
+                updateAnimationsSummary(objValue);
+            } catch (NumberFormatException e) {
+                Log.e(TAG, "could not persist animation setting", e);
+            }
+            
+        }
         if (KEY_SCREEN_TIMEOUT.equals(preference.getKey())) {
             int value = Integer.parseInt((String) objValue);
             try {
diff --git a/src/com/android/settings/TextToSpeechSettings.java b/src/com/android/settings/TextToSpeechSettings.java
index d3d59fa2605..f60d0f25d5b 100644
--- a/src/com/android/settings/TextToSpeechSettings.java
+++ b/src/com/android/settings/TextToSpeechSettings.java
@@ -55,6 +55,10 @@ public class TextToSpeechSettings extends PreferenceActivity implements
     private static final String KEY_TTS_DEFAULT_LANG = "tts_default_lang";
     private static final String KEY_TTS_DEFAULT_COUNTRY = "tts_default_country";
     private static final String KEY_TTS_DEFAULT_VARIANT = "tts_default_variant";
+    // TODO move default Locale values to TextToSpeech.Engine
+    private static final String DEFAULT_LANG_VAL = "eng";
+    private static final String DEFAULT_COUNTRY_VAL = "USA";
+    private static final String DEFAULT_VARIANT_VAL = "";
 
     private static final String LOCALE_DELIMITER = "-";
 
@@ -70,6 +74,12 @@ public class TextToSpeechSettings extends PreferenceActivity implements
     private String             mDefaultCountry = null;
     private String             mDefaultLocVariant = null;
     private String             mDefaultEng = "";
+    private int                mDefaultRate = TextToSpeech.Engine.DEFAULT_RATE;
+
+    // Array of strings used to demonstrate TTS in the different languages.
+    private String[] mDemoStrings;
+    // Index of the current string to use for the demo.
+    private int      mDemoStringIndex = 0;
 
     private boolean mEnableDemo = false;
 
@@ -80,11 +90,6 @@ public class TextToSpeechSettings extends PreferenceActivity implements
      * startActivityForResult.
      */
     private static final int VOICE_DATA_INTEGRITY_CHECK = 1977;
-    /**
-     * Request code (arbitrary value) for voice data installation through
-     * startActivityForResult.
-     */
-    private static final int VOICE_DATA_INSTALLATION = 1980;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -92,6 +97,8 @@ public class TextToSpeechSettings extends PreferenceActivity implements
 
         addPreferencesFromResource(R.xml.tts_settings);
 
+        mDemoStrings = getResources().getStringArray(R.array.tts_demo_strings);
+
         setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM);
 
         mEnableDemo = false;
@@ -132,21 +139,21 @@ public class TextToSpeechSettings extends PreferenceActivity implements
 
     private void initDefaultSettings() {
         ContentResolver resolver = getContentResolver();
-        int intVal = 0;
 
         // Find the default TTS values in the settings, initialize and store the
         // settings if they are not found.
 
         // "Use Defaults"
+        int useDefault = 0;
         mUseDefaultPref = (CheckBoxPreference) findPreference(KEY_TTS_USE_DEFAULT);
         try {
-            intVal = Settings.Secure.getInt(resolver, TTS_USE_DEFAULTS);
+            useDefault = Settings.Secure.getInt(resolver, TTS_USE_DEFAULTS);
         } catch (SettingNotFoundException e) {
             // "use default" setting not found, initialize it
-            intVal = TextToSpeech.Engine.USE_DEFAULTS;
-            Settings.Secure.putInt(resolver, TTS_USE_DEFAULTS, intVal);
+            useDefault = TextToSpeech.Engine.USE_DEFAULTS;
+            Settings.Secure.putInt(resolver, TTS_USE_DEFAULTS, useDefault);
         }
-        mUseDefaultPref.setChecked(intVal == 1);
+        mUseDefaultPref.setChecked(useDefault == 1);
         mUseDefaultPref.setOnPreferenceChangeListener(this);
 
         // Default engine
@@ -161,59 +168,19 @@ public class TextToSpeechSettings extends PreferenceActivity implements
         // Default rate
         mDefaultRatePref = (ListPreference) findPreference(KEY_TTS_DEFAULT_RATE);
         try {
-            intVal = Settings.Secure.getInt(resolver, TTS_DEFAULT_RATE);
+            mDefaultRate = Settings.Secure.getInt(resolver, TTS_DEFAULT_RATE);
         } catch (SettingNotFoundException e) {
             // default rate setting not found, initialize it
-            intVal = TextToSpeech.Engine.DEFAULT_RATE;
-            Settings.Secure.putInt(resolver, TTS_DEFAULT_RATE, intVal);
+            mDefaultRate = TextToSpeech.Engine.DEFAULT_RATE;
+            Settings.Secure.putInt(resolver, TTS_DEFAULT_RATE, mDefaultRate);
         }
-        mDefaultRatePref.setValue(String.valueOf(intVal));
+        mDefaultRatePref.setValue(String.valueOf(mDefaultRate));
         mDefaultRatePref.setOnPreferenceChangeListener(this);
 
         // Default language / country / variant : these three values map to a single ListPref
         // representing the matching Locale
-        String language = null;
-        String country = null;
-        String variant = null;
         mDefaultLocPref = (ListPreference) findPreference(KEY_TTS_DEFAULT_LANG);
-        language = Settings.Secure.getString(resolver, TTS_DEFAULT_LANG);
-        if (language == null) {
-            // the default language property isn't set, use that of the current locale
-            Locale currentLocale = Locale.getDefault();
-            language = currentLocale.getISO3Language();
-            country = currentLocale.getISO3Country();
-            variant = currentLocale.getVariant();
-            Settings.Secure.putString(resolver, TTS_DEFAULT_LANG, language);
-            Settings.Secure.putString(resolver, TTS_DEFAULT_COUNTRY, country);
-            Settings.Secure.putString(resolver, TTS_DEFAULT_VARIANT, variant);
-        }
-        mDefaultLanguage = language;
-        if (country == null) {
-            // country wasn't initialized yet because a default language was found
-            country = Settings.Secure.getString(resolver, KEY_TTS_DEFAULT_COUNTRY);
-            if (country == null) {
-                // default country setting not found, initialize it, as well as the variant;
-                Locale currentLocale = Locale.getDefault();
-                country = currentLocale.getISO3Country();
-                variant = currentLocale.getVariant();
-                Settings.Secure.putString(resolver, TTS_DEFAULT_COUNTRY, country);
-                Settings.Secure.putString(resolver, TTS_DEFAULT_VARIANT, variant);
-            }
-        }
-        mDefaultCountry = country;
-        if (variant == null) {
-            // variant wasn't initialized yet because a default country was found
-            variant = Settings.Secure.getString(resolver, KEY_TTS_DEFAULT_VARIANT);
-            if (variant == null) {
-                // default variant setting not found, initialize it
-                Locale currentLocale = Locale.getDefault();
-                variant = currentLocale.getVariant();
-                Settings.Secure.putString(resolver, TTS_DEFAULT_VARIANT, variant);
-            }
-        }
-        mDefaultLocVariant = variant;
-
-        setDefaultLocalePref(language, country, variant);
+        initDefaultLang();
         mDefaultLocPref.setOnPreferenceChangeListener(this);
     }
 
@@ -246,13 +213,14 @@ public class TextToSpeechSettings extends PreferenceActivity implements
         PackageManager pm = getPackageManager();
         Intent intent = new Intent();
         intent.setAction(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         List<ResolveInfo> resolveInfos = pm.queryIntentActivities(intent, 0);
         // query only the package that matches that of the default engine
         for (int i = 0; i < resolveInfos.size(); i++) {
             ActivityInfo currentActivityInfo = resolveInfos.get(i).activityInfo;
             if (mDefaultEng.equals(currentActivityInfo.packageName)) {
                 intent.setClassName(mDefaultEng, currentActivityInfo.name);
-                this.startActivityForResult(intent, VOICE_DATA_INSTALLATION);
+                this.startActivity(intent);
             }
         }
     }
@@ -265,6 +233,8 @@ public class TextToSpeechSettings extends PreferenceActivity implements
         if (status == TextToSpeech.SUCCESS) {
             Log.v(TAG, "TTS engine for settings screen initialized.");
             mEnableDemo = true;
+            mTts.setLanguage(new Locale(mDefaultLanguage, mDefaultCountry));
+            mTts.setSpeechRate((float)(mDefaultRate/100.0f));
         } else {
             Log.v(TAG, "TTS engine for settings screen failed to initialize successfully.");
             mEnableDemo = false;
@@ -282,7 +252,6 @@ public class TextToSpeechSettings extends PreferenceActivity implements
                 Log.v(TAG, "Voice data check passed");
                 if (mTts == null) {
                     mTts = new TextToSpeech(this, this);
-                    mTts.setLanguage(Locale.getDefault());
                 }
             } else {
                 Log.v(TAG, "Voice data check failed");
@@ -302,14 +271,14 @@ public class TextToSpeechSettings extends PreferenceActivity implements
             Log.i(TAG, "TTS use default settings is "+objValue.toString());
         } else if (KEY_TTS_DEFAULT_RATE.equals(preference.getKey())) {
             // Default rate
-            int value = Integer.parseInt((String) objValue);
+            mDefaultRate = Integer.parseInt((String) objValue);
             try {
                 Settings.Secure.putInt(getContentResolver(),
-                        TTS_DEFAULT_RATE, value);
+                        TTS_DEFAULT_RATE, mDefaultRate);
                 if (mTts != null) {
-                    mTts.setSpeechRate((float)(value/100.0f));
+                    mTts.setSpeechRate((float)(mDefaultRate/100.0f));
                 }
-                Log.i(TAG, "TTS default rate is "+value);
+                Log.i(TAG, "TTS default rate is " + mDefaultRate);
             } catch (NumberFormatException e) {
                 Log.e(TAG, "could not persist default TTS rate setting", e);
             }
@@ -325,6 +294,9 @@ public class TextToSpeechSettings extends PreferenceActivity implements
             if (mTts != null) {
                 mTts.setLanguage(new Locale(mDefaultLanguage, mDefaultCountry));
             }
+            int newIndex = mDefaultLocPref.findIndexOfValue((String)objValue);
+            Log.v("Settings", " selected is " + newIndex);
+            mDemoStringIndex = newIndex > -1 ? newIndex : 0;
         }
 
         return true;
@@ -338,8 +310,7 @@ public class TextToSpeechSettings extends PreferenceActivity implements
         if (preference == mPlayExample) {
             // Play example
             if (mTts != null) {
-                mTts.speak(getResources().getString(R.string.tts_demo),
-                        TextToSpeech.QUEUE_FLUSH, null);
+                mTts.speak(mDemoStrings[mDemoStringIndex], TextToSpeech.QUEUE_FLUSH, null);
             }
             return true;
         }
@@ -380,25 +351,77 @@ public class TextToSpeechSettings extends PreferenceActivity implements
     }
 
 
-    private void setDefaultLocalePref(String language, String country, String variant) {
-        // build a string from the default lang/country/variant trio,
-        String localeString = new String(language);
-        if (country.compareTo("") != 0) {
-            localeString += LOCALE_DELIMITER + country;
-        } else {
-            localeString += LOCALE_DELIMITER + " ";
-        }
-        if (variant.compareTo("") != 0) {
-            localeString += LOCALE_DELIMITER + variant;
+    /**
+     *  Initialize the default language in the UI and in the preferences.
+     *  After this method has been invoked, the default language is a supported Locale.
+     */
+    private void initDefaultLang() {
+        // if there isn't already a default language preference
+        if (!hasLangPref()) {
+            // if the current Locale is supported
+            if (isCurrentLocSupported()) {
+                // then use the current Locale as the default language
+                useCurrentLocAsDefault();
+            } else {
+                // otherwise use a default supported Locale as the default language
+                useSupportedLocAsDefault();
+            }
         }
 
-        if (mDefaultLocPref.findIndexOfValue(localeString) > -1) {
-            mDefaultLocPref.setValue(localeString);
-        } else {
-            mDefaultLocPref.setValueIndex(0);
-        }
+        // Update the language preference list with the default language and the matching
+        // demo string (at this stage there is a default language pref)
+        ContentResolver resolver = getContentResolver();
+        mDefaultLanguage = Settings.Secure.getString(resolver, TTS_DEFAULT_LANG);
+        mDefaultCountry = Settings.Secure.getString(resolver, KEY_TTS_DEFAULT_COUNTRY);
+        mDefaultLocVariant = Settings.Secure.getString(resolver, KEY_TTS_DEFAULT_VARIANT);
 
-        Log.v(TAG, "In initDefaultSettings: localeString=" + localeString);
+        // update the demo string
+        mDemoStringIndex = mDefaultLocPref.findIndexOfValue(mDefaultLanguage + LOCALE_DELIMITER
+                + mDefaultCountry);
+        mDefaultLocPref.setValueIndex(mDemoStringIndex);
+    }
+
+    /**
+     * (helper function for initDefaultLang() )
+     * Returns whether there is a default language in the TTS settings.
+     */
+    private boolean hasLangPref() {
+        String language = Settings.Secure.getString(getContentResolver(), TTS_DEFAULT_LANG);
+        return (language != null);
+    }
+
+    /**
+     * (helper function for initDefaultLang() )
+     * Returns whether the current Locale is supported by this Settings screen
+     */
+    private boolean isCurrentLocSupported() {
+        String currentLocID = Locale.getDefault().getISO3Language() + LOCALE_DELIMITER
+                + Locale.getDefault().getISO3Country();
+        return (mDefaultLocPref.findIndexOfValue(currentLocID) > -1);
+    }
+
+    /**
+     * (helper function for initDefaultLang() )
+     * Sets the default language in TTS settings to be the current Locale.
+     * This should only be used after checking that the current Locale is supported.
+     */
+    private void useCurrentLocAsDefault() {
+        Locale currentLocale = Locale.getDefault();
+        ContentResolver resolver = getContentResolver();
+        Settings.Secure.putString(resolver, TTS_DEFAULT_LANG, currentLocale.getISO3Language());
+        Settings.Secure.putString(resolver, TTS_DEFAULT_COUNTRY, currentLocale.getISO3Country());
+        Settings.Secure.putString(resolver, TTS_DEFAULT_VARIANT, currentLocale.getVariant());
+    }
+
+    /**
+     * (helper function for initDefaultLang() )
+     * Sets the default language in TTS settings to be one known to be supported
+     */
+    private void useSupportedLocAsDefault() {
+        ContentResolver resolver = getContentResolver();
+        Settings.Secure.putString(resolver, TTS_DEFAULT_LANG, DEFAULT_LANG_VAL);
+        Settings.Secure.putString(resolver, TTS_DEFAULT_COUNTRY, DEFAULT_COUNTRY_VAL);
+        Settings.Secure.putString(resolver, TTS_DEFAULT_VARIANT, DEFAULT_VARIANT_VAL);
     }
 
 }
diff --git a/src/com/android/settings/UsageStats.java b/src/com/android/settings/UsageStats.java
index 89caa5485ef..fcb699026e3 100755
--- a/src/com/android/settings/UsageStats.java
+++ b/src/com/android/settings/UsageStats.java
@@ -187,7 +187,7 @@ public class UsageStats extends Activity implements OnItemSelectedListener {
                 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);
+                Log.w(TAG, "No usage stats info for package:" + position);
             }
             return convertView;
         }
diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index ef22ee14d3e..4b30b5333bd 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -29,6 +29,7 @@ import android.view.ContextMenu;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.WindowManager;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.AlphabetIndexer;
 import android.widget.EditText;
@@ -195,7 +196,7 @@ public class UserDictionarySettings extends ListActivity {
         return mCursor.getString(
                 mCursor.getColumnIndexOrThrow(UserDictionary.Words.WORD));
     }
-    
+
     @Override
     protected Dialog onCreateDialog(int id) {
         View content = getLayoutInflater().inflate(R.layout.dialog_edittext, null);
@@ -204,7 +205,7 @@ public class UserDictionarySettings extends ListActivity {
         editText.setInputType(InputType.TYPE_CLASS_TEXT 
                 | InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE);
         
-        return new AlertDialog.Builder(this)
+        AlertDialog dialog =  new AlertDialog.Builder(this)
                 .setTitle(mDialogEditingWord != null 
                         ? R.string.user_dict_settings_edit_dialog_title 
                         : R.string.user_dict_settings_add_dialog_title)
@@ -219,7 +220,11 @@ public class UserDictionarySettings extends ListActivity {
                         if (mAutoReturn) finish();                        
                     }})
                 .create();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE |
+                WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+        return dialog;
     }
+
     @Override
     protected void onPrepareDialog(int id, Dialog d) {
         AlertDialog dialog = (AlertDialog) d;
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index d1129150b99..22417bb3804 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -16,23 +16,62 @@
 
 package com.android.settings;
 
-import com.android.settings.bluetooth.BluetoothEnabler;
-import com.android.settings.wifi.WifiEnabler;
-
+import android.bluetooth.BluetoothAdapter;
+import android.content.Intent;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
-import android.preference.PreferenceActivity;
+import android.os.IBinder;
+import android.os.ServiceManager;
+import android.os.SystemProperties;
 import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+
+import com.android.internal.telephony.TelephonyIntents;
+import com.android.internal.telephony.TelephonyProperties;
+import com.android.settings.bluetooth.BluetoothEnabler;
+import com.android.settings.wifi.WifiEnabler;
 
 public class WirelessSettings extends PreferenceActivity {
 
     private static final String KEY_TOGGLE_AIRPLANE = "toggle_airplane";
     private static final String KEY_TOGGLE_BLUETOOTH = "toggle_bluetooth";
     private static final String KEY_TOGGLE_WIFI = "toggle_wifi";
+    private static final String KEY_WIFI_SETTINGS = "wifi_settings";
+    private static final String KEY_BT_SETTINGS = "bt_settings";
+    private static final String KEY_VPN_SETTINGS = "vpn_settings";
+    public static final String EXIT_ECM_RESULT = "exit_ecm_result";
+    public static final int REQUEST_CODE_EXIT_ECM = 1;
 
     private WifiEnabler mWifiEnabler;
     private AirplaneModeEnabler mAirplaneModeEnabler;
     private BluetoothEnabler mBtEnabler;
+    private CheckBoxPreference mAirplaneModePreference;
+
+    /**
+     * Invoked on each preference click in this hierarchy, overrides
+     * PreferenceActivity's implementation.  Used to make sure we track the
+     * preference click events.
+     */
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+        if ( (preference == mAirplaneModePreference) &&
+                (Boolean.parseBoolean(
+                    SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) ) {
+            // In ECM mode launch ECM app dialog
+            startActivityForResult(
+                new Intent(TelephonyIntents.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS, null),
+                REQUEST_CODE_EXIT_ECM);
+
+            return true;
+        }
+        else {
+            // Let the intents be launched by the Preference manager
+            return false;
+        }
+    }
     
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -41,6 +80,7 @@ public class WirelessSettings extends PreferenceActivity {
         addPreferencesFromResource(R.xml.wireless_settings);
 
         initToggles();
+        mAirplaneModePreference = (CheckBoxPreference) findPreference(KEY_TOGGLE_AIRPLANE);
     }
     
     @Override
@@ -48,8 +88,8 @@ public class WirelessSettings extends PreferenceActivity {
         super.onResume();
         
         mWifiEnabler.resume();
-        mAirplaneModeEnabler.resume();
         mBtEnabler.resume();
+        mAirplaneModeEnabler.resume();
     }
     
     @Override
@@ -63,18 +103,50 @@ public class WirelessSettings extends PreferenceActivity {
     
     private void initToggles() {
         
+        Preference airplanePreference = findPreference(KEY_TOGGLE_AIRPLANE);
+        Preference wifiPreference = findPreference(KEY_TOGGLE_WIFI);
+        Preference btPreference = findPreference(KEY_TOGGLE_BLUETOOTH);
+        Preference wifiSettings = findPreference(KEY_WIFI_SETTINGS);
+        Preference vpnSettings = findPreference(KEY_VPN_SETTINGS);
+
+        IBinder b = ServiceManager.getService(BluetoothAdapter.BLUETOOTH_SERVICE);
+        if (b == null) {
+            // Disable BT Settings if BT service is not available.
+            Preference btSettings = findPreference(KEY_BT_SETTINGS);
+            btSettings.setEnabled(false);
+        }
+
         mWifiEnabler = new WifiEnabler(
-                this,
-                (WifiManager) getSystemService(WIFI_SERVICE),
-                (CheckBoxPreference) findPreference(KEY_TOGGLE_WIFI));
-        
+                this, (WifiManager) getSystemService(WIFI_SERVICE),
+                (CheckBoxPreference) wifiPreference);
         mAirplaneModeEnabler = new AirplaneModeEnabler(
-                this,
-                (CheckBoxPreference) findPreference(KEY_TOGGLE_AIRPLANE));
-        
-        mBtEnabler = new BluetoothEnabler(
-                this,
-                (CheckBoxPreference) findPreference(KEY_TOGGLE_BLUETOOTH));
+                this, (CheckBoxPreference) airplanePreference);
+        mBtEnabler = new BluetoothEnabler(this, (CheckBoxPreference) btPreference);
+
+        // manually set up dependencies for Wifi if its radio is not toggleable in airplane mode
+        String toggleableRadios = Settings.System.getString(getContentResolver(),
+                Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
+        if (toggleableRadios == null || !toggleableRadios.contains(Settings.System.RADIO_WIFI)) {
+            wifiPreference.setDependency(airplanePreference.getKey());
+            wifiSettings.setDependency(airplanePreference.getKey());
+            vpnSettings.setDependency(airplanePreference.getKey());
+        }
     }
-    
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch(requestCode) {
+        case REQUEST_CODE_EXIT_ECM:
+            Boolean isChoiceYes =
+                data.getBooleanExtra(EXIT_ECM_RESULT, false);
+            // Set Airplane mode based on the return value and checkbox state
+            mAirplaneModeEnabler.setAirplaneModeInECM(isChoiceYes,
+                    mAirplaneModePreference.isChecked());
+            break;
+
+        default:
+            break;
+        }
+    }
+
 }
diff --git a/src/com/android/settings/ZoneList.java b/src/com/android/settings/ZoneList.java
index 2877f0039f0..aaaf9894914 100644
--- a/src/com/android/settings/ZoneList.java
+++ b/src/com/android/settings/ZoneList.java
@@ -160,7 +160,7 @@ public class ZoneList extends ListActivity {
         try {
             XmlResourceParser xrp = getResources().getXml(R.xml.timezones);
             while (xrp.next() != XmlResourceParser.START_TAG)
-                ;
+                continue;
             xrp.next();
             while (xrp.getEventType() != XmlResourceParser.END_TAG) {
                 while (xrp.getEventType() != XmlResourceParser.START_TAG) {
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index 7053ff5fd74..5b0218fd801 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -28,20 +28,20 @@ import android.widget.ImageView;
  * BluetoothDevicePreference is the preference type used to display each remote
  * Bluetooth device in the Bluetooth Settings screen.
  */
-public class BluetoothDevicePreference extends Preference implements LocalBluetoothDevice.Callback {
+public class BluetoothDevicePreference extends Preference implements CachedBluetoothDevice.Callback {
     private static final String TAG = "BluetoothDevicePreference";
 
     private static int sDimAlpha = Integer.MIN_VALUE;
-    
-    private LocalBluetoothDevice mLocalDevice;
-    
+
+    private CachedBluetoothDevice mCachedDevice;
+
     /**
      * Cached local copy of whether the device is busy. This is only updated
-     * from {@link #onDeviceAttributesChanged(LocalBluetoothDevice)}.
-     */ 
+     * from {@link #onDeviceAttributesChanged(CachedBluetoothDevice)}.
+     */
     private boolean mIsBusy;
-    
-    public BluetoothDevicePreference(Context context, LocalBluetoothDevice localDevice) {
+
+    public BluetoothDevicePreference(Context context, CachedBluetoothDevice cachedDevice) {
         super(context);
 
         if (sDimAlpha == Integer.MIN_VALUE) {
@@ -49,67 +49,71 @@ public class BluetoothDevicePreference extends Preference implements LocalBlueto
             context.getTheme().resolveAttribute(android.R.attr.disabledAlpha, outValue, true);
             sDimAlpha = (int) (outValue.getFloat() * 255);
         }
-            
-        mLocalDevice = localDevice;
-        
+
+        mCachedDevice = cachedDevice;
+
         setLayoutResource(R.layout.preference_bluetooth);
-        
-        localDevice.registerCallback(this);
-        
-        onDeviceAttributesChanged(localDevice);
+
+        cachedDevice.registerCallback(this);
+
+        onDeviceAttributesChanged(cachedDevice);
     }
-    
-    public LocalBluetoothDevice getDevice() {
-        return mLocalDevice;
+
+    public CachedBluetoothDevice getCachedDevice() {
+        return mCachedDevice;
     }
 
     @Override
     protected void onPrepareForRemoval() {
         super.onPrepareForRemoval();
-        mLocalDevice.unregisterCallback(this);
+        mCachedDevice.unregisterCallback(this);
     }
 
-    public void onDeviceAttributesChanged(LocalBluetoothDevice device) {
+    public void onDeviceAttributesChanged(CachedBluetoothDevice cachedDevice) {
 
         /*
          * The preference framework takes care of making sure the value has
          * changed before proceeding.
          */
-        
-        setTitle(mLocalDevice.getName());
-        
+
+        setTitle(mCachedDevice.getName());
+
         /*
          * TODO: Showed "Paired" even though it was "Connected". This may be
          * related to BluetoothHeadset not bound to the actual
          * BluetoothHeadsetService when we got here.
          */
-        setSummary(mLocalDevice.getSummary());
+        setSummary(mCachedDevice.getSummary());
 
         // Used to gray out the item
-        mIsBusy = mLocalDevice.isBusy();
-        
+        mIsBusy = mCachedDevice.isBusy();
+
         // Data has changed
         notifyChanged();
-        
+
         // This could affect ordering, so notify that also
         notifyHierarchyChanged();
     }
 
     @Override
     public boolean isEnabled() {
+        // Temp fix until we have 2053751 fixed in the framework
+        setEnabled(true);
         return super.isEnabled() && !mIsBusy;
     }
 
     @Override
     protected void onBindView(View view) {
+        // Disable this view if the bluetooth enable/disable preference view is off
+        if (null != findPreferenceInHierarchy("bt_checkbox")){
+            setDependency("bt_checkbox");
+        }
+
         super.onBindView(view);
 
-        // Disable this view if the bluetooth enable/disable preference view is off
-        setDependency("bt_checkbox");
-
         ImageView btClass = (ImageView) view.findViewById(R.id.btClass);
-        btClass.setImageResource(mLocalDevice.getBtClassDrawable());
-        btClass.setAlpha(isEnabled() ? 255 : sDimAlpha);        
+        btClass.setImageResource(mCachedDevice.getBtClassDrawable());
+        btClass.setAlpha(isEnabled() ? 255 : sDimAlpha);
     }
 
     @Override
@@ -118,8 +122,8 @@ public class BluetoothDevicePreference extends Preference implements LocalBlueto
             // Put other preference types above us
             return 1;
         }
-        
-        return mLocalDevice.compareTo(((BluetoothDevicePreference) another).mLocalDevice);
+
+        return mCachedDevice.compareTo(((BluetoothDevicePreference) another).mCachedDevice);
     }
- 
+
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
index 58fb5690aaf..eec0ad8efe9 100644
--- a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
@@ -18,9 +18,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.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -38,26 +36,27 @@ import android.preference.CheckBoxPreference;
  */
 public class BluetoothDiscoverableEnabler implements Preference.OnPreferenceChangeListener {
     private static final String TAG = "BluetoothDiscoverableEnabler";
-    
+
     private static final String SYSTEM_PROPERTY_DISCOVERABLE_TIMEOUT =
             "debug.bt.discoverable_time";
-    private static final int DISCOVERABLE_TIMEOUT = 120; 
+    /* package */  static final int DEFAULT_DISCOVERABLE_TIMEOUT = 120;
 
-    private static final String SHARED_PREFERENCES_KEY_DISCOVERABLE_END_TIMESTAMP =
+    /* package */ static final String SHARED_PREFERENCES_KEY_DISCOVERABLE_END_TIMESTAMP =
             "discoverable_end_timestamp";
-    
+
     private final Context mContext;
     private final Handler mUiHandler;
     private final CheckBoxPreference mCheckBoxPreference;
-    
+
     private final LocalBluetoothManager mLocalManager;
-    
+
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            if (BluetoothIntent.SCAN_MODE_CHANGED_ACTION.equals(intent.getAction())) {
-                int mode = intent.getIntExtra(BluetoothIntent.SCAN_MODE, BluetoothError.ERROR);
-                if (mode != BluetoothError.ERROR) {
+            if (BluetoothAdapter.ACTION_SCAN_MODE_CHANGED.equals(intent.getAction())) {
+                int mode = intent.getIntExtra(BluetoothAdapter.EXTRA_SCAN_MODE,
+                        BluetoothAdapter.ERROR);
+                if (mode != BluetoothAdapter.ERROR) {
                     handleModeChanged(mode);
                 }
             }
@@ -66,17 +65,17 @@ public class BluetoothDiscoverableEnabler implements Preference.OnPreferenceChan
 
     private final Runnable mUpdateCountdownSummaryRunnable = new Runnable() {
         public void run() {
-            updateCountdownSummary();        
-        } 
+            updateCountdownSummary();
+        }
     };
 
     public BluetoothDiscoverableEnabler(Context context, CheckBoxPreference checkBoxPreference) {
         mContext = context;
         mUiHandler = new Handler();
         mCheckBoxPreference = checkBoxPreference;
-        
+
         checkBoxPreference.setPersistent(false);
-        
+
         mLocalManager = LocalBluetoothManager.getInstance(context);
         if (mLocalManager == null) {
             // Bluetooth not supported
@@ -89,33 +88,33 @@ public class BluetoothDiscoverableEnabler implements Preference.OnPreferenceChan
             return;
         }
 
-        IntentFilter filter = new IntentFilter(BluetoothIntent.SCAN_MODE_CHANGED_ACTION);
+        IntentFilter filter = new IntentFilter(BluetoothAdapter.ACTION_SCAN_MODE_CHANGED);
         mContext.registerReceiver(mReceiver, filter);
         mCheckBoxPreference.setOnPreferenceChangeListener(this);
-        
-        handleModeChanged(mLocalManager.getBluetoothManager().getScanMode());
+
+        handleModeChanged(mLocalManager.getBluetoothAdapter().getScanMode());
     }
-    
+
     public void pause() {
         if (mLocalManager == null) {
             return;
         }
-        
+
         mUiHandler.removeCallbacks(mUpdateCountdownSummaryRunnable);
         mCheckBoxPreference.setOnPreferenceChangeListener(null);
         mContext.unregisterReceiver(mReceiver);
     }
-    
+
     public boolean onPreferenceChange(Preference preference, Object value) {
         // Turn on/off BT discoverability
         setEnabled((Boolean) value);
-        
+
         return true;
     }
-    
+
     private void setEnabled(final boolean enable) {
-        BluetoothDevice manager = mLocalManager.getBluetoothManager();
-        
+        BluetoothAdapter manager = mLocalManager.getBluetoothAdapter();
+
         if (enable) {
 
             int timeout = getDiscoverableTimeout();
@@ -126,19 +125,19 @@ public class BluetoothDiscoverableEnabler implements Preference.OnPreferenceChan
 
             long endTimestamp = System.currentTimeMillis() + timeout * 1000;
             persistDiscoverableEndTimestamp(endTimestamp);
-            
-            manager.setScanMode(BluetoothDevice.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
+
+            manager.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
         } else {
-            manager.setScanMode(BluetoothDevice.SCAN_MODE_CONNECTABLE);
+            manager.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
         }
     }
 
     private int getDiscoverableTimeout() {
         int timeout = SystemProperties.getInt(SYSTEM_PROPERTY_DISCOVERABLE_TIMEOUT, -1);
         if (timeout <= 0) {
-            timeout = DISCOVERABLE_TIMEOUT;
+            timeout = DEFAULT_DISCOVERABLE_TIMEOUT;
         }
-        
+
         return timeout;
     }
 
@@ -147,44 +146,44 @@ public class BluetoothDiscoverableEnabler implements Preference.OnPreferenceChan
         editor.putLong(SHARED_PREFERENCES_KEY_DISCOVERABLE_END_TIMESTAMP, endTimestamp);
         editor.commit();
     }
-    
+
     private void handleModeChanged(int mode) {
-        if (mode == BluetoothDevice.SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
+        if (mode == BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
             mCheckBoxPreference.setChecked(true);
             updateCountdownSummary();
-            
+
         } else {
             mCheckBoxPreference.setChecked(false);
         }
     }
-    
+
     private void updateCountdownSummary() {
-        int mode = mLocalManager.getBluetoothManager().getScanMode();
-        if (mode != BluetoothDevice.SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
+        int mode = mLocalManager.getBluetoothAdapter().getScanMode();
+        if (mode != BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
             return;
         }
-            
+
         long currentTimestamp = System.currentTimeMillis();
         long endTimestamp = mLocalManager.getSharedPreferences().getLong(
                 SHARED_PREFERENCES_KEY_DISCOVERABLE_END_TIMESTAMP, 0);
-            
+
         if (currentTimestamp > endTimestamp) {
             // We're still in discoverable mode, but maybe there isn't a timeout.
             mCheckBoxPreference.setSummaryOn(null);
             return;
         }
-        
+
         String formattedTimeLeft = String.valueOf((endTimestamp - currentTimestamp) / 1000);
-        
+
         mCheckBoxPreference.setSummaryOn(
                 mContext.getResources().getString(R.string.bluetooth_is_discoverable,
                         formattedTimeLeft));
-        
+
         synchronized (this) {
             mUiHandler.removeCallbacks(mUpdateCountdownSummaryRunnable);
             mUiHandler.postDelayed(mUpdateCountdownSummaryRunnable, 1000);
         }
     }
-    
-        
+
+
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java
index af2722f8575..b872916b4ee 100644
--- a/src/com/android/settings/bluetooth/BluetoothEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java
@@ -18,9 +18,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.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -36,21 +34,20 @@ import android.util.Config;
  * preference reflects the current state.
  */
 public class BluetoothEnabler implements Preference.OnPreferenceChangeListener {
-    
+
     private static final boolean LOCAL_LOGD = Config.LOGD || false;
     private static final String TAG = "BluetoothEnabler";
-    
-    private final Context mContext; 
+
+    private final Context mContext;
     private final CheckBoxPreference mCheckBoxPreference;
     private final CharSequence mOriginalSummary;
-    
+
     private final LocalBluetoothManager mLocalManager;
 
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            int state = intent.getIntExtra(BluetoothIntent.BLUETOOTH_STATE,
-                    BluetoothError.ERROR);
+            int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR);
             handleStateChanged(state);
         }
     };
@@ -58,10 +55,10 @@ public class BluetoothEnabler implements Preference.OnPreferenceChangeListener {
     public BluetoothEnabler(Context context, CheckBoxPreference checkBoxPreference) {
         mContext = context;
         mCheckBoxPreference = checkBoxPreference;
-        
+
         mOriginalSummary = checkBoxPreference.getSummary();
         checkBoxPreference.setPersistent(false);
-        
+
         mLocalManager = LocalBluetoothManager.getInstance(context);
         if (mLocalManager == null) {
             // Bluetooth not supported
@@ -73,60 +70,68 @@ public class BluetoothEnabler implements Preference.OnPreferenceChangeListener {
         if (mLocalManager == null) {
             return;
         }
-        
+
         int state = mLocalManager.getBluetoothState();
         // This is the widget enabled state, not the preference toggled state
-        mCheckBoxPreference.setEnabled(state == BluetoothDevice.BLUETOOTH_STATE_ON ||
-                state == BluetoothDevice.BLUETOOTH_STATE_OFF);
+        mCheckBoxPreference.setEnabled(state == BluetoothAdapter.STATE_ON ||
+                state == BluetoothAdapter.STATE_OFF);
         // BT state is not a sticky broadcast, so set it manually
         handleStateChanged(state);
-        
-        mContext.registerReceiver(mReceiver, 
-                new IntentFilter(BluetoothIntent.BLUETOOTH_STATE_CHANGED_ACTION));
+
+        mContext.registerReceiver(mReceiver,
+                new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED));
         mCheckBoxPreference.setOnPreferenceChangeListener(this);
     }
-    
+
     public void pause() {
         if (mLocalManager == null) {
             return;
         }
-        
+
         mContext.unregisterReceiver(mReceiver);
         mCheckBoxPreference.setOnPreferenceChangeListener(null);
     }
-    
+
     public boolean onPreferenceChange(Preference preference, Object value) {
         // Turn on/off BT
         setEnabled((Boolean) value);
-        
+
         // Don't update UI to opposite state until we're sure
         return false;
     }
-    
+
     private void setEnabled(final boolean enable) {
         // Disable preference
         mCheckBoxPreference.setEnabled(false);
-        
+
         mLocalManager.setBluetoothEnabled(enable);
     }
-    
+
     private void handleStateChanged(int state) {
 
-        if (state == BluetoothDevice.BLUETOOTH_STATE_OFF ||
-                state == BluetoothDevice.BLUETOOTH_STATE_ON) {
-            mCheckBoxPreference.setChecked(state == BluetoothDevice.BLUETOOTH_STATE_ON);
-            mCheckBoxPreference.setSummary(state == BluetoothDevice.BLUETOOTH_STATE_OFF ?
+        if (state == BluetoothAdapter.STATE_OFF ||
+                state == BluetoothAdapter.STATE_ON) {
+            mCheckBoxPreference.setChecked(state == BluetoothAdapter.STATE_ON);
+            mCheckBoxPreference.setSummary(state == BluetoothAdapter.STATE_OFF ?
                                            mOriginalSummary :
                                            null);
-            
-            mCheckBoxPreference.setEnabled(isEnabledByDependency());
-            
-        } else if (state == BluetoothDevice.BLUETOOTH_STATE_TURNING_ON ||
-                state == BluetoothDevice.BLUETOOTH_STATE_TURNING_OFF) {
-            mCheckBoxPreference.setSummary(state == BluetoothDevice.BLUETOOTH_STATE_TURNING_ON
+
+            /*
+             * Don't ever disable the preference. Only enable here. Disablement
+             * is taken care of by the dependency code. If this is disabled
+             * here, it may not be re-enabled from the framework when dependency
+             * is met. http://b/issue?id=2053751
+             */
+            if (isEnabledByDependency()) {
+                mCheckBoxPreference.setEnabled(true);
+            }
+
+        } else if (state == BluetoothAdapter.STATE_TURNING_ON ||
+                state == BluetoothAdapter.STATE_TURNING_OFF) {
+            mCheckBoxPreference.setSummary(state == BluetoothAdapter.STATE_TURNING_ON
                     ? R.string.wifi_starting
                     : R.string.wifi_stopping);
-            
+
         } else {
             mCheckBoxPreference.setChecked(false);
             mCheckBoxPreference.setSummary(R.string.wifi_error);
@@ -139,17 +144,17 @@ public class BluetoothEnabler implements Preference.OnPreferenceChangeListener {
         if (dep == null) {
             return true;
         }
-        
+
         return !dep.shouldDisableDependents();
     }
-    
+
     private Preference getDependencyPreference() {
         String depKey = mCheckBoxPreference.getDependency();
         if (TextUtils.isEmpty(depKey)) {
             return null;
         }
-        
+
         return mCheckBoxPreference.getPreferenceManager().findPreference(depKey);
     }
-    
+
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothEventRedirector.java b/src/com/android/settings/bluetooth/BluetoothEventRedirector.java
index af64c98f1b5..6c408346a83 100644
--- a/src/com/android/settings/bluetooth/BluetoothEventRedirector.java
+++ b/src/com/android/settings/bluetooth/BluetoothEventRedirector.java
@@ -17,16 +17,17 @@
 package com.android.settings.bluetooth;
 
 import android.bluetooth.BluetoothA2dp;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothError;
 import android.bluetooth.BluetoothHeadset;
-import android.bluetooth.BluetoothIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.util.Log;
 
+import com.android.settings.R;
 import com.android.settings.bluetooth.LocalBluetoothProfileManager.Profile;
 
 /**
@@ -36,78 +37,81 @@ import com.android.settings.bluetooth.LocalBluetoothProfileManager.Profile;
  */
 public class BluetoothEventRedirector {
     private static final String TAG = "BluetoothEventRedirector";
-    private static final boolean V = LocalBluetoothManager.V;
-    
+
     private LocalBluetoothManager mManager;
-    
+
     private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            if (V) {
-                Log.v(TAG, "Received " + intent.getAction());
-            }
-            
+            Log.v(TAG, "Received " + intent.getAction());
+
             String action = intent.getAction();
-            String address = intent.getStringExtra(BluetoothIntent.ADDRESS);
-                
-            if (action.equals(BluetoothIntent.BLUETOOTH_STATE_CHANGED_ACTION)) {
-                int state = intent.getIntExtra(BluetoothIntent.BLUETOOTH_STATE,
-                                        BluetoothError.ERROR);
+            BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+
+            if (action.equals(BluetoothAdapter.ACTION_STATE_CHANGED)) {
+                int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE,
+                                        BluetoothAdapter.ERROR);
                 mManager.setBluetoothStateInt(state);
-            } else if (action.equals(BluetoothIntent.DISCOVERY_STARTED_ACTION)) {
+            } else if (action.equals(BluetoothAdapter.ACTION_DISCOVERY_STARTED)) {
                 mManager.onScanningStateChanged(true);
-                
-            } else if (action.equals(BluetoothIntent.DISCOVERY_COMPLETED_ACTION)) {
+
+            } else if (action.equals(BluetoothAdapter.ACTION_DISCOVERY_FINISHED)) {
                 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);
-                    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(BluetoothDevice.ACTION_FOUND)) {
+                short rssi = intent.getShortExtra(BluetoothDevice.EXTRA_RSSI, Short.MIN_VALUE);
+                BluetoothClass btClass = intent.getParcelableExtra(BluetoothDevice.EXTRA_CLASS);
+                String name = intent.getStringExtra(BluetoothDevice.EXTRA_NAME);
+                // TODO Pick up UUID. They should be available for 2.1 devices.
+                // Skip for now, there's a bluez problem and we are not getting uuids even for 2.1.
+                mManager.getCachedDeviceManager().onDeviceAppeared(device, rssi, btClass, name);
+
+            } else if (action.equals(BluetoothDevice.ACTION_DISAPPEARED)) {
+                mManager.getCachedDeviceManager().onDeviceDisappeared(device);
+
+            } else if (action.equals(BluetoothDevice.ACTION_NAME_CHANGED)) {
+                mManager.getCachedDeviceManager().onDeviceNameUpdated(device);
+
+            } else if (action.equals(BluetoothDevice.ACTION_BOND_STATE_CHANGED)) {
+                int bondState = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE,
+                                                   BluetoothDevice.ERROR);
+                mManager.getCachedDeviceManager().onBondingStateChanged(device, bondState);
+                if (bondState == BluetoothDevice.BOND_NONE) {
+                    int reason = intent.getIntExtra(BluetoothDevice.EXTRA_REASON, BluetoothDevice.ERROR);
+                    mManager.getCachedDeviceManager().showUnbondMessage(device, reason);
                 }
-                
-            } else if (action.equals(BluetoothIntent.HEADSET_STATE_CHANGED_ACTION)) {
-                int newState = intent.getIntExtra(BluetoothIntent.HEADSET_STATE, 0);
-                int oldState = intent.getIntExtra(BluetoothIntent.HEADSET_PREVIOUS_STATE, 0);
+
+            } else if (action.equals(BluetoothHeadset.ACTION_STATE_CHANGED)) {
+                int newState = intent.getIntExtra(BluetoothHeadset.EXTRA_STATE, 0);
+                int oldState = intent.getIntExtra(BluetoothHeadset.EXTRA_PREVIOUS_STATE, 0);
                 if (newState == BluetoothHeadset.STATE_DISCONNECTED &&
                         oldState == BluetoothHeadset.STATE_CONNECTING) {
                     Log.i(TAG, "Failed to connect BT headset");
                 }
 
-                mManager.getLocalDeviceManager().onProfileStateChanged(address,
+                mManager.getCachedDeviceManager().onProfileStateChanged(device,
                         Profile.HEADSET, newState);
 
-            } else if (action.equals(BluetoothA2dp.SINK_STATE_CHANGED_ACTION)) {
-                int newState = intent.getIntExtra(BluetoothA2dp.SINK_STATE, 0);
-                int oldState = intent.getIntExtra(BluetoothA2dp.SINK_PREVIOUS_STATE, 0);
+            } else if (action.equals(BluetoothA2dp.ACTION_SINK_STATE_CHANGED)) {
+                int newState = intent.getIntExtra(BluetoothA2dp.EXTRA_SINK_STATE, 0);
+                int oldState = intent.getIntExtra(BluetoothA2dp.EXTRA_PREVIOUS_SINK_STATE, 0);
                 if (newState == BluetoothA2dp.STATE_DISCONNECTED &&
                         oldState == BluetoothA2dp.STATE_CONNECTING) {
                     Log.i(TAG, "Failed to connect BT A2DP");
                 }
 
-                mManager.getLocalDeviceManager().onProfileStateChanged(address,
+                mManager.getCachedDeviceManager().onProfileStateChanged(device,
                         Profile.A2DP, newState);
 
-            } else if (action.equals(BluetoothIntent.REMOTE_DEVICE_CLASS_UPDATED_ACTION)) {
-                mManager.getLocalDeviceManager().onBtClassChanged(address);
-                
+            } else if (action.equals(BluetoothDevice.ACTION_CLASS_CHANGED)) {
+                mManager.getCachedDeviceManager().onBtClassChanged(device);
+
+            } else if (action.equals(BluetoothDevice.ACTION_UUID)) {
+                mManager.getCachedDeviceManager().onUuidChanged(device);
+
+            } else if (action.equals(BluetoothDevice.ACTION_PAIRING_CANCEL)) {
+                int errorMsg = R.string.bluetooth_pairing_error_message;
+                mManager.showError(device, R.string.bluetooth_error_title, errorMsg);
             }
         }
     };
@@ -118,29 +122,31 @@ public class BluetoothEventRedirector {
 
     public void start() {
         IntentFilter filter = new IntentFilter();
-        
+
         // Bluetooth on/off broadcasts
-        filter.addAction(BluetoothIntent.BLUETOOTH_STATE_CHANGED_ACTION);
-        
+        filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
+
         // Discovery broadcasts
-        filter.addAction(BluetoothIntent.DISCOVERY_STARTED_ACTION);
-        filter.addAction(BluetoothIntent.DISCOVERY_COMPLETED_ACTION);
-        filter.addAction(BluetoothIntent.REMOTE_DEVICE_DISAPPEARED_ACTION);
-        filter.addAction(BluetoothIntent.REMOTE_DEVICE_FOUND_ACTION);
-        filter.addAction(BluetoothIntent.REMOTE_NAME_UPDATED_ACTION);
-        
+        filter.addAction(BluetoothAdapter.ACTION_DISCOVERY_STARTED);
+        filter.addAction(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
+        filter.addAction(BluetoothDevice.ACTION_DISAPPEARED);
+        filter.addAction(BluetoothDevice.ACTION_FOUND);
+        filter.addAction(BluetoothDevice.ACTION_NAME_CHANGED);
+
         // Pairing broadcasts
-        filter.addAction(BluetoothIntent.BOND_STATE_CHANGED_ACTION);
-        
+        filter.addAction(BluetoothDevice.ACTION_BOND_STATE_CHANGED);
+        filter.addAction(BluetoothDevice.ACTION_PAIRING_CANCEL);
+
         // 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);
-        
+        filter.addAction(BluetoothA2dp.ACTION_SINK_STATE_CHANGED);
+        filter.addAction(BluetoothHeadset.ACTION_STATE_CHANGED);
+        filter.addAction(BluetoothDevice.ACTION_CLASS_CHANGED);
+        filter.addAction(BluetoothDevice.ACTION_UUID);
+
         mManager.getContext().registerReceiver(mBroadcastReceiver, filter);
     }
-    
+
     public void stop() {
-        mManager.getContext().unregisterReceiver(mBroadcastReceiver);   
+        mManager.getContext().unregisterReceiver(mBroadcastReceiver);
     }
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothNamePreference.java b/src/com/android/settings/bluetooth/BluetoothNamePreference.java
index 40bab2ccae8..7a9a0c1d881 100644
--- a/src/com/android/settings/bluetooth/BluetoothNamePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothNamePreference.java
@@ -16,72 +16,124 @@
 
 package com.android.settings.bluetooth;
 
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothError;
-import android.bluetooth.BluetoothIntent;
+import android.app.AlertDialog;
+import android.app.Dialog;
+
+import android.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.preference.EditTextPreference;
-import android.preference.PreferenceManager;
+import android.text.Editable;
+import android.text.InputFilter;
+import android.text.TextWatcher;
+import android.text.InputFilter.LengthFilter;
 import android.util.AttributeSet;
+import android.widget.Button;
+import android.widget.EditText;
 
 /**
  * BluetoothNamePreference is the preference type for editing the device's
  * Bluetooth name. It asks the user for a name, and persists it via the
  * Bluetooth API.
  */
-public class BluetoothNamePreference extends EditTextPreference {
+public class BluetoothNamePreference extends EditTextPreference implements TextWatcher {
     private static final String TAG = "BluetoothNamePreference";
+    // TODO(): Investigate bluetoothd/dbus crash when length is set to 248, limit as per spec.
+    private static final int BLUETOOTH_NAME_MAX_LENGTH = 200;
 
     private LocalBluetoothManager mLocalManager;
-    
+
     private BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
-            if (action.equals(BluetoothIntent.NAME_CHANGED_ACTION)) {
+            if (action.equals(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED)) {
                 setSummaryToName();
-            } else if (action.equals(BluetoothIntent.BLUETOOTH_STATE_CHANGED_ACTION) &&
-                    (intent.getIntExtra(BluetoothIntent.BLUETOOTH_STATE,
-                    BluetoothError.ERROR) == BluetoothDevice.BLUETOOTH_STATE_ON)) {
+            } else if (action.equals(BluetoothAdapter.ACTION_STATE_CHANGED) &&
+                    (intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR) ==
+                            BluetoothAdapter.STATE_ON)) {
                 setSummaryToName();
             }
         }
     };
-    
+
     public BluetoothNamePreference(Context context, AttributeSet attrs) {
         super(context, attrs);
-        
+
         mLocalManager = LocalBluetoothManager.getInstance(context);
-        
-        setSummaryToName();        
+
+        setSummaryToName();
     }
 
     public void resume() {
         IntentFilter filter = new IntentFilter();
-        filter.addAction(BluetoothIntent.BLUETOOTH_STATE_CHANGED_ACTION);
-        filter.addAction(BluetoothIntent.NAME_CHANGED_ACTION);
+        filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
+        filter.addAction(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);
         getContext().registerReceiver(mReceiver, filter);
+
+        // Make sure the OK button is disabled (if necessary) after rotation
+        EditText et = getEditText();
+        et.setFilters(new InputFilter[] {new LengthFilter(BLUETOOTH_NAME_MAX_LENGTH)});
+        if (et != null) {
+            et.addTextChangedListener(this);
+            Dialog d = getDialog();
+            if (d instanceof AlertDialog) {
+                Button b = ((AlertDialog) d).getButton(AlertDialog.BUTTON_POSITIVE);
+                b.setEnabled(et.getText().length() > 0);
+            }
+        }
     }
-    
+
     public void pause() {
+        EditText et = getEditText();
+        if (et != null) {
+            et.removeTextChangedListener(this);
+        }
         getContext().unregisterReceiver(mReceiver);
     }
-    
+
     private void setSummaryToName() {
-        BluetoothDevice manager = mLocalManager.getBluetoothManager();
-        if (manager.isEnabled()) {
-            setSummary(manager.getName());
+        BluetoothAdapter adapter = mLocalManager.getBluetoothAdapter();
+        if (adapter.isEnabled()) {
+            setSummary(adapter.getName());
         }
     }
 
     @Override
     protected boolean persistString(String value) {
-        BluetoothDevice manager = mLocalManager.getBluetoothManager();
-        manager.setName(value);
-        return true;        
+        BluetoothAdapter adapter = mLocalManager.getBluetoothAdapter();
+        adapter.setName(value);
+        return true;
+    }
+
+    @Override
+    protected void onClick() {
+        super.onClick();
+
+        // The dialog should be created by now
+        EditText et = getEditText();
+        if (et != null) {
+            et.setText(mLocalManager.getBluetoothAdapter().getName());
+        }
+    }
+
+    // TextWatcher interface
+    public void afterTextChanged(Editable s) {
+        Dialog d = getDialog();
+        if (d instanceof AlertDialog) {
+            ((AlertDialog) d).getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(s.length() > 0);
+        }
+    }
+
+    // TextWatcher interface
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        // not used
+    }
+
+    // TextWatcher interface
+    public void onTextChanged(CharSequence s, int start, int before, int count) {
+        // not used
     }
-    
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
new file mode 100644
index 00000000000..7004ba0fa93
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -0,0 +1,279 @@
+/*
+ * 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.bluetooth;
+
+import android.bluetooth.BluetoothDevice;
+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.InputType;
+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;
+
+import com.android.internal.app.AlertActivity;
+import com.android.internal.app.AlertController;
+import com.android.settings.R;
+
+/**
+ * BluetoothPairingDialog asks the user to enter a PIN / Passkey / simple confirmation
+ * for pairing with a remote Bluetooth device. It is an activity that appears as a dialog.
+ */
+public class BluetoothPairingDialog extends AlertActivity implements DialogInterface.OnClickListener,
+        TextWatcher {
+    private static final String TAG = "BluetoothPairingDialog";
+
+    private final int BLUETOOTH_PIN_MAX_LENGTH = 16;
+    private final int BLUETOOTH_PASSKEY_MAX_LENGTH = 6;
+    private LocalBluetoothManager mLocalManager;
+    private BluetoothDevice mDevice;
+    private int mType;
+    private String mPasskey;
+    private EditText mPairingView;
+    private Button mOkButton;
+
+    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (BluetoothDevice.ACTION_BOND_STATE_CHANGED.equals(intent.getAction())) {
+                int bondState = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE,
+                                                   BluetoothDevice.ERROR);
+                if (bondState == BluetoothDevice.BOND_BONDED ||
+                        bondState == BluetoothDevice.BOND_NONE) {
+                    dismissDialog();
+                }
+            } else if(BluetoothDevice.ACTION_PAIRING_CANCEL.equals(intent.getAction())) {
+                BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+                if (device == null || device.equals(mDevice)) {
+                    dismissDialog();
+                }
+            }
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = getIntent();
+        if (!intent.getAction().equals(BluetoothDevice.ACTION_PAIRING_REQUEST))
+        {
+            Log.e(TAG,
+                  "Error: this activity may be started only with intent " +
+                  BluetoothDevice.ACTION_PAIRING_REQUEST);
+            finish();
+        }
+
+        mLocalManager = LocalBluetoothManager.getInstance(this);
+        mDevice = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+        mType = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, BluetoothDevice.ERROR);
+        if (mType == BluetoothDevice.PAIRING_VARIANT_PIN) {
+            createUserEntryDialog();
+        } else if (mType == BluetoothDevice.PAIRING_VARIANT_PASSKEY) {
+            createUserEntryDialog();
+        } else if (mType == BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION){
+            int passkey =
+                intent.getIntExtra(BluetoothDevice.EXTRA_PASSKEY, BluetoothDevice.ERROR);
+            if (passkey == BluetoothDevice.ERROR) {
+                Log.e(TAG, "Invalid ConfirmationPasskey received, not showing any dialog");
+                return;
+            }
+            mPasskey = String.format("%06d", passkey);
+            createConfirmationDialog();
+        } else if (mType == BluetoothDevice.PAIRING_VARIANT_CONSENT) {
+            createConsentDialog();
+        } else if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY) {
+            int passkey =
+                intent.getIntExtra(BluetoothDevice.EXTRA_PASSKEY, BluetoothDevice.ERROR);
+            if (passkey == BluetoothDevice.ERROR) {
+                Log.e(TAG, "Invalid ConfirmationPasskey received, not showing any dialog");
+                return;
+            }
+            mPasskey = String.format("%06d", passkey);
+            createDisplayPasskeyDialog();
+        } else {
+            Log.e(TAG, "Incorrect pairing type received, not showing any dialog");
+        }
+
+        /*
+         * 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(BluetoothDevice.ACTION_PAIRING_CANCEL));
+        registerReceiver(mReceiver, new IntentFilter(BluetoothDevice.ACTION_BOND_STATE_CHANGED));
+    }
+
+    private void createUserEntryDialog() {
+        final AlertController.AlertParams p = mAlertParams;
+        p.mIconId = android.R.drawable.ic_dialog_info;
+        p.mTitle = getString(R.string.bluetooth_pairing_request);
+        p.mView = createView();
+        p.mPositiveButtonText = getString(android.R.string.ok);
+        p.mPositiveButtonListener = this;
+        p.mNegativeButtonText = getString(android.R.string.cancel);
+        p.mNegativeButtonListener = this;
+        setupAlert();
+
+        mOkButton = mAlert.getButton(DialogInterface.BUTTON_POSITIVE);
+        mOkButton.setEnabled(false);
+    }
+
+    private View createView() {
+        View view = getLayoutInflater().inflate(R.layout.bluetooth_pin_entry, null);
+
+        String name = mLocalManager.getCachedDeviceManager().getName(mDevice);
+        TextView messageView = (TextView) view.findViewById(R.id.message);
+        mPairingView = (EditText) view.findViewById(R.id.text);
+        mPairingView.addTextChangedListener(this);
+
+        if (mType == BluetoothDevice.PAIRING_VARIANT_PIN) {
+            messageView.setText(getString(R.string.bluetooth_enter_pin_msg, name));
+            // Maximum of 16 characters in a PIN adb sync
+            mPairingView.setFilters(new InputFilter[] {
+                    new LengthFilter(BLUETOOTH_PIN_MAX_LENGTH) });
+        } else if (mType == BluetoothDevice.PAIRING_VARIANT_PASSKEY){
+            messageView.setText(getString(R.string.bluetooth_enter_passkey_msg, name));
+            // Maximum of 6 digits for passkey
+            mPairingView.setInputType(InputType.TYPE_CLASS_NUMBER |
+                    InputType.TYPE_NUMBER_FLAG_SIGNED);
+            mPairingView.setFilters(new InputFilter[] {
+                    new LengthFilter(BLUETOOTH_PASSKEY_MAX_LENGTH)});
+        } else if (mType == BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION) {
+            mPairingView.setVisibility(View.GONE);
+            messageView.setText(getString(R.string.bluetooth_confirm_passkey_msg, name,
+                    mPasskey));
+        } else if (mType == BluetoothDevice.PAIRING_VARIANT_CONSENT) {
+            mPairingView.setVisibility(View.GONE);
+            messageView.setText(getString(R.string.bluetooth_incoming_pairing_msg, name));
+        } else if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY) {
+            mPairingView.setVisibility(View.GONE);
+            messageView.setText(getString(R.string.bluetooth_display_passkey_msg, name, mPasskey));
+        } else {
+            Log.e(TAG, "Incorrect pairing type received, not creating view");
+        }
+        return view;
+    }
+
+    private void createConfirmationDialog() {
+        final AlertController.AlertParams p = mAlertParams;
+        p.mIconId = android.R.drawable.ic_dialog_info;
+        p.mTitle = getString(R.string.bluetooth_pairing_request);
+        p.mView = createView();
+        p.mPositiveButtonText = getString(R.string.bluetooth_pairing_accept);
+        p.mPositiveButtonListener = this;
+        p.mNegativeButtonText = getString(R.string.bluetooth_pairing_decline);
+        p.mNegativeButtonListener = this;
+        setupAlert();
+    }
+
+    private void createConsentDialog() {
+        final AlertController.AlertParams p = mAlertParams;
+        p.mIconId = android.R.drawable.ic_dialog_info;
+        p.mTitle = getString(R.string.bluetooth_pairing_request);
+        p.mView = createView();
+        p.mPositiveButtonText = getString(R.string.bluetooth_pairing_accept);
+        p.mPositiveButtonListener = this;
+        p.mNegativeButtonText = getString(R.string.bluetooth_pairing_decline);
+        p.mNegativeButtonListener = this;
+        setupAlert();
+    }
+
+    private void createDisplayPasskeyDialog() {
+        final AlertController.AlertParams p = mAlertParams;
+        p.mIconId = android.R.drawable.ic_dialog_info;
+        p.mTitle = getString(R.string.bluetooth_pairing_request);
+        p.mView = createView();
+        p.mPositiveButtonText = getString(android.R.string.ok);
+        p.mPositiveButtonListener = this;
+        setupAlert();
+
+        // Since its only a notification, send an OK to the framework,
+        // indicating that the dialog has been displayed.
+        mDevice.setPairingConfirmation(true);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        unregisterReceiver(mReceiver);
+    }
+
+    public void afterTextChanged(Editable s) {
+        if (s.length() > 0) {
+            mOkButton.setEnabled(true);
+        }
+    }
+
+    private void dismissDialog() {
+        this.dismiss();
+    }
+
+    private void onPair(String value) {
+        if (mType == BluetoothDevice.PAIRING_VARIANT_PIN) {
+            byte[] pinBytes = BluetoothDevice.convertPinToBytes(value);
+            if (pinBytes == null) {
+                return;
+            }
+            mDevice.setPin(pinBytes);
+        } else if (mType == BluetoothDevice.PAIRING_VARIANT_PASSKEY) {
+            int passkey = Integer.parseInt(value);
+            mDevice.setPasskey(passkey);
+        } else if (mType == BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION) {
+            mDevice.setPairingConfirmation(true);
+        } else if (mType ==  BluetoothDevice.PAIRING_VARIANT_CONSENT) {
+            mDevice.setPairingConfirmation(true);
+        } else if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY) {
+            // Do Nothing.
+        } else {
+            Log.e(TAG, "Incorrect pairing type received");
+        }
+    }
+
+    private void onCancel() {
+        mDevice.cancelPairingUserInput();
+    }
+
+    public void onClick(DialogInterface dialog, int which) {
+        switch (which) {
+            case DialogInterface.BUTTON_POSITIVE:
+                onPair(mPairingView.getText().toString());
+                break;
+
+            case DialogInterface.BUTTON_NEGATIVE:
+                onCancel();
+                break;
+        }
+    }
+
+    /* 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/BluetoothPinRequest.java b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
similarity index 57%
rename from src/com/android/settings/bluetooth/BluetoothPinRequest.java
rename to src/com/android/settings/bluetooth/BluetoothPairingRequest.java
index 619052d87fb..4253c5d24ed 100644
--- a/src/com/android/settings/bluetooth/BluetoothPinRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
@@ -22,7 +22,6 @@ import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -30,35 +29,45 @@ import android.content.res.Resources;
 import android.text.TextUtils;
 
 /**
- * BluetoothPinRequest is a receiver for any Bluetooth pairing PIN request. It
- * checks if the Bluetooth Settings is currently visible and brings up the PIN
- * entry dialog. Otherwise it puts a Notification in the status bar, which can
- * be clicked to bring up the PIN entry dialog.
+ * BluetoothPairingRequest is a receiver for any Bluetooth pairing request. It
+ * checks if the Bluetooth Settings is currently visible and brings up the PIN, the passkey or a
+ * confirmation entry dialog. Otherwise it puts a Notification in the status bar, which can
+ * be clicked to bring up the Pairing entry dialog.
  */
-public class BluetoothPinRequest extends BroadcastReceiver {
+public class BluetoothPairingRequest extends BroadcastReceiver {
 
     public static final int NOTIFICATION_ID = android.R.drawable.stat_sys_data_bluetooth;
-    
+
     @Override
     public void onReceive(Context context, Intent intent) {
         String action = intent.getAction();
-        if (action.equals(BluetoothIntent.PAIRING_REQUEST_ACTION)) {
+        if (action.equals(BluetoothDevice.ACTION_PAIRING_REQUEST)) {
 
-            LocalBluetoothManager localManager = LocalBluetoothManager.getInstance(context);        
-        
-            String address = intent.getStringExtra(BluetoothIntent.ADDRESS);
-            Intent pinIntent = new Intent();
-            pinIntent.setClass(context, BluetoothPinDialog.class);
-            pinIntent.putExtra(BluetoothIntent.ADDRESS, address); 
-            pinIntent.setAction(BluetoothIntent.PAIRING_REQUEST_ACTION);
-            pinIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            
-            if (localManager.getForegroundActivity() != null) {
+            LocalBluetoothManager localManager = LocalBluetoothManager.getInstance(context);
+
+            BluetoothDevice device =
+                    intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+            int type = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,
+                    BluetoothDevice.ERROR);
+            Intent pairingIntent = new Intent();
+            pairingIntent.setClass(context, BluetoothPairingDialog.class);
+            pairingIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
+            pairingIntent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, type);
+            if (type == BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION ||
+                    type == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY) {
+                int passkey = intent.getIntExtra(BluetoothDevice.EXTRA_PASSKEY, BluetoothDevice.ERROR);
+                pairingIntent.putExtra(BluetoothDevice.EXTRA_PASSKEY, passkey);
+            }
+            pairingIntent.setAction(BluetoothDevice.ACTION_PAIRING_REQUEST);
+            pairingIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+            String deviceAddress = device != null ? device.getAddress() : null;
+            if (localManager.shouldShowDialogInForeground(deviceAddress)) {
                 // Since the BT-related activity is in the foreground, just open the dialog
-                context.startActivity(pinIntent);
-                
+                context.startActivity(pairingIntent);
+
             } else {
-                
+
                 // Put up a notification that leads to the dialog
                 Resources res = context.getResources();
                 Notification notification = new Notification(
@@ -66,27 +75,27 @@ public class BluetoothPinRequest extends BroadcastReceiver {
                         res.getString(R.string.bluetooth_notif_ticker),
                         System.currentTimeMillis());
 
-                PendingIntent pending = PendingIntent.getActivity(context, 0, 
-                        pinIntent, PendingIntent.FLAG_ONE_SHOT);
-                
-                String name = intent.getStringExtra(BluetoothIntent.NAME);
+                PendingIntent pending = PendingIntent.getActivity(context, 0,
+                        pairingIntent, PendingIntent.FLAG_ONE_SHOT);
+
+                String name = intent.getStringExtra(BluetoothDevice.EXTRA_NAME);
                 if (TextUtils.isEmpty(name)) {
-                    name = localManager.getLocalDeviceManager().getName(address);
+                    name = device.getName();
                 }
-                
-                notification.setLatestEventInfo(context, 
-                        res.getString(R.string.bluetooth_notif_title), 
-                        res.getString(R.string.bluetooth_notif_message) + name, 
+
+                notification.setLatestEventInfo(context,
+                        res.getString(R.string.bluetooth_notif_title),
+                        res.getString(R.string.bluetooth_notif_message) + name,
                         pending);
                 notification.flags |= Notification.FLAG_AUTO_CANCEL;
-                
-                NotificationManager manager = (NotificationManager) 
+
+                NotificationManager manager = (NotificationManager)
                         context.getSystemService(Context.NOTIFICATION_SERVICE);
                 manager.notify(NOTIFICATION_ID, notification);
             }
-            
-        } else if (action.equals(BluetoothIntent.PAIRING_CANCEL_ACTION)) {
-            
+
+        } else if (action.equals(BluetoothDevice.ACTION_PAIRING_CANCEL)) {
+
             // Remove the notification
             NotificationManager manager = (NotificationManager) context
                     .getSystemService(Context.NOTIFICATION_SERVICE);
diff --git a/src/com/android/settings/bluetooth/BluetoothPinDialog.java b/src/com/android/settings/bluetooth/BluetoothPinDialog.java
deleted file mode 100644
index 087fbb291c6..00000000000
--- a/src/com/android/settings/bluetooth/BluetoothPinDialog.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.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.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;
-
-import com.android.internal.app.AlertActivity;
-import com.android.internal.app.AlertController;
-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,
-        TextWatcher {
-    private static final String TAG = "BluetoothPinDialog";
-
-    private final int BLUETOOTH_PIN_MAX_LENGTH = 16;
-    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) {
-        super.onCreate(savedInstanceState);
-
-        Intent intent = getIntent();
-        if (!intent.getAction().equals(BluetoothIntent.PAIRING_REQUEST_ACTION))
-        {
-            Log.e(TAG,
-                  "Error: this activity may be started only with intent " +
-                  BluetoothIntent.PAIRING_REQUEST_ACTION);
-            finish();
-        }
-        
-        mLocalManager = LocalBluetoothManager.getInstance(this);
-        mAddress = intent.getStringExtra(BluetoothIntent.ADDRESS);
-        
-        // Set up the "dialog"
-        final AlertController.AlertParams p = mAlertParams;
-        p.mIconId = android.R.drawable.ic_dialog_info;
-        p.mTitle = getString(R.string.bluetooth_pin_entry);
-        p.mView = createView();
-        p.mPositiveButtonText = getString(android.R.string.ok);
-        p.mPositiveButtonListener = this;
-        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() {
-        View view = getLayoutInflater().inflate(R.layout.bluetooth_pin_entry, null);
-        
-        String name = mLocalManager.getLocalDeviceManager().getName(mAddress);
-        TextView messageView = (TextView) view.findViewById(R.id.message);
-        messageView.setText(getString(R.string.bluetooth_enter_pin_msg, name));
-        
-        mPinView = (EditText) view.findViewById(R.id.text);
-        mPinView.addTextChangedListener(this);
-        // Maximum of 16 characters in a PIN
-        mPinView.setFilters(new InputFilter[] { new LengthFilter(BLUETOOTH_PIN_MAX_LENGTH) });
-        
-        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.setVisibility(View.GONE);
-        mPinView.clearFocus();
-        mPinView.removeTextChangedListener(this);
-
-        mOkButton.setEnabled(true);
-        mAlert.getButton(DialogInterface.BUTTON_NEGATIVE).setVisibility(View.GONE);
-    }
-    
-    private void onPair(String pin) {
-        byte[] pinBytes = BluetoothDevice.convertPinToBytes(pin);
-        
-        if (pinBytes == null) {
-            return;
-        }
-        
-        mLocalManager.getBluetoothManager().setPin(mAddress, pinBytes);
-    }
-
-    private void onCancel() {
-        mLocalManager.getBluetoothManager().cancelBondProcess(mAddress);
-    }
-    
-    public void onClick(DialogInterface dialog, int which) {
-        switch (which) {
-            case DialogInterface.BUTTON_POSITIVE:
-                onPair(mPinView.getText().toString());
-                break;
-                
-            case DialogInterface.BUTTON_NEGATIVE:
-                onCancel();
-                break;
-        }
-    }
-
-    /* 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/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index e6ac5fdb3c8..8a0795be8ab 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -19,16 +19,17 @@ package com.android.settings.bluetooth;
 import com.android.settings.ProgressCategory;
 import com.android.settings.R;
 
-import java.util.List;
-import java.util.WeakHashMap;
-
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothIntent;
+import android.bluetooth.BluetoothDevicePicker;
+import android.bluetooth.BluetoothUuid;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+import android.os.ParcelUuid;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
@@ -40,6 +41,9 @@ import android.view.View;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 
+import java.util.List;
+import java.util.WeakHashMap;
+
 /**
  * BluetoothSettings is the Settings screen for Bluetooth configuration and
  * connection management.
@@ -50,30 +54,56 @@ public class BluetoothSettings extends PreferenceActivity
     private static final String TAG = "BluetoothSettings";
 
     private static final int MENU_SCAN = Menu.FIRST;
-    
+
     private static final String KEY_BT_CHECKBOX = "bt_checkbox";
     private static final String KEY_BT_DISCOVERABLE = "bt_discoverable";
     private static final String KEY_BT_DEVICE_LIST = "bt_device_list";
     private static final String KEY_BT_NAME = "bt_name";
     private static final String KEY_BT_SCAN = "bt_scan";
-    
+
+    private static final int SCREEN_TYPE_SETTINGS = 0;
+    private static final int SCREEN_TYPE_DEVICEPICKER = 1;
+
+    private int mScreenType;
+    private int mFilterType;
+    private boolean mNeedAuth;
+    private String mLaunchPackage;
+    private String mLaunchClass;
+
+    private BluetoothDevice mSelectedDevice= null;
+
     private LocalBluetoothManager mLocalManager;
-    
+
     private BluetoothEnabler mEnabler;
     private BluetoothDiscoverableEnabler mDiscoverableEnabler;
-    
+
     private BluetoothNamePreference mNamePreference;
-    
+
     private ProgressCategory mDeviceList;
-    
-    private WeakHashMap<LocalBluetoothDevice, BluetoothDevicePreference> mDevicePreferenceMap =
-            new WeakHashMap<LocalBluetoothDevice, BluetoothDevicePreference>();
-    
+
+    private WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference> mDevicePreferenceMap =
+            new WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference>();
+
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
             // TODO: put this in callback instead of receiving
-            onBluetoothStateChanged(mLocalManager.getBluetoothState());
+
+            if (intent.getAction().equals(BluetoothAdapter.ACTION_STATE_CHANGED)) {
+                onBluetoothStateChanged(mLocalManager.getBluetoothState());
+            } else if (intent.getAction().equals(BluetoothDevice.ACTION_BOND_STATE_CHANGED)
+                    && mScreenType == SCREEN_TYPE_DEVICEPICKER) {
+                int bondState = intent
+                        .getIntExtra(BluetoothDevice.EXTRA_BOND_STATE, BluetoothDevice.ERROR);
+                if (bondState == BluetoothDevice.BOND_BONDED) {
+                    BluetoothDevice device = intent
+                            .getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+                    if (device.equals(mSelectedDevice)) {
+                        sendDevicePickedIntent(device);
+                        finish();
+                    }
+                }
+            }
         }
     };
 
@@ -82,69 +112,104 @@ public class BluetoothSettings extends PreferenceActivity
         super.onCreate(savedInstanceState);
 
         mLocalManager = LocalBluetoothManager.getInstance(this);
-        if (mLocalManager == null) finish();        
-        
-        addPreferencesFromResource(R.xml.bluetooth_settings);
-        
-        mEnabler = new BluetoothEnabler(
-                this,
-                (CheckBoxPreference) findPreference(KEY_BT_CHECKBOX));
-        
-        mDiscoverableEnabler = new BluetoothDiscoverableEnabler(
-                this,
-                (CheckBoxPreference) findPreference(KEY_BT_DISCOVERABLE));
-    
-        mNamePreference = (BluetoothNamePreference) findPreference(KEY_BT_NAME);
-        
+        if (mLocalManager == null) finish();
+
+        // Note:
+        // If an application wish to show the BT device list, it can send an
+        // intent to Settings application with below extra data:
+        // -DEVICE_PICKER_FILTER_TYPE: the type of BT devices that want to show.
+        // -DEVICE_PICKER_LAUNCH_PACKAGE: the package which the application belongs to.
+        // -DEVICE_PICKER_LAUNCH_CLASS: the class which will receive user's selected
+        // result from the BT list.
+        // -DEVICE_PICKER_NEED_AUTH: to show if bonding procedure needed.
+
+        mFilterType = BluetoothDevicePicker.FILTER_TYPE_ALL;
+        Intent intent = getIntent();
+        String action = intent.getAction();
+
+        if (action.equals(BluetoothDevicePicker.ACTION_LAUNCH)) {
+            mScreenType = SCREEN_TYPE_DEVICEPICKER;
+            mNeedAuth = intent.getBooleanExtra(BluetoothDevicePicker.EXTRA_NEED_AUTH, false);
+            mFilterType = intent.getIntExtra(BluetoothDevicePicker.EXTRA_FILTER_TYPE,
+                    BluetoothDevicePicker.FILTER_TYPE_ALL);
+            mLaunchPackage = intent.getStringExtra(BluetoothDevicePicker.EXTRA_LAUNCH_PACKAGE);
+            mLaunchClass = intent.getStringExtra(BluetoothDevicePicker.EXTRA_LAUNCH_CLASS);
+
+            setTitle(getString(R.string.device_picker));
+            addPreferencesFromResource(R.xml.device_picker);
+        } else {
+            addPreferencesFromResource(R.xml.bluetooth_settings);
+
+            mEnabler = new BluetoothEnabler(
+                    this,
+                    (CheckBoxPreference) findPreference(KEY_BT_CHECKBOX));
+
+            mDiscoverableEnabler = new BluetoothDiscoverableEnabler(
+                    this,
+                    (CheckBoxPreference) findPreference(KEY_BT_DISCOVERABLE));
+
+            mNamePreference = (BluetoothNamePreference) findPreference(KEY_BT_NAME);
+
+            mDeviceList = (ProgressCategory) findPreference(KEY_BT_DEVICE_LIST);
+        }
+
         mDeviceList = (ProgressCategory) findPreference(KEY_BT_DEVICE_LIST);
-        
+
         registerForContextMenu(getListView());
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        
+
         // Repopulate (which isn't too bad since it's cached in the settings
         // bluetooth manager
         mDevicePreferenceMap.clear();
         mDeviceList.removeAll();
         addDevices();
 
-        mEnabler.resume();
-        mDiscoverableEnabler.resume();
-        mNamePreference.resume();
+        if (mScreenType == SCREEN_TYPE_SETTINGS) {
+            mEnabler.resume();
+            mDiscoverableEnabler.resume();
+            mNamePreference.resume();
+        }
+
         mLocalManager.registerCallback(this);
-        
+
+        mDeviceList.setProgress(mLocalManager.getBluetoothAdapter().isDiscovering());
         mLocalManager.startScanning(false);
 
-        registerReceiver(mReceiver,
-                new IntentFilter(BluetoothIntent.BLUETOOTH_STATE_CHANGED_ACTION));
-        
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
+        intentFilter.addAction(BluetoothDevice.ACTION_BOND_STATE_CHANGED);
+        registerReceiver(mReceiver, intentFilter);
         mLocalManager.setForegroundActivity(this);
     }
-    
+
     @Override
     protected void onPause() {
         super.onPause();
 
         mLocalManager.setForegroundActivity(null);
-        
+
         unregisterReceiver(mReceiver);
-        
+
         mLocalManager.unregisterCallback(this);
-        mNamePreference.pause();
-        mDiscoverableEnabler.pause();
-        mEnabler.pause();
+        if (mScreenType == SCREEN_TYPE_SETTINGS) {
+            mNamePreference.pause();
+            mDiscoverableEnabler.pause();
+            mEnabler.pause();
+        }
     }
 
     private void addDevices() {
-        List<LocalBluetoothDevice> devices = mLocalManager.getLocalDeviceManager().getDevicesCopy();
-        for (LocalBluetoothDevice device : devices) {
-            onDeviceAdded(device);
+        List<CachedBluetoothDevice> cachedDevices =
+                mLocalManager.getCachedDeviceManager().getCachedDevicesCopy();
+        for (CachedBluetoothDevice cachedDevice : cachedDevices) {
+            onDeviceAdded(cachedDevice);
         }
     }
-    
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         menu.add(0, MENU_SCAN, 0, R.string.bluetooth_scan_for_devices)
@@ -155,18 +220,18 @@ public class BluetoothSettings extends PreferenceActivity
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        menu.findItem(MENU_SCAN).setEnabled(mLocalManager.getBluetoothManager().isEnabled());
+        menu.findItem(MENU_SCAN).setEnabled(mLocalManager.getBluetoothAdapter().isEnabled());
         return true;
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-        
+
             case MENU_SCAN:
                 mLocalManager.startScanning(true);
                 return true;
-                
+
             default:
                 return false;
         }
@@ -180,39 +245,57 @@ public class BluetoothSettings extends PreferenceActivity
             mLocalManager.startScanning(true);
             return true;
         }
-        
+
         if (preference instanceof BluetoothDevicePreference) {
-            BluetoothDevicePreference btPreference = (BluetoothDevicePreference) preference;
-            btPreference.getDevice().onClicked();
+            BluetoothDevicePreference btPreference = (BluetoothDevicePreference)preference;
+            if (mScreenType == SCREEN_TYPE_SETTINGS) {
+                btPreference.getCachedDevice().onClicked();
+            } else if (mScreenType == SCREEN_TYPE_DEVICEPICKER) {
+                CachedBluetoothDevice device = btPreference.getCachedDevice();
+
+                mSelectedDevice = device.getDevice();
+                mLocalManager.persistSelectedDeviceInPicker(mSelectedDevice.getAddress());
+                if ((device.getBondState() == BluetoothDevice.BOND_BONDED) ||
+                        (mNeedAuth == false)) {
+                    sendDevicePickedIntent(mSelectedDevice);
+                    finish();
+                } else {
+                    btPreference.getCachedDevice().onClicked();
+                }
+            }
             return true;
         }
-        
+
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
-    
+
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v,
             ContextMenuInfo menuInfo) {
-        LocalBluetoothDevice device = getDeviceFromMenuInfo(menuInfo);
-        if (device == null) return;
-        
-        device.onCreateContextMenu(menu);
+        //For device picker, disable Context Menu
+        if (mScreenType != SCREEN_TYPE_SETTINGS) {
+            return;
+        }
+        CachedBluetoothDevice cachedDevice = getDeviceFromMenuInfo(menuInfo);
+        if (cachedDevice == null) return;
+
+        cachedDevice.onCreateContextMenu(menu);
     }
 
     @Override
     public boolean onContextItemSelected(MenuItem item) {
-        LocalBluetoothDevice device = getDeviceFromMenuInfo(item.getMenuInfo());
-        if (device == null) return false;
-        
-        device.onContextItemSelected(item);
+        CachedBluetoothDevice cachedDevice = getDeviceFromMenuInfo(item.getMenuInfo());
+        if (cachedDevice == null) return false;
+
+        cachedDevice.onContextItemSelected(item);
         return true;
     }
 
-    private LocalBluetoothDevice getDeviceFromMenuInfo(ContextMenuInfo menuInfo) {
+    private CachedBluetoothDevice getDeviceFromMenuInfo(ContextMenuInfo menuInfo) {
         if ((menuInfo == null) || !(menuInfo instanceof AdapterContextMenuInfo)) {
             return null;
         }
-        
+
         AdapterContextMenuInfo adapterMenuInfo = (AdapterContextMenuInfo) menuInfo;
         Preference pref = (Preference) getPreferenceScreen().getRootAdapter().getItem(
                 adapterMenuInfo.position);
@@ -220,26 +303,58 @@ public class BluetoothSettings extends PreferenceActivity
             return null;
         }
 
-        return ((BluetoothDevicePreference) pref).getDevice();
+        return ((BluetoothDevicePreference) pref).getCachedDevice();
     }
-    
-    public void onDeviceAdded(LocalBluetoothDevice device) {
 
-        if (mDevicePreferenceMap.get(device) != null) {
-            throw new IllegalStateException("Got onDeviceAdded, but device already exists");
+    public void onDeviceAdded(CachedBluetoothDevice cachedDevice) {
+
+        if (mDevicePreferenceMap.get(cachedDevice) != null) {
+            throw new IllegalStateException("Got onDeviceAdded, but cachedDevice already exists");
         }
-        
-        createDevicePreference(device);            
+
+        if (addDevicePreference(cachedDevice)) {
+            createDevicePreference(cachedDevice);
+        }
+     }
+
+    private boolean addDevicePreference(CachedBluetoothDevice cachedDevice) {
+        ParcelUuid[] uuids = cachedDevice.getDevice().getUuids();
+        BluetoothClass bluetoothClass = cachedDevice.getDevice().getBluetoothClass();
+
+        switch(mFilterType) {
+        case BluetoothDevicePicker.FILTER_TYPE_TRANSFER:
+            if (uuids != null)
+                if (BluetoothUuid.containsAnyUuid(uuids,
+                        LocalBluetoothProfileManager.OPP_PROFILE_UUIDS))  return true;
+            if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_OPP)) return true;
+            break;
+        case BluetoothDevicePicker.FILTER_TYPE_AUDIO:
+            if (uuids != null) {
+                if (BluetoothUuid.containsAnyUuid(uuids,
+                        LocalBluetoothProfileManager.A2DP_PROFILE_UUIDS))  return true;
+
+                if (BluetoothUuid.containsAnyUuid(uuids,
+                        LocalBluetoothProfileManager.HEADSET_PROFILE_UUIDS))  return true;
+            } else {
+                if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) return true;
+
+                if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) return true;
+            }
+            break;
+        default:
+            return true;
+        }
+        return false;
     }
 
-    private void createDevicePreference(LocalBluetoothDevice device) {
-        BluetoothDevicePreference preference = new BluetoothDevicePreference(this, device);
+    private void createDevicePreference(CachedBluetoothDevice cachedDevice) {
+        BluetoothDevicePreference preference = new BluetoothDevicePreference(this, cachedDevice);
         mDeviceList.addPreference(preference);
-        mDevicePreferenceMap.put(device, preference);
+        mDevicePreferenceMap.put(cachedDevice, preference);
     }
-    
-    public void onDeviceDeleted(LocalBluetoothDevice device) {
-        BluetoothDevicePreference preference = mDevicePreferenceMap.remove(device);
+
+    public void onDeviceDeleted(CachedBluetoothDevice cachedDevice) {
+        BluetoothDevicePreference preference = mDevicePreferenceMap.remove(cachedDevice);
         if (preference != null) {
             mDeviceList.removePreference(preference);
         }
@@ -248,14 +363,23 @@ public class BluetoothSettings extends PreferenceActivity
     public void onScanningStateChanged(boolean started) {
         mDeviceList.setProgress(started);
     }
-    
+
     private void onBluetoothStateChanged(int bluetoothState) {
         // When bluetooth is enabled (and we are in the activity, which we are),
         // we should start a scan
-        if (bluetoothState == BluetoothDevice.BLUETOOTH_STATE_ON) {
+        if (bluetoothState == BluetoothAdapter.STATE_ON) {
             mLocalManager.startScanning(false);
-        } else if (bluetoothState == BluetoothDevice.BLUETOOTH_STATE_OFF) {
+        } else if (bluetoothState == BluetoothAdapter.STATE_OFF) {
             mDeviceList.setProgress(false);
         }
     }
+
+    private void sendDevicePickedIntent(BluetoothDevice device) {
+        Intent intent = new Intent(BluetoothDevicePicker.ACTION_DEVICE_SELECTED);
+        if (mLaunchPackage != null && mLaunchClass != null) {
+            intent.setClassName(mLaunchPackage, mLaunchClass);
+        }
+        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
+        sendBroadcast(intent);
+    }
 }
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothDevice.java b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
similarity index 66%
rename from src/com/android/settings/bluetooth/LocalBluetoothDevice.java
rename to src/com/android/settings/bluetooth/CachedBluetoothDevice.java
index 5259d7b391f..03328b5fb31 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothDevice.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
@@ -17,12 +17,15 @@
 package com.android.settings.bluetooth;
 
 import android.app.AlertDialog;
+import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Resources;
+import android.os.ParcelUuid;
+import android.os.SystemClock;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.ContextMenu;
@@ -40,25 +43,26 @@ import java.util.LinkedList;
 import java.util.List;
 
 /**
- * LocalBluetoothDevice represents a remote Bluetooth device. It contains
+ * CachedBluetoothDevice represents a remote Bluetooth device. It contains
  * attributes of the device (such as the address, name, RSSI, etc.) and
  * functionality that can be performed on the device (connect, pair, disconnect,
  * etc.).
  */
-public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
-    private static final String TAG = "LocalBluetoothDevice";
+public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
+    private static final String TAG = "CachedBluetoothDevice";
     private static final boolean D = LocalBluetoothManager.D;
     private static final boolean V = LocalBluetoothManager.V;
+    private static final boolean DEBUG = false;
 
     private static final int CONTEXT_ITEM_CONNECT = Menu.FIRST + 1;
     private static final int CONTEXT_ITEM_DISCONNECT = Menu.FIRST + 2;
     private static final int CONTEXT_ITEM_UNPAIR = Menu.FIRST + 3;
     private static final int CONTEXT_ITEM_CONNECT_ADVANCED = Menu.FIRST + 4;
 
-    private final String mAddress;
+    private final BluetoothDevice mDevice;
     private String mName;
     private short mRssi;
-    private int mBtClass = BluetoothClass.ERROR;
+    private BluetoothClass mBtClass;
 
     private List<Profile> mProfiles = new ArrayList<Profile>();
 
@@ -74,6 +78,17 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
      */
     private boolean mIsConnectingErrorPossible;
 
+    /**
+     * Last time a bt profile auto-connect was attempted.
+     * If an ACTION_UUID intent comes in within
+     * MAX_UUID_DELAY_FOR_AUTO_CONNECT milliseconds, we will try auto-connect
+     * again with the new UUIDs
+     */
+    private long mConnectAttempted;
+
+    // See mConnectAttempted
+    private static final long MAX_UUID_DELAY_FOR_AUTO_CONNECT = 5000;
+
     // Max time to hold the work queue if we don't get or missed a response
     // from the bt framework.
     private static final long MAX_WAIT_TIME_FOR_FRAMEWORK = 25 * 1000;
@@ -82,26 +97,26 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
         CONNECT, DISCONNECT,
     }
 
-    class BluetoothJob {
+    static class BluetoothJob {
         final BluetoothCommand command; // CONNECT, DISCONNECT
-        final LocalBluetoothDevice device;
+        final CachedBluetoothDevice cachedDevice;
         final Profile profile; // HEADSET, A2DP, etc
         // 0 means this command was not been sent to the bt framework.
         long timeSent;
 
         public BluetoothJob(BluetoothCommand command,
-                LocalBluetoothDevice device, Profile profile) {
+                CachedBluetoothDevice cachedDevice, Profile profile) {
             this.command = command;
-            this.device = device;
+            this.cachedDevice = cachedDevice;
             this.profile = profile;
             this.timeSent = 0;
         }
-        
+
         @Override
         public String toString() {
             StringBuilder sb = new StringBuilder();
             sb.append(command.name());
-            sb.append(" Address:").append(device.mAddress);
+            sb.append(" Address:").append(cachedDevice.mDevice);
             sb.append(" Profile:").append(profile.name());
             sb.append(" TimeSent:");
             if (timeSent == 0) {
@@ -147,7 +162,7 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
             }
         }
     }
-    
+
     private boolean pruneQueue(BluetoothJob job) {
         boolean removedStaleItems = false;
         long now = System.currentTimeMillis();
@@ -159,7 +174,7 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
             if (job != null && job.command == BluetoothCommand.DISCONNECT) {
                 if (existingJob.timeSent == 0
                         && existingJob.command == BluetoothCommand.CONNECT
-                        && existingJob.device.mAddress.equals(job.device.mAddress)
+                        && existingJob.cachedDevice.mDevice.equals(job.cachedDevice.mDevice)
                         && existingJob.profile == job.profile) {
                     if (D) {
                         Log.d(TAG, "Removed because of a pending disconnect. " + existingJob);
@@ -186,13 +201,13 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
     private boolean processCommand(BluetoothJob job) {
         boolean successful = false;
         if (job.timeSent == 0) {
-            job.timeSent = System.currentTimeMillis();                
+            job.timeSent = System.currentTimeMillis();
             switch (job.command) {
             case CONNECT:
-                successful = connectInt(job.device, job.profile);
+                successful = connectInt(job.cachedDevice, job.profile);
                 break;
             case DISCONNECT:
-                successful = disconnectInt(job.device, job.profile);
+                successful = disconnectInt(job.cachedDevice, job.profile);
                 break;
             }
 
@@ -230,12 +245,12 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
             BluetoothJob job = workQueue.peek();
             if (job == null) {
                 return;
-            } else if (job.device.mAddress != mAddress) {
+            } else if (!job.cachedDevice.mDevice.equals(mDevice)) {
                 // This can happen in 2 cases: 1) BT device initiated pairing and
                 // 2) disconnects of one headset that's triggered by connects of
                 // another.
                 if (D) {
-                    Log.d(TAG, "mAddresses:" + mAddress + " != head:" + job.toString());
+                    Log.d(TAG, "mDevice:" + mDevice + " != head:" + job.toString());
                 }
 
                 // Check to see if we need to remove the stale items from the queue
@@ -281,14 +296,14 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
         }
     }
 
-    LocalBluetoothDevice(Context context, String address) {
+    CachedBluetoothDevice(Context context, BluetoothDevice device) {
         mLocalManager = LocalBluetoothManager.getInstance(context);
         if (mLocalManager == null) {
             throw new IllegalStateException(
-                    "Cannot use LocalBluetoothDevice without Bluetooth hardware");
+                    "Cannot use CachedBluetoothDevice without Bluetooth hardware");
         }
 
-        mAddress = address;
+        mDevice = device;
 
         fillData();
     }
@@ -300,7 +315,7 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
             askDisconnect();
         } else if (bondState == BluetoothDevice.BOND_BONDED) {
             connect();
-        } else if (bondState == BluetoothDevice.BOND_NOT_BONDED) {
+        } else if (bondState == BluetoothDevice.BOND_NONE) {
             pair();
         }
     }
@@ -315,12 +330,12 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
         queueCommand(new BluetoothJob(BluetoothCommand.DISCONNECT, this, profile));
     }
 
-    private boolean disconnectInt(LocalBluetoothDevice device, Profile profile) {
+    private boolean disconnectInt(CachedBluetoothDevice cachedDevice, Profile profile) {
         LocalBluetoothProfileManager profileManager =
                 LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile);
-        int status = profileManager.getConnectionStatus(device.mAddress);
+        int status = profileManager.getConnectionStatus(cachedDevice.mDevice);
         if (SettingsBtStatus.isConnectionStatusConnected(status)) {
-            if (profileManager.disconnect(device.mAddress) == BluetoothDevice.RESULT_SUCCESS) {
+            if (profileManager.disconnect(cachedDevice.mDevice)) {
                 return true;
             }
         }
@@ -349,7 +364,7 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
             }
         };
 
-        AlertDialog ad = new AlertDialog.Builder(context)
+        new AlertDialog.Builder(context)
                 .setTitle(getName())
                 .setMessage(message)
                 .setPositiveButton(android.R.string.ok, disconnectListener)
@@ -360,59 +375,80 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
     public void connect() {
         if (!ensurePaired()) return;
 
-        // Reset the only-show-one-error-dialog tracking variable
-        mIsConnectingErrorPossible = true;
+        mConnectAttempted = SystemClock.elapsedRealtime();
 
-        Context context = mLocalManager.getContext();
-        boolean hasAtLeastOnePreferredProfile = false;
-        for (Profile profile : mProfiles) {
-            LocalBluetoothProfileManager profileManager =
-                    LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile);
-            if (profileManager.isPreferred(mAddress)) {
-                hasAtLeastOnePreferredProfile = true;
-                queueCommand(new BluetoothJob(BluetoothCommand.CONNECT, this, profile));
+        connectWithoutResettingTimer();
+    }
+
+    private void connectWithoutResettingTimer() {
+        // Try to initialize the profiles if there were not.
+        if (mProfiles.size() == 0) {
+            if (!updateProfiles()) {
+                // If UUIDs are not available yet, connect will be happen
+                // upon arrival of the ACTION_UUID intent.
+                if (DEBUG) Log.d(TAG, "No profiles. Maybe we will connect later");
+                return;
             }
         }
 
-        if (!hasAtLeastOnePreferredProfile) {
-            connectAndPreferAllProfiles();
+        // Reset the only-show-one-error-dialog tracking variable
+        mIsConnectingErrorPossible = true;
+
+        int preferredProfiles = 0;
+        for (Profile profile : mProfiles) {
+            if (isConnectableProfile(profile)) {
+                LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
+                        .getProfileManager(mLocalManager, profile);
+                if (profileManager.isPreferred(mDevice)) {
+                    ++preferredProfiles;
+                    queueCommand(new BluetoothJob(BluetoothCommand.CONNECT, this, profile));
+                }
+            }
+        }
+        if (DEBUG) Log.d(TAG, "Preferred profiles = " + preferredProfiles);
+
+        if (preferredProfiles == 0) {
+            connectAllProfiles();
         }
     }
 
-    private void connectAndPreferAllProfiles() {
+    private void connectAllProfiles() {
         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);
-            queueCommand(new BluetoothJob(BluetoothCommand.CONNECT, this, profile));
+            if (isConnectableProfile(profile)) {
+                LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
+                        .getProfileManager(mLocalManager, profile);
+                profileManager.setPreferred(mDevice, false);
+                queueCommand(new BluetoothJob(BluetoothCommand.CONNECT, this, profile));
+            }
         }
     }
 
     public void connect(Profile profile) {
+        mConnectAttempted = SystemClock.elapsedRealtime();
         // Reset the only-show-one-error-dialog tracking variable
         mIsConnectingErrorPossible = true;
         queueCommand(new BluetoothJob(BluetoothCommand.CONNECT, this, profile));
     }
 
-    private boolean connectInt(LocalBluetoothDevice device, Profile profile) {
-        if (!device.ensurePaired()) return false;
+    private boolean connectInt(CachedBluetoothDevice cachedDevice, Profile profile) {
+        if (!cachedDevice.ensurePaired()) return false;
 
         LocalBluetoothProfileManager profileManager =
                 LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile);
-        int status = profileManager.getConnectionStatus(device.mAddress);
+        int status = profileManager.getConnectionStatus(cachedDevice.mDevice);
         if (!SettingsBtStatus.isConnectionStatusConnected(status)) {
-            if (profileManager.connect(device.mAddress) == BluetoothDevice.RESULT_SUCCESS) {
+            if (profileManager.connect(cachedDevice.mDevice)) {
                 return true;
             }
-            Log.i(TAG, "Failed to connect " + profile.toString() + " to " + device.mName);
+            Log.i(TAG, "Failed to connect " + profile.toString() + " to " + cachedDevice.mName);
+        } else {
+            Log.i(TAG, "Already connected");
         }
-        Log.i(TAG, "Not connected");
         return false;
     }
 
@@ -420,12 +456,12 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
         if (!mIsConnectingErrorPossible) return;
         mIsConnectingErrorPossible = false;
 
-        mLocalManager.showError(mAddress, R.string.bluetooth_error_title,
+        mLocalManager.showError(mDevice, R.string.bluetooth_error_title,
                 R.string.bluetooth_connecting_error_message);
     }
 
     private boolean ensurePaired() {
-        if (getBondState() == BluetoothDevice.BOND_NOT_BONDED) {
+        if (getBondState() == BluetoothDevice.BOND_NONE) {
             pair();
             return false;
         } else {
@@ -434,15 +470,15 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
     }
 
     public void pair() {
-        BluetoothDevice manager = mLocalManager.getBluetoothManager();
+        BluetoothAdapter adapter = mLocalManager.getBluetoothAdapter();
 
         // Pairing is unreliable while scanning, so cancel discovery
-        if (manager.isDiscovering()) {
-            manager.cancelDiscovery();
+        if (adapter.isDiscovering()) {
+            adapter.cancelDiscovery();
         }
 
-        if (!mLocalManager.getBluetoothManager().createBond(mAddress)) {
-            mLocalManager.showError(mAddress, R.string.bluetooth_error_title,
+        if (!mDevice.createBond()) {
+            mLocalManager.showError(mDevice, R.string.bluetooth_error_title,
                     R.string.bluetooth_pairing_error_message);
         }
     }
@@ -450,11 +486,11 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
     public void unpair() {
         synchronized (workQueue) {
             // Remove any pending commands for this device
-            boolean processNow = false;            
+            boolean processNow = false;
             Iterator<BluetoothJob> it = workQueue.iterator();
             while (it.hasNext()) {
                 BluetoothJob job = it.next();
-                if (job.device.mAddress.equals(this.mAddress)) {
+                if (job.cachedDevice.mDevice.equals(this.mDevice)) {
                     it.remove();
                     if (job.timeSent != 0) {
                         processNow = true;
@@ -466,48 +502,57 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
             }
         }
 
-        BluetoothDevice manager = mLocalManager.getBluetoothManager();
-
         switch (getBondState()) {
         case BluetoothDevice.BOND_BONDED:
-            manager.removeBond(mAddress);
+            mDevice.removeBond();
             break;
 
         case BluetoothDevice.BOND_BONDING:
-            manager.cancelBondProcess(mAddress);
+            mDevice.cancelBondProcess();
             break;
         }
     }
 
     private void fillData() {
-        BluetoothDevice manager = mLocalManager.getBluetoothManager();
-
         fetchName();
         fetchBtClass();
+        updateProfiles();
 
         mVisible = false;
 
         dispatchAttributesChanged();
     }
 
-    public String getAddress() {
-        return mAddress;
+    public BluetoothDevice getDevice() {
+        return mDevice;
     }
 
     public String getName() {
         return mName;
     }
 
+    public void setName(String name) {
+        if (!mName.equals(name)) {
+            if (TextUtils.isEmpty(name)) {
+                mName = mDevice.getAddress();
+            } else {
+                mName = name;
+            }
+            dispatchAttributesChanged();
+        }
+    }
+
     public void refreshName() {
         fetchName();
         dispatchAttributesChanged();
     }
 
     private void fetchName() {
-        mName = mLocalManager.getBluetoothManager().getRemoteName(mAddress);
+        mName = mDevice.getName();
 
         if (TextUtils.isEmpty(mName)) {
-            mName = mAddress;
+            mName = mDevice.getAddress();
+            if (DEBUG) Log.d(TAG, "Default to address. Device has no name (yet) " + mName);
         }
     }
 
@@ -527,7 +572,7 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
     }
 
     public int getBondState() {
-        return mLocalManager.getBluetoothManager().getBondState(mAddress);
+        return mDevice.getBondState();
     }
 
     void setRssi(short rssi) {
@@ -545,7 +590,7 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
     public boolean isConnected() {
         for (Profile profile : mProfiles) {
             int status = LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile)
-                    .getConnectionStatus(mAddress);
+                    .getConnectionStatus(mDevice);
             if (SettingsBtStatus.isConnectionStatusConnected(status)) {
                 return true;
             }
@@ -557,7 +602,7 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
     public boolean isBusy() {
         for (Profile profile : mProfiles) {
             int status = LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile)
-                    .getConnectionStatus(mAddress);
+                    .getConnectionStatus(mDevice);
             if (SettingsBtStatus.isConnectionStatusBusy(status)) {
                 return true;
             }
@@ -571,35 +616,82 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
     }
 
     public int getBtClassDrawable() {
+        if (mBtClass != null) {
+            switch (mBtClass.getMajorDeviceClass()) {
+            case BluetoothClass.Device.Major.COMPUTER:
+                return R.drawable.ic_bt_laptop;
 
-        // First try looking at profiles
-        if (mProfiles.contains(Profile.A2DP)) {
-            return R.drawable.ic_bt_headphones_a2dp;
-        } else if (mProfiles.contains(Profile.HEADSET)) {
-            return R.drawable.ic_bt_headset_hfp;
+            case BluetoothClass.Device.Major.PHONE:
+                return R.drawable.ic_bt_cellphone;
+            }
+        } else {
+            Log.w(TAG, "mBtClass is null");
         }
 
-        // Fallback on class
-        switch (BluetoothClass.Device.Major.getDeviceMajor(mBtClass)) {
-        case BluetoothClass.Device.Major.COMPUTER:
-            return R.drawable.ic_bt_laptop;
+        if (mProfiles.size() > 0) {
+            if (mProfiles.contains(Profile.A2DP)) {
+                return R.drawable.ic_bt_headphones_a2dp;
+            } else if (mProfiles.contains(Profile.HEADSET)) {
+                return R.drawable.ic_bt_headset_hfp;
+            }
+        } else if (mBtClass != null) {
+            if (mBtClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) {
+                return R.drawable.ic_bt_headphones_a2dp;
 
-        case BluetoothClass.Device.Major.PHONE:
-            return R.drawable.ic_bt_cellphone;
-
-        default:
-            return 0;
+            }
+            if (mBtClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) {
+                return R.drawable.ic_bt_headset_hfp;
+            }
         }
+        return 0;
     }
 
     /**
      * Fetches a new value for the cached BT class.
      */
     private void fetchBtClass() {
-        mBtClass = mLocalManager.getBluetoothManager().getRemoteClass(mAddress);
-        if (mBtClass != BluetoothClass.ERROR) {
-            LocalBluetoothProfileManager.fill(mBtClass, mProfiles);
+        mBtClass = mDevice.getBluetoothClass();
+    }
+
+    private boolean updateProfiles() {
+        ParcelUuid[] uuids = mDevice.getUuids();
+        if (uuids == null) return false;
+
+        LocalBluetoothProfileManager.updateProfiles(uuids, mProfiles);
+
+        if (DEBUG) {
+            Log.e(TAG, "updating profiles for " + mDevice.getName());
+
+            boolean printUuids = true;
+            BluetoothClass bluetoothClass = mDevice.getBluetoothClass();
+
+            if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET) !=
+                mProfiles.contains(Profile.HEADSET)) {
+                Log.v(TAG, "headset classbits != uuid");
+                printUuids = true;
+            }
+
+            if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_A2DP) !=
+                mProfiles.contains(Profile.A2DP)) {
+                Log.v(TAG, "a2dp classbits != uuid");
+                printUuids = true;
+            }
+
+            if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_OPP) !=
+                mProfiles.contains(Profile.OPP)) {
+                Log.v(TAG, "opp classbits != uuid");
+                printUuids = true;
+            }
+
+            if (printUuids) {
+                Log.v(TAG, "Class: " + bluetoothClass.toString());
+                Log.v(TAG, "UUID:");
+                for (int i = 0; i < uuids.length; i++) {
+                    Log.v(TAG, "  " + uuids[i]);
+                }
+            }
         }
+        return true;
     }
 
     /**
@@ -611,6 +703,43 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
         dispatchAttributesChanged();
     }
 
+    /**
+     * Refreshes the UI when framework alerts us of a UUID change.
+     */
+    public void onUuidChanged() {
+        updateProfiles();
+
+        if (DEBUG) {
+            Log.e(TAG, "onUuidChanged: Time since last connect"
+                    + (SystemClock.elapsedRealtime() - mConnectAttempted));
+        }
+
+        /*
+         * If a connect was attempted earlier without any UUID, we will do the
+         * connect now.
+         */
+        if (mProfiles.size() > 0
+                && (mConnectAttempted + MAX_UUID_DELAY_FOR_AUTO_CONNECT) > SystemClock
+                        .elapsedRealtime()) {
+            connectWithoutResettingTimer();
+        }
+        dispatchAttributesChanged();
+    }
+
+    public void onBondingStateChanged(int bondState) {
+        if (bondState == BluetoothDevice.BOND_NONE) {
+            mProfiles.clear();
+        }
+        refresh();
+    }
+
+    public void setBtClass(BluetoothClass btClass) {
+        if (btClass != null && mBtClass != btClass) {
+            mBtClass = btClass;
+            dispatchAttributesChanged();
+        }
+    }
+
     public int getSummary() {
         // TODO: clean up
         int oneOffSummary = getOneOffSummary();
@@ -621,7 +750,7 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
         for (Profile profile : mProfiles) {
             LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
                     .getProfileManager(mLocalManager, profile);
-            int connectionStatus = profileManager.getConnectionStatus(mAddress);
+            int connectionStatus = profileManager.getConnectionStatus(mDevice);
 
             if (SettingsBtStatus.isConnectionStatusConnected(connectionStatus) ||
                     connectionStatus == SettingsBtStatus.CONNECTION_STATUS_CONNECTING ||
@@ -645,17 +774,17 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
         if (mProfiles.contains(Profile.A2DP)) {
             LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
                     .getProfileManager(mLocalManager, Profile.A2DP);
-            isConnecting = profileManager.getConnectionStatus(mAddress) ==
+            isConnecting = profileManager.getConnectionStatus(mDevice) ==
                     SettingsBtStatus.CONNECTION_STATUS_CONNECTING;
-            isA2dpConnected = profileManager.isConnected(mAddress);
+            isA2dpConnected = profileManager.isConnected(mDevice);
         }
 
         if (mProfiles.contains(Profile.HEADSET)) {
             LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
                     .getProfileManager(mLocalManager, Profile.HEADSET);
-            isConnecting |= profileManager.getConnectionStatus(mAddress) ==
+            isConnecting |= profileManager.getConnectionStatus(mDevice) ==
                     SettingsBtStatus.CONNECTION_STATUS_CONNECTING;
-            isHeadsetConnected = profileManager.isConnected(mAddress);
+            isHeadsetConnected = profileManager.isConnected(mDevice);
         }
 
         if (isConnecting) {
@@ -673,40 +802,59 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
         }
     }
 
-    public List<Profile> getProfiles() {
-        return new ArrayList<Profile>(mProfiles);
+    public List<Profile> getConnectableProfiles() {
+        ArrayList<Profile> connectableProfiles = new ArrayList<Profile>();
+        for (Profile profile : mProfiles) {
+            if (isConnectableProfile(profile)) {
+                connectableProfiles.add(profile);
+            }
+        }
+        return connectableProfiles;
+    }
+
+    private boolean isConnectableProfile(Profile profile) {
+        return profile.equals(Profile.HEADSET) || profile.equals(Profile.A2DP);
     }
 
     public void onCreateContextMenu(ContextMenu menu) {
         // No context menu if it is busy (none of these items are applicable if busy)
-        if (isBusy()) return;
+        if (mLocalManager.getBluetoothState() != BluetoothAdapter.STATE_ON || isBusy()) {
+            return;
+        }
 
         int bondState = getBondState();
         boolean isConnected = isConnected();
-        boolean hasProfiles = mProfiles.size() > 0;
+        boolean hasConnectableProfiles = false;
+
+        for (Profile profile : mProfiles) {
+            if (isConnectableProfile(profile)) {
+                hasConnectableProfiles = true;
+                break;
+            }
+        }
 
         menu.setHeaderTitle(getName());
 
-        if (isConnected) {
-            menu.add(0, CONTEXT_ITEM_DISCONNECT, 0, R.string.bluetooth_device_context_disconnect);
-        } 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
-                    : R.string.bluetooth_device_context_connect;
-            menu.add(0, CONTEXT_ITEM_CONNECT, 0, connectString);
-        }
-
-        if (bondState == BluetoothDevice.BOND_BONDED) {
-            // For unpair action, show either "Unpair" or "Disconnect & unpair"
-            int unpairString = isConnected
-                    ? R.string.bluetooth_device_context_disconnect_unpair
-                    : R.string.bluetooth_device_context_unpair;
-            menu.add(0, CONTEXT_ITEM_UNPAIR, 0, unpairString);
+        if (bondState == BluetoothDevice.BOND_NONE) { // Not paired and not connected
+            menu.add(0, CONTEXT_ITEM_CONNECT, 0, R.string.bluetooth_device_context_pair_connect);
+        } else { // Paired
+            if (isConnected) { // Paired and connected
+                menu.add(0, CONTEXT_ITEM_DISCONNECT, 0,
+                        R.string.bluetooth_device_context_disconnect);
+                menu.add(0, CONTEXT_ITEM_UNPAIR, 0,
+                        R.string.bluetooth_device_context_disconnect_unpair);
+            } else { // Paired but not connected
+                if (hasConnectableProfiles) {
+                    menu.add(0, CONTEXT_ITEM_CONNECT, 0, R.string.bluetooth_device_context_connect);
+                }
+                menu.add(0, CONTEXT_ITEM_UNPAIR, 0, R.string.bluetooth_device_context_unpair);
+            }
 
             // Show the connection options item
-            menu.add(0, CONTEXT_ITEM_CONNECT_ADVANCED, 0,
-                    R.string.bluetooth_device_context_connect_advanced);
+            if (hasConnectableProfiles) {
+                menu.add(0, CONTEXT_ITEM_CONNECT_ADVANCED, 0,
+                        R.string.bluetooth_device_context_connect_advanced);
+            }
         }
     }
 
@@ -726,7 +874,6 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
                 break;
 
             case CONTEXT_ITEM_UNPAIR:
-                mLocalManager.getBluetoothManager().disconnectRemoteDeviceAcl(mAddress);
                 unpair();
                 break;
 
@@ -740,7 +887,7 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
                     intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 }
                 intent.setClass(context, ConnectSpecificProfilesActivity.class);
-                intent.putExtra(ConnectSpecificProfilesActivity.EXTRA_ADDRESS, mAddress);
+                intent.putExtra(ConnectSpecificProfilesActivity.EXTRA_DEVICE, mDevice);
                 context.startActivity(intent);
                 break;
         }
@@ -768,24 +915,24 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
 
     @Override
     public String toString() {
-        return mAddress;
+        return mDevice.toString();
     }
 
     @Override
     public boolean equals(Object o) {
-        if ((o == null) || !(o instanceof LocalBluetoothDevice)) {
+        if ((o == null) || !(o instanceof CachedBluetoothDevice)) {
             throw new ClassCastException();
         }
 
-        return mAddress.equals(((LocalBluetoothDevice) o).mAddress);
+        return mDevice.equals(((CachedBluetoothDevice) o).mDevice);
     }
 
     @Override
     public int hashCode() {
-        return mAddress.hashCode();
+        return mDevice.getAddress().hashCode();
     }
 
-    public int compareTo(LocalBluetoothDevice another) {
+    public int compareTo(CachedBluetoothDevice another) {
         int comparison;
 
         // Connected above not connected
@@ -810,6 +957,6 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
     }
 
     public interface Callback {
-        void onDeviceAttributesChanged(LocalBluetoothDevice device);
+        void onDeviceAttributesChanged(CachedBluetoothDevice cachedDevice);
     }
 }
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
new file mode 100644
index 00000000000..c3dfc208bf8
--- /dev/null
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
@@ -0,0 +1,274 @@
+/*
+ * 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.bluetooth;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothClass;
+import android.bluetooth.BluetoothDevice;
+import android.util.Log;
+
+import com.android.settings.R;
+import com.android.settings.bluetooth.LocalBluetoothManager.Callback;
+import com.android.settings.bluetooth.LocalBluetoothProfileManager.Profile;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * CachedBluetoothDeviceManager manages the set of remote Bluetooth devices.
+ */
+public class CachedBluetoothDeviceManager {
+    private static final String TAG = "CachedBluetoothDeviceManager";
+
+    final LocalBluetoothManager mLocalManager;
+    final List<Callback> mCallbacks;
+
+    final List<CachedBluetoothDevice> mCachedDevices = new ArrayList<CachedBluetoothDevice>();
+
+    public CachedBluetoothDeviceManager(LocalBluetoothManager localManager) {
+        mLocalManager = localManager;
+        mCallbacks = localManager.getCallbacks();
+        readPairedDevices();
+    }
+
+    private synchronized boolean readPairedDevices() {
+        BluetoothAdapter adapter = mLocalManager.getBluetoothAdapter();
+        Set<BluetoothDevice> bondedDevices = adapter.getBondedDevices();
+        if (bondedDevices == null) return false;
+
+        boolean deviceAdded = false;
+        for (BluetoothDevice device : bondedDevices) {
+            CachedBluetoothDevice cachedDevice = findDevice(device);
+            if (cachedDevice == null) {
+                cachedDevice = new CachedBluetoothDevice(mLocalManager.getContext(), device);
+                mCachedDevices.add(cachedDevice);
+                dispatchDeviceAdded(cachedDevice);
+                deviceAdded = true;
+            }
+        }
+
+        return deviceAdded;
+    }
+
+    public synchronized List<CachedBluetoothDevice> getCachedDevicesCopy() {
+        return new ArrayList<CachedBluetoothDevice>(mCachedDevices);
+    }
+
+    void onBluetoothStateChanged(boolean enabled) {
+        if (enabled) {
+            readPairedDevices();
+        }
+    }
+
+    public synchronized void onDeviceAppeared(BluetoothDevice device, short rssi,
+            BluetoothClass btClass, String name) {
+        boolean deviceAdded = false;
+
+        CachedBluetoothDevice cachedDevice = findDevice(device);
+        if (cachedDevice == null) {
+            cachedDevice = new CachedBluetoothDevice(mLocalManager.getContext(), device);
+            mCachedDevices.add(cachedDevice);
+            deviceAdded = true;
+        }
+        cachedDevice.setRssi(rssi);
+        cachedDevice.setBtClass(btClass);
+        cachedDevice.setName(name);
+        cachedDevice.setVisible(true);
+
+        if (deviceAdded) {
+            dispatchDeviceAdded(cachedDevice);
+        }
+    }
+
+    public synchronized void onDeviceDisappeared(BluetoothDevice device) {
+        CachedBluetoothDevice cachedDevice = findDevice(device);
+        if (cachedDevice == null) return;
+
+        cachedDevice.setVisible(false);
+        checkForDeviceRemoval(cachedDevice);
+    }
+
+    private void checkForDeviceRemoval(CachedBluetoothDevice cachedDevice) {
+        if (cachedDevice.getBondState() == BluetoothDevice.BOND_NONE &&
+                !cachedDevice.isVisible()) {
+            // If device isn't paired, remove it altogether
+            mCachedDevices.remove(cachedDevice);
+            dispatchDeviceDeleted(cachedDevice);
+        }
+    }
+
+    public synchronized void onDeviceNameUpdated(BluetoothDevice device) {
+        CachedBluetoothDevice cachedDevice = findDevice(device);
+        if (cachedDevice != null) {
+            cachedDevice.refreshName();
+        }
+    }
+
+    public synchronized CachedBluetoothDevice findDevice(BluetoothDevice device) {
+
+        for (int i = mCachedDevices.size() - 1; i >= 0; i--) {
+            CachedBluetoothDevice cachedDevice = mCachedDevices.get(i);
+
+            if (cachedDevice.getDevice().equals(device)) {
+                return cachedDevice;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Attempts to get the name of a remote device, otherwise returns the address.
+     *
+     * @param device The remote device.
+     * @return The name, or if unavailable, the address.
+     */
+    public String getName(BluetoothDevice device) {
+        CachedBluetoothDevice cachedDevice = findDevice(device);
+        if (cachedDevice != null) return cachedDevice.getName();
+
+        String name = device.getName();
+        if (name != null) return name;
+
+        return device.getAddress();
+    }
+
+    private void dispatchDeviceAdded(CachedBluetoothDevice cachedDevice) {
+        synchronized (mCallbacks) {
+            for (Callback callback : mCallbacks) {
+                callback.onDeviceAdded(cachedDevice);
+            }
+        }
+
+        // TODO: divider between prev paired/connected and scanned
+    }
+
+    private void dispatchDeviceDeleted(CachedBluetoothDevice cachedDevice) {
+        synchronized (mCallbacks) {
+            for (Callback callback : mCallbacks) {
+                callback.onDeviceDeleted(cachedDevice);
+            }
+        }
+    }
+
+    public synchronized void onBondingStateChanged(BluetoothDevice device, int bondState) {
+        CachedBluetoothDevice cachedDevice = findDevice(device);
+        if (cachedDevice == null) {
+            if (!readPairedDevices()) {
+                Log.e(TAG, "Got bonding state changed for " + device +
+                        ", but we have no record of that device.");
+                return;
+            }
+            cachedDevice = findDevice(device);
+            if (cachedDevice == null) {
+                Log.e(TAG, "Got bonding state changed for " + device +
+                        "but device not added in cache");
+                return;
+            }
+        }
+
+        cachedDevice.onBondingStateChanged(bondState);
+
+        if (bondState == BluetoothDevice.BOND_BONDED) {
+            // Auto-connect after pairing
+            cachedDevice.connect();
+        }
+    }
+
+    /**
+     * Called when we have reached the un-bond state.
+     *
+     * @param device The remote device.
+     * @param reason The reason, one of the error reasons from
+     *            BluetoothDevice.UNBOND_REASON_*
+     */
+    public synchronized void showUnbondMessage(BluetoothDevice device, int reason) {
+        int errorMsg;
+
+        switch(reason) {
+        case BluetoothDevice.UNBOND_REASON_AUTH_FAILED:
+            errorMsg = R.string.bluetooth_pairing_pin_error_message;
+            mLocalManager.showError(device, R.string.bluetooth_error_title, errorMsg);
+            break;
+        case BluetoothDevice.UNBOND_REASON_AUTH_REJECTED:
+            errorMsg = R.string.bluetooth_pairing_rejected_error_message;
+            mLocalManager.showError(device, R.string.bluetooth_error_title, errorMsg);
+            break;
+        case BluetoothDevice.UNBOND_REASON_REMOTE_DEVICE_DOWN:
+            errorMsg = R.string.bluetooth_pairing_device_down_error_message;
+            mLocalManager.showError(device, R.string.bluetooth_error_title, errorMsg);
+            break;
+        case BluetoothDevice.UNBOND_REASON_DISCOVERY_IN_PROGRESS:
+        case BluetoothDevice.UNBOND_REASON_AUTH_TIMEOUT:
+        case BluetoothDevice.UNBOND_REASON_REPEATED_ATTEMPTS:
+        case BluetoothDevice.UNBOND_REASON_REMOTE_AUTH_CANCELED:
+            errorMsg = R.string.bluetooth_pairing_error_message;
+            mLocalManager.showError(device, R.string.bluetooth_error_title, errorMsg);
+            break;
+        default:
+            Log.w(TAG, "showUnbondMessage: Not displaying any message for reason:" + reason);
+            break;
+        }
+    }
+
+    public synchronized void onProfileStateChanged(BluetoothDevice device, Profile profile,
+            int newProfileState) {
+        CachedBluetoothDevice cachedDevice = findDevice(device);
+        if (cachedDevice == null) return;
+
+        cachedDevice.onProfileStateChanged(profile, newProfileState);
+        cachedDevice.refresh();
+    }
+
+    public synchronized void onConnectingError(BluetoothDevice device) {
+        CachedBluetoothDevice cachedDevice = findDevice(device);
+        if (cachedDevice == null) return;
+
+        /*
+         * Go through the device's delegate so we don't spam the user with
+         * errors connecting to different profiles, and instead make sure the
+         * user sees a single error for his single 'connect' action.
+         */
+        cachedDevice.showConnectingError();
+    }
+
+    public synchronized void onScanningStateChanged(boolean started) {
+        if (!started) return;
+
+        // If starting a new scan, clear old visibility
+        for (int i = mCachedDevices.size() - 1; i >= 0; i--) {
+            CachedBluetoothDevice cachedDevice = mCachedDevices.get(i);
+            cachedDevice.setVisible(false);
+            checkForDeviceRemoval(cachedDevice);
+        }
+    }
+
+    public synchronized void onBtClassChanged(BluetoothDevice device) {
+        CachedBluetoothDevice cachedDevice = findDevice(device);
+        if (cachedDevice != null) {
+            cachedDevice.refreshBtClass();
+        }
+    }
+
+    public synchronized void onUuidChanged(BluetoothDevice device) {
+        CachedBluetoothDevice cachedDevice = findDevice(device);
+        if (cachedDevice != null) {
+            cachedDevice.onUuidChanged();
+        }
+    }
+}
diff --git a/src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java b/src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java
index 7dd1b706d7b..08534f3b85f 100644
--- a/src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java
+++ b/src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java
@@ -16,9 +16,7 @@
 
 package com.android.settings.bluetooth;
 
-import com.android.settings.R;
-import com.android.settings.bluetooth.LocalBluetoothProfileManager.Profile;
-
+import android.bluetooth.BluetoothDevice;
 import android.content.Intent;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
@@ -28,24 +26,27 @@ import android.preference.PreferenceGroup;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.android.settings.R;
+import com.android.settings.bluetooth.LocalBluetoothProfileManager.Profile;
+
 /**
  * ConnectSpecificProfilesActivity presents the user with all of the profiles
  * for a particular device, and allows him to choose which should be connected
  * (or disconnected).
  */
 public class ConnectSpecificProfilesActivity extends PreferenceActivity
-        implements LocalBluetoothDevice.Callback, Preference.OnPreferenceChangeListener {
+        implements CachedBluetoothDevice.Callback, Preference.OnPreferenceChangeListener {
     private static final String TAG = "ConnectSpecificProfilesActivity";
 
     private static final String KEY_ONLINE_MODE = "online_mode";
     private static final String KEY_TITLE = "title";
     private static final String KEY_PROFILE_CONTAINER = "profile_container";
 
-    public static final String EXTRA_ADDRESS = "address";
-    
+    public static final String EXTRA_DEVICE = "device";
+
     private LocalBluetoothManager mManager;
-    private LocalBluetoothDevice mDevice;
-    
+    private CachedBluetoothDevice mCachedDevice;
+
     private PreferenceGroup mProfileContainer;
     private CheckBoxPreference mOnlineModePreference;
 
@@ -57,42 +58,42 @@ public class ConnectSpecificProfilesActivity extends PreferenceActivity
      * profile.
      */
     private boolean mOnlineMode;
-    
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        
-        String address;
+
+        BluetoothDevice device;
         if (savedInstanceState != null) {
-            address = savedInstanceState.getString(EXTRA_ADDRESS);
+            device = savedInstanceState.getParcelable(EXTRA_DEVICE);
         } else {
             Intent intent = getIntent();
-            address = intent.getStringExtra(EXTRA_ADDRESS);
+            device = intent.getParcelableExtra(EXTRA_DEVICE);
         }
 
-        if (TextUtils.isEmpty(address)) {
-            Log.w(TAG, "Activity started without address");
+        if (device == null) {
+            Log.w(TAG, "Activity started without a remote blueototh device");
             finish();
         }
-        
+
         mManager = LocalBluetoothManager.getInstance(this);
-        mDevice = mManager.getLocalDeviceManager().findDevice(address);
-        if (mDevice == null) {
+        mCachedDevice = mManager.getCachedDeviceManager().findDevice(device);
+        if (mCachedDevice == null) {
             Log.w(TAG, "Device not found, cannot connect to it");
             finish();
         }
 
         addPreferencesFromResource(R.xml.bluetooth_device_advanced);
         mProfileContainer = (PreferenceGroup) findPreference(KEY_PROFILE_CONTAINER);
-        
+
         // Set the title of the screen
         findPreference(KEY_TITLE).setTitle(
-                getString(R.string.bluetooth_device_advanced_title, mDevice.getName()));
+                getString(R.string.bluetooth_device_advanced_title, mCachedDevice.getName()));
 
         // Listen for check/uncheck of the online mode checkbox
         mOnlineModePreference = (CheckBoxPreference) findPreference(KEY_ONLINE_MODE);
         mOnlineModePreference.setOnPreferenceChangeListener(this);
-        
+
         // Add a preference for each profile
         addPreferencesForProfiles();
     }
@@ -100,16 +101,16 @@ public class ConnectSpecificProfilesActivity extends PreferenceActivity
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        
-        outState.putString(EXTRA_ADDRESS, mDevice.getAddress());
+
+        outState.putParcelable(EXTRA_DEVICE, mCachedDevice.getDevice());
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        
+
         mManager.setForegroundActivity(this);
-        mDevice.registerCallback(this);
+        mCachedDevice.registerCallback(this);
 
         refresh();
     }
@@ -117,13 +118,13 @@ public class ConnectSpecificProfilesActivity extends PreferenceActivity
     @Override
     protected void onPause() {
         super.onPause();
-        
-        mDevice.unregisterCallback(this);
+
+        mCachedDevice.unregisterCallback(this);
         mManager.setForegroundActivity(null);
     }
 
     private void addPreferencesForProfiles() {
-        for (Profile profile : mDevice.getProfiles()) {
+        for (Profile profile : mCachedDevice.getConnectableProfiles()) {
             Preference pref = createProfilePreference(profile);
             mProfileContainer.addPreference(pref);
         }
@@ -132,7 +133,7 @@ public class ConnectSpecificProfilesActivity extends PreferenceActivity
     /**
      * Creates a checkbox preference for the particular profile. The key will be
      * the profile's name.
-     * 
+     *
      * @param profile The profile for which the preference controls.
      * @return A preference that allows the user to choose whether this profile
      *         will be connected to.
@@ -144,18 +145,26 @@ public class ConnectSpecificProfilesActivity extends PreferenceActivity
         pref.setPersistent(false);
         pref.setOnPreferenceChangeListener(this);
 
+        LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
+                .getProfileManager(mManager, profile);
+
+        /**
+         * Gray out checkbox while connecting and disconnecting
+         */
+        pref.setEnabled(!mCachedDevice.isBusy());
+
         refreshProfilePreference(pref, profile);
-        
+
         return pref;
     }
 
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         String key = preference.getKey();
         if (TextUtils.isEmpty(key) || newValue == null) return true;
-        
+
         if (key.equals(KEY_ONLINE_MODE)) {
             onOnlineModeCheckedStateChanged((Boolean) newValue);
-            
+
         } else {
             Profile profile = getProfileOf(preference);
             if (profile == null) return false;
@@ -168,68 +177,68 @@ public class ConnectSpecificProfilesActivity extends PreferenceActivity
     private void onOnlineModeCheckedStateChanged(boolean checked) {
         setOnlineMode(checked, true);
     }
-    
+
     private void onProfileCheckedStateChanged(Profile profile, boolean checked) {
         if (mOnlineMode) {
             if (checked) {
-                mDevice.connect(profile);
+                mCachedDevice.connect(profile);
             } else {
-                mDevice.disconnect(profile);
+                mCachedDevice.disconnect(profile);
             }
         }
-        
+
         LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
                 .getProfileManager(mManager, profile);
-        profileManager.setPreferred(mDevice.getAddress(), checked);
+        profileManager.setPreferred(mCachedDevice.getDevice(), checked);
     }
-    
-    public void onDeviceAttributesChanged(LocalBluetoothDevice device) {
+
+    public void onDeviceAttributesChanged(CachedBluetoothDevice cachedDevice) {
         refresh();
     }
 
     private void refresh() {
         // We are in 'online mode' if we are connected, connecting, or disconnecting
-        setOnlineMode(mDevice.isConnected() || mDevice.isBusy(), false);
+        setOnlineMode(mCachedDevice.isConnected() || mCachedDevice.isBusy(), false);
         refreshProfiles();
     }
 
     /**
      * 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 setOnlineMode(boolean onlineMode, boolean takeAction) {
         mOnlineMode = onlineMode;
-            
+
         if (takeAction) {
             if (onlineMode) {
-                mDevice.connect();
+                mCachedDevice.connect();
             } else {
-                mDevice.disconnect();
+                mCachedDevice.disconnect();
             }
         }
-            
+
         refreshOnlineModePreference();
     }
-    
+
     private void refreshOnlineModePreference() {
         mOnlineModePreference.setChecked(mOnlineMode);
 
         /* Gray out checkbox while connecting and disconnecting */
-        mOnlineModePreference.setEnabled(!mDevice.isBusy());
+        mOnlineModePreference.setEnabled(!mCachedDevice.isBusy());
 
         /**
          * If the device is online, show status. Otherwise, show a summary that
          * describes what the checkbox does.
          */
-        mOnlineModePreference.setSummary(mOnlineMode ? mDevice.getSummary()
+        mOnlineModePreference.setSummary(mOnlineMode ? mCachedDevice.getSummary()
                 : R.string.bluetooth_device_advanced_online_mode_summary);
     }
-    
+
     private void refreshProfiles() {
-        for (Profile profile : mDevice.getProfiles()) {
+        for (Profile profile : mCachedDevice.getConnectableProfiles()) {
             CheckBoxPreference profilePref =
                     (CheckBoxPreference) findPreference(profile.toString());
             if (profilePref == null) {
@@ -240,28 +249,29 @@ public class ConnectSpecificProfilesActivity extends PreferenceActivity
             }
         }
     }
-    
+
     private void refreshProfilePreference(CheckBoxPreference profilePref, Profile profile) {
-        String address = mDevice.getAddress();
+        BluetoothDevice device = mCachedDevice.getDevice();
         LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
                 .getProfileManager(mManager, profile);
-        
-        int connectionStatus = profileManager.getConnectionStatus(address);
 
-        /* Gray out checkbox while connecting and disconnecting */
-        profilePref.setEnabled(!mDevice.isBusy());
+        int connectionStatus = profileManager.getConnectionStatus(device);
 
-        profilePref.setSummary(getProfileSummary(profileManager, profile, address,
+        /*
+         * Gray out checkbox while connecting and disconnecting
+         */
+        profilePref.setEnabled(!mCachedDevice.isBusy());
+        profilePref.setSummary(getProfileSummary(profileManager, profile, device,
                 connectionStatus, mOnlineMode));
-        
-        profilePref.setChecked(profileManager.isPreferred(address));
+
+        profilePref.setChecked(profileManager.isPreferred(device));
     }
 
     private Profile getProfileOf(Preference pref) {
         if (!(pref instanceof CheckBoxPreference)) return null;
         String key = pref.getKey();
         if (TextUtils.isEmpty(key)) return null;
-        
+
         try {
             return Profile.valueOf(pref.getKey());
         } catch (IllegalArgumentException e) {
@@ -270,17 +280,17 @@ public class ConnectSpecificProfilesActivity extends PreferenceActivity
     }
 
     private static int getProfileSummary(LocalBluetoothProfileManager profileManager,
-            Profile profile, String address, int connectionStatus, boolean onlineMode) {
+            Profile profile, BluetoothDevice device, int connectionStatus, boolean onlineMode) {
         if (!onlineMode || connectionStatus == SettingsBtStatus.CONNECTION_STATUS_DISCONNECTED) {
             return getProfileSummaryForSettingPreference(profile);
         } else {
-            return profileManager.getSummary(address);
+            return profileManager.getSummary(device);
         }
     }
-    
+
     /**
      * Gets the summary that describes when checked, it will become a preferred profile.
-     * 
+     *
      * @param profile The profile to get the summary for.
      * @return The summary.
      */
@@ -294,5 +304,5 @@ public class ConnectSpecificProfilesActivity extends PreferenceActivity
                 return 0;
         }
     }
-    
+
 }
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothDeviceManager.java b/src/com/android/settings/bluetooth/LocalBluetoothDeviceManager.java
deleted file mode 100644
index 2c70fd2c84b..00000000000
--- a/src/com/android/settings/bluetooth/LocalBluetoothDeviceManager.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import android.bluetooth.BluetoothDevice;
-import android.util.Log;
-
-import com.android.settings.R;
-import com.android.settings.bluetooth.LocalBluetoothManager.Callback;
-import com.android.settings.bluetooth.LocalBluetoothProfileManager.Profile;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * LocalBluetoothDeviceManager manages the set of remote Bluetooth devices.
- */
-public class LocalBluetoothDeviceManager {
-    private static final String TAG = "LocalBluetoothDeviceManager";
-
-    final LocalBluetoothManager mLocalManager;
-    final List<Callback> mCallbacks;
-    
-    final List<LocalBluetoothDevice> mDevices = new ArrayList<LocalBluetoothDevice>();
-
-    public LocalBluetoothDeviceManager(LocalBluetoothManager localManager) {
-        mLocalManager = localManager;
-        mCallbacks = localManager.getCallbacks();
-        readPairedDevices();
-    }
-
-    private synchronized boolean readPairedDevices() {
-        BluetoothDevice manager = mLocalManager.getBluetoothManager();
-        String[] bondedAddresses = manager.listBonds();
-        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);
-                deviceAdded = true;
-            }
-        }
-        
-        return deviceAdded;
-    }
-    
-    public synchronized List<LocalBluetoothDevice> getDevicesCopy() {
-        return new ArrayList<LocalBluetoothDevice>(mDevices);
-    }
-    
-    void onBluetoothStateChanged(boolean enabled) {
-        if (enabled) {
-            readPairedDevices();
-        }
-    }
-
-    public synchronized void onDeviceAppeared(String address, short rssi) {
-        boolean deviceAdded = false;
-        
-        LocalBluetoothDevice device = findDevice(address);
-        if (device == null) {
-            device = new LocalBluetoothDevice(mLocalManager.getContext(), address);
-            mDevices.add(device);
-            deviceAdded = true;
-        }
-        
-        device.setRssi(rssi);
-        device.setVisible(true);
-        
-        if (deviceAdded) {
-            dispatchDeviceAdded(device);
-        }
-    }
-    
-    public synchronized void onDeviceDisappeared(String address) {
-        LocalBluetoothDevice device = findDevice(address);
-        if (device == null) return;
-        
-        device.setVisible(false);
-        checkForDeviceRemoval(device);
-    }
-    
-    private void checkForDeviceRemoval(LocalBluetoothDevice device) {
-        if (device.getBondState() == BluetoothDevice.BOND_NOT_BONDED &&
-                !device.isVisible()) {
-            // If device isn't paired, remove it altogether
-            mDevices.remove(device);
-            dispatchDeviceDeleted(device);
-        }            
-    }
-    
-    public synchronized void onDeviceNameUpdated(String address) {
-        LocalBluetoothDevice device = findDevice(address);
-        if (device != null) {
-            device.refreshName();
-        }
-    }
-
-    public synchronized LocalBluetoothDevice findDevice(String address) {
-        
-        for (int i = mDevices.size() - 1; i >= 0; i--) {
-            LocalBluetoothDevice device = mDevices.get(i);
-            
-            if (device.getAddress().equals(address)) {
-                return device;
-            }
-        }
-        
-        return null;
-    }
-    
-    /**
-     * Attempts to get the name of a remote device, otherwise returns the address.
-     * 
-     * @param address The address.
-     * @return The name, or if unavailable, the address.
-     */
-    public String getName(String address) {
-        LocalBluetoothDevice device = findDevice(address);
-        return device != null ? device.getName() : address;
-    }
-    
-    private void dispatchDeviceAdded(LocalBluetoothDevice device) {
-        synchronized (mCallbacks) {
-            for (Callback callback : mCallbacks) {
-                callback.onDeviceAdded(device);
-            }
-        }
-        
-        // TODO: divider between prev paired/connected and scanned
-    }
-    
-    private void dispatchDeviceDeleted(LocalBluetoothDevice device) {
-        synchronized (mCallbacks) {
-            for (Callback callback : mCallbacks) {
-                callback.onDeviceDeleted(device);
-            }
-        }
-    }
-
-    public synchronized void onBondingStateChanged(String address, int bondState) {
-        LocalBluetoothDevice device = findDevice(address);
-        if (device == null) {
-            if (!readPairedDevices()) {
-                Log.e(TAG, "Got bonding state changed for " + address +
-                        ", but we have no record of that device.");
-            }
-            return;
-        }
-
-        device.refresh();
-
-        if (bondState == BluetoothDevice.BOND_BONDED) {
-            // Auto-connect after pairing
-            device.connect();
-        }
-    }
-
-    /**
-     * 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) {
-        int errorMsg;
-
-        switch(reason) {
-        case BluetoothDevice.UNBOND_REASON_AUTH_FAILED:
-            errorMsg = R.string.bluetooth_pairing_pin_error_message;
-            break;
-        case BluetoothDevice.UNBOND_REASON_AUTH_REJECTED:
-            errorMsg = R.string.bluetooth_pairing_rejected_error_message;
-            break;
-        case BluetoothDevice.UNBOND_REASON_REMOTE_DEVICE_DOWN:
-            errorMsg = R.string.bluetooth_pairing_device_down_error_message;
-            break;
-        default:
-            errorMsg = R.string.bluetooth_pairing_error_message;
-        }
-        mLocalManager.showError(address, R.string.bluetooth_error_title, errorMsg);
-    }
-    
-    public synchronized void onProfileStateChanged(String address, Profile profile,
-            int newProfileState) {
-        LocalBluetoothDevice device = findDevice(address);
-        if (device == null) return;
-
-        device.onProfileStateChanged(profile, newProfileState);
-        device.refresh();
-    }
-    
-    public synchronized void onConnectingError(String address) {
-        LocalBluetoothDevice device = findDevice(address);
-        if (device == null) return;
-        
-        /*
-         * Go through the device's delegate so we don't spam the user with
-         * errors connecting to different profiles, and instead make sure the
-         * user sees a single error for his single 'connect' action.
-         */
-        device.showConnectingError();
-    }
-    
-    public synchronized void onScanningStateChanged(boolean started) {
-        if (!started) return;
-        
-        // If starting a new scan, clear old visibility
-        for (int i = mDevices.size() - 1; i >= 0; i--) {
-            LocalBluetoothDevice device = mDevices.get(i);
-            device.setVisible(false);
-            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 2e843386cc2..acab88ca525 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothManager.java
@@ -18,22 +18,21 @@ package com.android.settings.bluetooth;
 
 import com.android.settings.R;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.bluetooth.BluetoothA2dp;
+import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothError;
-import android.bluetooth.BluetoothIntent;
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.util.Config;
 import android.util.Log;
 import android.widget.Toast;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
 // TODO: have some notion of shutting down.  Maybe a minute after they leave BT settings?
 /**
  * LocalBluetoothManager provides a simplified interface on top of a subset of
@@ -42,43 +41,57 @@ import android.widget.Toast;
 public class LocalBluetoothManager {
     private static final String TAG = "LocalBluetoothManager";
     static final boolean V = Config.LOGV;
-    static final boolean D = Config.LOGD && false;
-    
+    static final boolean D = Config.LOGD;
+
     private static final String SHARED_PREFERENCES_NAME = "bluetooth_settings";
-    
+
     private static LocalBluetoothManager INSTANCE;
     /** Used when obtaining a reference to the singleton instance. */
     private static Object INSTANCE_LOCK = new Object();
     private boolean mInitialized;
-    
+
     private Context mContext;
     /** If a BT-related activity is in the foreground, this will be it. */
     private Activity mForegroundActivity;
     private AlertDialog mErrorDialog = null;
 
-    private BluetoothDevice mManager;
+    private BluetoothAdapter mAdapter;
 
-    private LocalBluetoothDeviceManager mLocalDeviceManager;
+    private CachedBluetoothDeviceManager mCachedDeviceManager;
     private BluetoothEventRedirector mEventRedirector;
     private BluetoothA2dp mBluetoothA2dp;
-    
-    private int mState = BluetoothError.ERROR;
+
+    private int mState = BluetoothAdapter.ERROR;
 
     private List<Callback> mCallbacks = new ArrayList<Callback>();
-    
+
     private static final int SCAN_EXPIRATION_MS = 5 * 60 * 1000; // 5 mins
+
+    // If a device was picked from the device picker or was in discoverable mode
+    // in the last 60 seconds, show the pairing dialogs in foreground instead
+    // of raising notifications
+    private static long GRACE_PERIOD_TO_SHOW_DIALOGS_IN_FOREGROUND = 60 * 1000;
+
+    private static final String SHARED_PREFERENCES_KEY_LAST_SELECTED_DEVICE =
+        "last_selected_device";
+
+    private static final String SHARED_PREFERENCES_KEY_LAST_SELECTED_DEVICE_TIME =
+        "last_selected_device_time";
+
     private long mLastScan;
-    
+
     public static LocalBluetoothManager getInstance(Context context) {
         synchronized (INSTANCE_LOCK) {
             if (INSTANCE == null) {
                 INSTANCE = new LocalBluetoothManager();
             }
-            
+
             if (!INSTANCE.init(context)) {
                 return null;
             }
-            
+
+            LocalBluetoothProfileManager.init(INSTANCE);
+
             return INSTANCE;
         }
     }
@@ -86,16 +99,16 @@ public class LocalBluetoothManager {
     private boolean init(Context context) {
         if (mInitialized) return true;
         mInitialized = true;
-        
+
         // This will be around as long as this process is
         mContext = context.getApplicationContext();
-        
-        mManager = (BluetoothDevice) context.getSystemService(Context.BLUETOOTH_SERVICE);
-        if (mManager == null) {
+
+        mAdapter = BluetoothAdapter.getDefaultAdapter();
+        if (mAdapter == null) {
             return false;
         }
-        
-        mLocalDeviceManager = new LocalBluetoothDeviceManager(this);
+
+        mCachedDeviceManager = new CachedBluetoothDeviceManager(this);
 
         mEventRedirector = new BluetoothEventRedirector(this);
         mEventRedirector.start();
@@ -104,11 +117,11 @@ public class LocalBluetoothManager {
 
         return true;
     }
-    
-    public BluetoothDevice getBluetoothManager() {
-        return mManager;
+
+    public BluetoothAdapter getBluetoothAdapter() {
+        return mAdapter;
     }
-    
+
     public Context getContext() {
         return mContext;
     }
@@ -116,7 +129,7 @@ public class LocalBluetoothManager {
     public Activity getForegroundActivity() {
         return mForegroundActivity;
     }
-    
+
     public void setForegroundActivity(Activity activity) {
         if (mErrorDialog != null) {
             mErrorDialog.dismiss();
@@ -124,39 +137,39 @@ public class LocalBluetoothManager {
         }
         mForegroundActivity = activity;
     }
-    
+
     public SharedPreferences getSharedPreferences() {
         return mContext.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
     }
-    
-    public LocalBluetoothDeviceManager getLocalDeviceManager() {
-        return mLocalDeviceManager;
+
+    public CachedBluetoothDeviceManager getCachedDeviceManager() {
+        return mCachedDeviceManager;
     }
-    
+
     List<Callback> getCallbacks() {
         return mCallbacks;
     }
-    
+
     public void registerCallback(Callback callback) {
         synchronized (mCallbacks) {
             mCallbacks.add(callback);
         }
     }
-    
+
     public void unregisterCallback(Callback callback) {
         synchronized (mCallbacks) {
             mCallbacks.remove(callback);
         }
     }
-    
+
     public void startScanning(boolean force) {
-        if (mManager.isDiscovering()) {
+        if (mAdapter.isDiscovering()) {
             /*
              * Already discovering, but give the callback that information.
              * Note: we only call the callbacks, not the same path as if the
              * scanning state had really changed (in that case the device
              * manager would clear its list of unpaired scanned devices).
-             */ 
+             */
             dispatchScanningStateChanged(true);
         } else {
             if (!force) {
@@ -167,48 +180,49 @@ public class LocalBluetoothManager {
                 }
 
                 // If we are playing music, don't scan unless forced.
-                List<String> sinks = mBluetoothA2dp.listConnectedSinks();
+                Set<BluetoothDevice> sinks = mBluetoothA2dp.getConnectedSinks();
                 if (sinks != null) {
-                    for (String address : sinks) {
-                        if (mBluetoothA2dp.getSinkState(address) == BluetoothA2dp.STATE_PLAYING) {
+                    for (BluetoothDevice sink : sinks) {
+                        if (mBluetoothA2dp.getSinkState(sink) == BluetoothA2dp.STATE_PLAYING) {
                             return;
                         }
                     }
                 }
             }
-            
-            if (mManager.startDiscovery(true)) {
+
+            if (mAdapter.startDiscovery()) {
                 mLastScan = System.currentTimeMillis();
             }
         }
     }
-    
+
     public int getBluetoothState() {
-        
-        if (mState == BluetoothError.ERROR) {
+
+        if (mState == BluetoothAdapter.ERROR) {
             syncBluetoothState();
         }
-            
+
         return mState;
     }
-    
+
     void setBluetoothStateInt(int state) {
         mState = state;
-        if (state == BluetoothDevice.BLUETOOTH_STATE_ON ||
-            state == BluetoothDevice.BLUETOOTH_STATE_OFF) {
-            mLocalDeviceManager.onBluetoothStateChanged(state == BluetoothDevice.BLUETOOTH_STATE_ON);
+        if (state == BluetoothAdapter.STATE_ON ||
+            state == BluetoothAdapter.STATE_OFF) {
+            mCachedDeviceManager.onBluetoothStateChanged(state ==
+                    BluetoothAdapter.STATE_ON);
         }
     }
-    
+
     private void syncBluetoothState() {
         int bluetoothState;
 
-        if (mManager != null) {
-            bluetoothState = mManager.isEnabled()
-                    ? BluetoothDevice.BLUETOOTH_STATE_ON
-                    : BluetoothDevice.BLUETOOTH_STATE_OFF;
+        if (mAdapter != null) {
+            bluetoothState = mAdapter.isEnabled()
+                    ? BluetoothAdapter.STATE_ON
+                    : BluetoothAdapter.STATE_OFF;
         } else {
-            bluetoothState = BluetoothError.ERROR;
+            bluetoothState = BluetoothAdapter.ERROR;
         }
 
         setBluetoothStateInt(bluetoothState);
@@ -216,33 +230,33 @@ public class LocalBluetoothManager {
 
     public void setBluetoothEnabled(boolean enabled) {
         boolean wasSetStateSuccessful = enabled
-                ? mManager.enable()
-                : mManager.disable();
-                
+                ? mAdapter.enable()
+                : mAdapter.disable();
+
         if (wasSetStateSuccessful) {
             setBluetoothStateInt(enabled
-                ? BluetoothDevice.BLUETOOTH_STATE_TURNING_ON
-                : BluetoothDevice.BLUETOOTH_STATE_TURNING_OFF);
+                ? BluetoothAdapter.STATE_TURNING_ON
+                : BluetoothAdapter.STATE_TURNING_OFF);
         } else {
             if (V) {
                 Log.v(TAG,
                         "setBluetoothEnabled call, manager didn't return success for enabled: "
                                 + enabled);
             }
-            
+
             syncBluetoothState();
         }
     }
-    
+
     /**
      * @param started True if scanning started, false if scanning finished.
      */
     void onScanningStateChanged(boolean started) {
         // TODO: have it be a callback (once we switch bluetooth state changed to callback)
-        mLocalDeviceManager.onScanningStateChanged(started);
+        mCachedDeviceManager.onScanningStateChanged(started);
         dispatchScanningStateChanged(started);
     }
-    
+
     private void dispatchScanningStateChanged(boolean started) {
         synchronized (mCallbacks) {
             for (Callback callback : mCallbacks) {
@@ -251,11 +265,18 @@ public class LocalBluetoothManager {
         }
     }
 
-    public void showError(String address, int titleResId, int messageResId) {
-        LocalBluetoothDevice device = mLocalDeviceManager.findDevice(address);
-        if (device == null) return;
+    public void showError(BluetoothDevice device, int titleResId, int messageResId) {
+        CachedBluetoothDevice cachedDevice = mCachedDeviceManager.findDevice(device);
+        String name = null;
+        if (cachedDevice == null) {
+            if (device != null) name = device.getName();
 
-        String name = device.getName();
+            if (name == null) {
+                name = mContext.getString(R.string.bluetooth_remote_device);
+            }
+        } else {
+            name = cachedDevice.getName();
+        }
         String message = mContext.getString(messageResId, name);
 
         if (mForegroundActivity != null) {
@@ -267,15 +288,55 @@ public class LocalBluetoothManager {
                 .setPositiveButton(android.R.string.ok, null)
                 .show();
         } else {
-            // Fallback on a toast 
-            Toast.makeText(mContext, message, Toast.LENGTH_SHORT).show();
+            // Fallback on a toast
+            Toast.makeText(mContext, message, Toast.LENGTH_LONG).show();
         }
     }
 
     public interface Callback {
         void onScanningStateChanged(boolean started);
-        void onDeviceAdded(LocalBluetoothDevice device);
-        void onDeviceDeleted(LocalBluetoothDevice device);
+        void onDeviceAdded(CachedBluetoothDevice cachedDevice);
+        void onDeviceDeleted(CachedBluetoothDevice cachedDevice);
+    }
+
+    public boolean shouldShowDialogInForeground(String deviceAddress) {
+        // If Bluetooth Settings is visible
+        if (mForegroundActivity != null) return true;
+
+        long currentTimeMillis = System.currentTimeMillis();
+        SharedPreferences sharedPreferences = getSharedPreferences();
+
+        // If the device was in discoverable mode recently
+        long lastDiscoverableEndTime = sharedPreferences.getLong(
+                BluetoothDiscoverableEnabler.SHARED_PREFERENCES_KEY_DISCOVERABLE_END_TIMESTAMP, 0);
+        if ((lastDiscoverableEndTime + GRACE_PERIOD_TO_SHOW_DIALOGS_IN_FOREGROUND)
+                > currentTimeMillis) {
+            return true;
+        }
+
+        // If the device was picked in the device picker recently
+        if (deviceAddress != null) {
+            String lastSelectedDevice = sharedPreferences.getString(
+                    SHARED_PREFERENCES_KEY_LAST_SELECTED_DEVICE, null);
+
+            if (deviceAddress.equals(lastSelectedDevice)) {
+                long lastDeviceSelectedTime = sharedPreferences.getLong(
+                        SHARED_PREFERENCES_KEY_LAST_SELECTED_DEVICE_TIME, 0);
+                if ((lastDeviceSelectedTime + GRACE_PERIOD_TO_SHOW_DIALOGS_IN_FOREGROUND)
+                        > currentTimeMillis) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    void persistSelectedDeviceInPicker(String deviceAddress) {
+        SharedPreferences.Editor editor = getSharedPreferences().edit();
+        editor.putString(LocalBluetoothManager.SHARED_PREFERENCES_KEY_LAST_SELECTED_DEVICE,
+                deviceAddress);
+        editor.putLong(LocalBluetoothManager.SHARED_PREFERENCES_KEY_LAST_SELECTED_DEVICE_TIME,
+                System.currentTimeMillis());
+        editor.commit();
     }
-    
 }
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
index b396732178d..a6258e24a2c 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
@@ -17,145 +17,176 @@
 package com.android.settings.bluetooth;
 
 import android.bluetooth.BluetoothA2dp;
-import android.bluetooth.BluetoothError;
+import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothHeadset;
+import android.bluetooth.BluetoothUuid;
+import android.os.ParcelUuid;
 import android.os.Handler;
-import android.text.TextUtils;
+import android.util.Log;
 
 import com.android.settings.R;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * LocalBluetoothProfileManager is an abstract class defining the basic
  * functionality related to a profile.
  */
 public abstract class LocalBluetoothProfileManager {
+    private static final String TAG = "LocalBluetoothProfileManager";
+
+    /* package */ static final ParcelUuid[] HEADSET_PROFILE_UUIDS = new ParcelUuid[] {
+        BluetoothUuid.HSP,
+        BluetoothUuid.Handsfree,
+    };
+
+    /* package */ static final ParcelUuid[] A2DP_PROFILE_UUIDS = new ParcelUuid[] {
+        BluetoothUuid.AudioSink,
+        BluetoothUuid.AdvAudioDist,
+    };
+
+    /* package */ static final ParcelUuid[] OPP_PROFILE_UUIDS = new ParcelUuid[] {
+        BluetoothUuid.ObexObjectPush
+    };
 
     // TODO: close profiles when we're shutting down
     private static Map<Profile, LocalBluetoothProfileManager> sProfileMap =
-            new HashMap<Profile, LocalBluetoothProfileManager>(); 
-    
+            new HashMap<Profile, LocalBluetoothProfileManager>();
+
     protected LocalBluetoothManager mLocalManager;
-    
-    public static LocalBluetoothProfileManager getProfileManager(LocalBluetoothManager localManager,
-            Profile profile) {
-        
-        LocalBluetoothProfileManager profileManager;
-        
+
+    public static void init(LocalBluetoothManager localManager) {
         synchronized (sProfileMap) {
-            profileManager = sProfileMap.get(profile);
-            
-            if (profileManager == null) {
-                switch (profile) {
-                case A2DP:
-                    profileManager = new A2dpProfileManager(localManager);
-                    break;
-                    
-                case HEADSET:
-                    profileManager = new HeadsetProfileManager(localManager);
-                    break;
-                }
-                
-                sProfileMap.put(profile, profileManager);    
+            if (sProfileMap.size() == 0) {
+                LocalBluetoothProfileManager profileManager;
+
+                profileManager = new A2dpProfileManager(localManager);
+                sProfileMap.put(Profile.A2DP, profileManager);
+
+                profileManager = new HeadsetProfileManager(localManager);
+                sProfileMap.put(Profile.HEADSET, profileManager);
+
+                profileManager = new OppProfileManager(localManager);
+                sProfileMap.put(Profile.OPP, profileManager);
             }
         }
-        
-        return profileManager;
+    }
+
+    public static LocalBluetoothProfileManager getProfileManager(LocalBluetoothManager localManager,
+            Profile profile) {
+        // Note: This code assumes that "localManager" is same as the
+        // LocalBluetoothManager that was used to initialize the sProfileMap.
+        // If that every changes, we can't just keep one copy of sProfileMap.
+        synchronized (sProfileMap) {
+            LocalBluetoothProfileManager profileManager = sProfileMap.get(profile);
+            if (profileManager == null) {
+                Log.e(TAG, "profileManager can't be found for " + profile.toString());
+            }
+            return profileManager;
+        }
     }
 
     /**
      * Temporary method to fill profiles based on a device's class.
-     * 
+     *
      * NOTE: This list happens to define the connection order. We should put this logic in a more
      * well known place when this method is no longer temporary.
-     * 
-     * @param btClass The class
+     * @param uuids of the remote device
      * @param profiles The list of profiles to fill
      */
-    public static void fill(int btClass, List<Profile> profiles) {
+    public static void updateProfiles(ParcelUuid[] uuids, List<Profile> profiles) {
         profiles.clear();
 
-        if (BluetoothHeadset.doesClassMatch(btClass)) {
+        if (uuids == null) {
+            return;
+        }
+
+        if (BluetoothUuid.containsAnyUuid(uuids, HEADSET_PROFILE_UUIDS)) {
             profiles.add(Profile.HEADSET);
         }
-        
-        if (BluetoothA2dp.doesClassMatchSink(btClass)) {
+
+        if (BluetoothUuid.containsAnyUuid(uuids, A2DP_PROFILE_UUIDS)) {
             profiles.add(Profile.A2DP);
         }
+
+        if (BluetoothUuid.containsAnyUuid(uuids, OPP_PROFILE_UUIDS)) {
+            profiles.add(Profile.OPP);
+        }
     }
 
     protected LocalBluetoothProfileManager(LocalBluetoothManager localManager) {
         mLocalManager = localManager;
     }
-    
-    public abstract int connect(String address);
-    
-    public abstract int disconnect(String address);
-    
-    public abstract int getConnectionStatus(String address);
 
-    public abstract int getSummary(String address);
+    public abstract boolean connect(BluetoothDevice device);
+
+    public abstract boolean disconnect(BluetoothDevice device);
+
+    public abstract int getConnectionStatus(BluetoothDevice device);
+
+    public abstract int getSummary(BluetoothDevice device);
 
     public abstract int convertState(int a2dpState);
-    
-    public abstract boolean isPreferred(String address);
 
-    public abstract void setPreferred(String address, boolean preferred);
+    public abstract boolean isPreferred(BluetoothDevice device);
 
-    public boolean isConnected(String address) {
-        return SettingsBtStatus.isConnectionStatusConnected(getConnectionStatus(address));
+    public abstract void setPreferred(BluetoothDevice device, boolean preferred);
+
+    public boolean isConnected(BluetoothDevice device) {
+        return SettingsBtStatus.isConnectionStatusConnected(getConnectionStatus(device));
     }
-    
+
     // TODO: int instead of enum
     public enum Profile {
         HEADSET(R.string.bluetooth_profile_headset),
-        A2DP(R.string.bluetooth_profile_a2dp);
-        
+        A2DP(R.string.bluetooth_profile_a2dp),
+        OPP(R.string.bluetooth_profile_opp);
+
         public final int localizedString;
-        
+
         private Profile(int localizedString) {
             this.localizedString = localizedString;
         }
     }
 
     /**
-     * A2dpProfileManager is an abstraction for the {@link BluetoothA2dp} service. 
+     * A2dpProfileManager is an abstraction for the {@link BluetoothA2dp} service.
      */
     private static class A2dpProfileManager extends LocalBluetoothProfileManager {
         private BluetoothA2dp mService;
-        
+
         public A2dpProfileManager(LocalBluetoothManager localManager) {
             super(localManager);
             mService = new BluetoothA2dp(localManager.getContext());
         }
 
         @Override
-        public int connect(String address) {
-            List<String> sinks = mService.listConnectedSinks();
+        public boolean connect(BluetoothDevice device) {
+            Set<BluetoothDevice> sinks = mService.getConnectedSinks();
             if (sinks != null) {
-                for (String sinkAddress : sinks) {
-                    mService.disconnectSink(sinkAddress);
+                for (BluetoothDevice sink : sinks) {
+                    mService.disconnectSink(sink);
                 }
             }
-            return mService.connectSink(address);
+            return mService.connectSink(device);
         }
 
         @Override
-        public int disconnect(String address) {
-            return mService.disconnectSink(address);
+        public boolean disconnect(BluetoothDevice device) {
+            return mService.disconnectSink(device);
         }
-        
+
         @Override
-        public int getConnectionStatus(String address) {
-            return convertState(mService.getSinkState(address));
+        public int getConnectionStatus(BluetoothDevice device) {
+            return convertState(mService.getSinkState(device));
         }
-        
+
         @Override
-        public int getSummary(String address) {
-            int connectionStatus = getConnectionStatus(address);
+        public int getSummary(BluetoothDevice device) {
+            int connectionStatus = getConnectionStatus(device);
 
             if (SettingsBtStatus.isConnectionStatusConnected(connectionStatus)) {
                 return R.string.bluetooth_a2dp_profile_summary_connected;
@@ -165,13 +196,13 @@ public abstract class LocalBluetoothProfileManager {
         }
 
         @Override
-        public boolean isPreferred(String address) {
-            return mService.getSinkPriority(address) > BluetoothA2dp.PRIORITY_OFF;
+        public boolean isPreferred(BluetoothDevice device) {
+            return mService.getSinkPriority(device) > BluetoothA2dp.PRIORITY_OFF;
         }
 
         @Override
-        public void setPreferred(String address, boolean preferred) {
-            mService.setSinkPriority(address,
+        public void setPreferred(BluetoothDevice device, boolean preferred) {
+            mService.setSinkPriority(device,
                     preferred ? BluetoothA2dp.PRIORITY_AUTO : BluetoothA2dp.PRIORITY_OFF);
         }
 
@@ -193,15 +224,15 @@ public abstract class LocalBluetoothProfileManager {
             }
         }
     }
-    
+
     /**
-     * HeadsetProfileManager is an abstraction for the {@link BluetoothHeadset} service. 
+     * HeadsetProfileManager is an abstraction for the {@link BluetoothHeadset} service.
      */
     private static class HeadsetProfileManager extends LocalBluetoothProfileManager
             implements BluetoothHeadset.ServiceListener {
         private BluetoothHeadset mService;
         private Handler mUiHandler = new Handler();
-        
+
         public HeadsetProfileManager(LocalBluetoothManager localManager) {
             super(localManager);
             mService = new BluetoothHeadset(localManager.getContext(), this);
@@ -215,11 +246,11 @@ public abstract class LocalBluetoothProfileManager {
                      * We just bound to the service, so refresh the UI of the
                      * headset device.
                      */
-                    String address = mService.getHeadsetAddress();
-                    if (TextUtils.isEmpty(address)) return;
-                    mLocalManager.getLocalDeviceManager()
-                            .onProfileStateChanged(address, Profile.HEADSET,
-                                    BluetoothHeadset.STATE_CONNECTED);
+                    BluetoothDevice device = mService.getCurrentHeadset();
+                    if (device == null) return;
+                    mLocalManager.getCachedDeviceManager()
+                            .onProfileStateChanged(device, Profile.HEADSET,
+                                                   BluetoothHeadset.STATE_CONNECTED);
                 }
             });
         }
@@ -228,35 +259,34 @@ public abstract class LocalBluetoothProfileManager {
         }
 
         @Override
-        public int connect(String address) {
+        public boolean connect(BluetoothDevice device) {
             // Since connectHeadset fails if already connected to a headset, we
             // disconnect from any headset first
             mService.disconnectHeadset();
-            return mService.connectHeadset(address)
-                    ? BluetoothError.SUCCESS : BluetoothError.ERROR;
+            return mService.connectHeadset(device);
         }
 
         @Override
-        public int disconnect(String address) {
-            if (mService.getHeadsetAddress().equals(address)) {
-                return mService.disconnectHeadset() ? BluetoothError.SUCCESS : BluetoothError.ERROR;
+        public boolean disconnect(BluetoothDevice device) {
+            if (mService.getCurrentHeadset().equals(device)) {
+                return mService.disconnectHeadset();
             } else {
-                return BluetoothError.SUCCESS;
+                return false;
             }
         }
-        
+
         @Override
-        public int getConnectionStatus(String address) {
-            String headsetAddress = mService.getHeadsetAddress();
-            return headsetAddress != null && headsetAddress.equals(address)
+        public int getConnectionStatus(BluetoothDevice device) {
+            BluetoothDevice currentDevice = mService.getCurrentHeadset();
+            return currentDevice != null && currentDevice.equals(device)
                     ? convertState(mService.getState())
                     : SettingsBtStatus.CONNECTION_STATUS_DISCONNECTED;
         }
-        
+
         @Override
-        public int getSummary(String address) {
-            int connectionStatus = getConnectionStatus(address);
-            
+        public int getSummary(BluetoothDevice device) {
+            int connectionStatus = getConnectionStatus(device);
+
             if (SettingsBtStatus.isConnectionStatusConnected(connectionStatus)) {
                 return R.string.bluetooth_headset_profile_summary_connected;
             } else {
@@ -265,13 +295,13 @@ public abstract class LocalBluetoothProfileManager {
         }
 
         @Override
-        public boolean isPreferred(String address) {
-            return mService.getPriority(address) > BluetoothHeadset.PRIORITY_OFF;
+        public boolean isPreferred(BluetoothDevice device) {
+            return mService.getPriority(device) > BluetoothHeadset.PRIORITY_OFF;
         }
 
         @Override
-        public void setPreferred(String address, boolean preferred) {
-            mService.setPriority(address,
+        public void setPreferred(BluetoothDevice device, boolean preferred) {
+            mService.setPriority(device,
                     preferred ? BluetoothHeadset.PRIORITY_AUTO : BluetoothHeadset.PRIORITY_OFF);
         }
 
@@ -289,4 +319,63 @@ public abstract class LocalBluetoothProfileManager {
             }
         }
     }
+
+    /**
+     * OppProfileManager
+     */
+    private static class OppProfileManager extends LocalBluetoothProfileManager {
+
+        public OppProfileManager(LocalBluetoothManager localManager) {
+            super(localManager);
+        }
+
+        @Override
+        public boolean connect(BluetoothDevice device) {
+            return false;
+        }
+
+        @Override
+        public boolean disconnect(BluetoothDevice device) {
+            return false;
+        }
+
+        @Override
+        public int getConnectionStatus(BluetoothDevice device) {
+            return -1;
+        }
+
+        @Override
+        public int getSummary(BluetoothDevice device) {
+            int connectionStatus = getConnectionStatus(device);
+
+            if (SettingsBtStatus.isConnectionStatusConnected(connectionStatus)) {
+                return R.string.bluetooth_opp_profile_summary_connected;
+            } else {
+                return R.string.bluetooth_opp_profile_summary_not_connected;
+            }
+        }
+
+        @Override
+        public boolean isPreferred(BluetoothDevice device) {
+            return false;
+        }
+
+        @Override
+        public void setPreferred(BluetoothDevice device, boolean preferred) {
+        }
+
+        @Override
+        public int convertState(int oppState) {
+            switch (oppState) {
+            case 0:
+                return SettingsBtStatus.CONNECTION_STATUS_CONNECTED;
+            case 1:
+                return SettingsBtStatus.CONNECTION_STATUS_CONNECTING;
+            case 2:
+                return SettingsBtStatus.CONNECTION_STATUS_DISCONNECTED;
+            default:
+                return SettingsBtStatus.CONNECTION_STATUS_UNKNOWN;
+            }
+        }
+    }
 }
diff --git a/src/com/android/settings/bluetooth/RequestPermissionActivity.java b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
new file mode 100644
index 00000000000..9fdb33860ff
--- /dev/null
+++ b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
@@ -0,0 +1,289 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+import com.android.internal.app.AlertActivity;
+import com.android.internal.app.AlertController;
+import com.android.settings.R;
+
+import android.app.Activity;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.TextView;
+
+/**
+ * RequestPermissionActivity asks the user whether to enable discovery. This is
+ * usually started by an application wanted to start bluetooth and or discovery
+ */
+public class RequestPermissionActivity extends AlertActivity implements
+        DialogInterface.OnClickListener {
+    // Command line to test this
+    // adb shell am start -a android.bluetooth.adapter.action.REQUEST_ENABLE
+    // adb shell am start -a android.bluetooth.adapter.action.REQUEST_DISCOVERABLE
+
+    private static final String TAG = "RequestPermissionActivity";
+
+    private static final int MAX_DISCOVERABLE_TIMEOUT = 300;
+
+    // Non-error return code: BT is starting or has started successfully. Used
+    // by this Activity and RequestPermissionHelperActivity
+    /* package */ static final int RESULT_BT_STARTING_OR_STARTED = -1000;
+
+    private static final int REQUEST_CODE_START_BT = 1;
+
+    private LocalBluetoothManager mLocalManager;
+
+    private int mTimeout = BluetoothDiscoverableEnabler.DEFAULT_DISCOVERABLE_TIMEOUT;
+
+    /*
+     * True if bluetooth wasn't enabled and RequestPermissionHelperActivity was
+     * started to ask the user and start bt.
+     *
+     * If/when that activity returns successfully, display please wait msg then
+     * go away when bt has started and discovery mode has been enabled.
+     */
+    private boolean mNeededToEnableBluetooth;
+
+    // True if requesting BT to be turned on
+    // False if requesting BT to be turned on + discoverable mode
+    private boolean mEnableOnly = false;
+
+    private boolean mUserConfirmed = false;
+
+    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent == null)
+                return;
+            if (mNeededToEnableBluetooth
+                    && BluetoothAdapter.ACTION_STATE_CHANGED.equals(intent.getAction())) {
+                int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothDevice.ERROR);
+                if (state == BluetoothAdapter.STATE_ON) {
+                    if (mUserConfirmed) {
+                        proceedAndFinish(false);
+                    }
+                }
+            }
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (parseIntent()) {
+            finish();
+            return;
+        }
+
+        int btState = mLocalManager.getBluetoothState();
+
+        switch (btState) {
+            case BluetoothAdapter.STATE_OFF:
+            case BluetoothAdapter.STATE_TURNING_OFF:
+            case BluetoothAdapter.STATE_TURNING_ON:
+                /*
+                 * Strictly speaking STATE_TURNING_ON belong with STATE_ON;
+                 * however, BT may not be ready when the user clicks yes and we
+                 * would fail to turn on discovery mode. By kicking this to the
+                 * RequestPermissionHelperActivity, this class will handle that
+                 * case via the broadcast receiver.
+                 */
+
+                /*
+                 * Start the helper activity to:
+                 * 1) ask the user about enabling bt AND discovery
+                 * 2) enable BT upon confirmation
+                 */
+                registerReceiver(mReceiver,
+                        new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED));
+                Intent i = new Intent();
+                i.setClass(this, RequestPermissionHelperActivity.class);
+                if (mEnableOnly) {
+                    i.setAction(RequestPermissionHelperActivity.ACTION_INTERNAL_REQUEST_BT_ON);
+                } else {
+                    i.setAction(RequestPermissionHelperActivity.
+                            ACTION_INTERNAL_REQUEST_BT_ON_AND_DISCOVERABLE);
+                    i.putExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION, mTimeout);
+                }
+                startActivityForResult(i, REQUEST_CODE_START_BT);
+                mNeededToEnableBluetooth = true;
+                break;
+            case BluetoothAdapter.STATE_ON:
+                if (mEnableOnly) {
+                    // Nothing to do. Already enabled.
+                    proceedAndFinish(false);
+                    return;
+                } else {
+                    // Ask the user about enabling discovery mode
+                    createDialog();
+                    break;
+                }
+        }
+    }
+
+    private void createDialog() {
+        final AlertController.AlertParams p = mAlertParams;
+        p.mIconId = android.R.drawable.ic_dialog_info;
+        p.mTitle = getString(R.string.bluetooth_permission_request);
+
+        View view = getLayoutInflater().inflate(R.layout.bluetooth_discoverable, null);
+        p.mView = view;
+        TextView tv = (TextView) view.findViewById(R.id.message);
+
+        if (mNeededToEnableBluetooth) {
+            // RequestPermissionHelperActivity has gotten confirmation from user
+            // to turn on BT
+            tv.setText(getString(R.string.bluetooth_turning_on));
+        } else {
+            // Ask the user whether to turn on discovery mode or not
+            tv.setText(getString(R.string.bluetooth_ask_enablement_and_discovery, mTimeout));
+            p.mPositiveButtonText = getString(R.string.yes);
+            p.mPositiveButtonListener = this;
+            p.mNegativeButtonText = getString(R.string.no);
+            p.mNegativeButtonListener = this;
+        }
+
+        setupAlert();
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode != REQUEST_CODE_START_BT) {
+            Log.e(TAG, "Unexpected onActivityResult " + requestCode + " " + resultCode);
+            setResult(Activity.RESULT_CANCELED);
+            finish();
+            return;
+        }
+        if (resultCode != RESULT_BT_STARTING_OR_STARTED) {
+            setResult(resultCode);
+            finish();
+        }
+
+        // Back from RequestPermissionHelperActivity. User confirmed to enable
+        // BT and discoverable mode.
+        mUserConfirmed = true;
+
+        if (mLocalManager.getBluetoothState() == BluetoothAdapter.STATE_ON) {
+            proceedAndFinish(false);
+        } else {
+            // If BT is not up yet, show "Turning on Bluetooth..."
+            createDialog();
+        }
+    }
+
+    public void onClick(DialogInterface dialog, int which) {
+        switch (which) {
+            case DialogInterface.BUTTON_POSITIVE:
+                proceedAndFinish(true);
+                break;
+
+            case DialogInterface.BUTTON_NEGATIVE:
+                setResult(Activity.RESULT_CANCELED);
+                break;
+        }
+    }
+
+    private void proceedAndFinish(boolean buttonPressed) {
+        int returnCode;
+
+        if (mEnableOnly) {
+            // BT enabled. Done
+            returnCode = Activity.RESULT_OK;
+        } else if (mLocalManager.getBluetoothAdapter().setScanMode(
+                BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE, mTimeout)) {
+            // If already in discoverable mode, this will extend the timeout.
+            persistDiscoverableEndTimestamp(System.currentTimeMillis() + mTimeout * 1000);
+            returnCode = mTimeout;
+            // Activity.RESULT_FIRST_USER should be 1
+            if (returnCode < Activity.RESULT_FIRST_USER) {
+                returnCode = Activity.RESULT_FIRST_USER;
+            }
+        } else {
+            returnCode = Activity.RESULT_CANCELED;
+        }
+
+        setResult(returnCode);
+        if (!buttonPressed) {
+            finish();
+        }
+    }
+
+    private boolean parseIntent() {
+        Intent intent = getIntent();
+        if (intent != null && intent.getAction().equals(BluetoothAdapter.ACTION_REQUEST_ENABLE)) {
+            mEnableOnly = true;
+        } else if (intent != null
+                && intent.getAction().equals(BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE)) {
+            mTimeout = intent.getIntExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION,
+                    BluetoothDiscoverableEnabler.DEFAULT_DISCOVERABLE_TIMEOUT);
+
+            Log.e(TAG, "Timeout = " + mTimeout);
+
+            if (mTimeout > MAX_DISCOVERABLE_TIMEOUT) {
+                mTimeout = MAX_DISCOVERABLE_TIMEOUT;
+            } else if (mTimeout <= 0) {
+                mTimeout = BluetoothDiscoverableEnabler.DEFAULT_DISCOVERABLE_TIMEOUT;
+            }
+        } else {
+            Log.e(TAG, "Error: this activity may be started only with intent "
+                    + BluetoothAdapter.ACTION_REQUEST_ENABLE + " or "
+                    + BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE);
+            setResult(Activity.RESULT_CANCELED);
+            return true;
+        }
+
+        mLocalManager = LocalBluetoothManager.getInstance(this);
+        if (mLocalManager == null) {
+            Log.e(TAG, "Error: there's a problem starting bluetooth");
+            setResult(Activity.RESULT_CANCELED);
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (mNeededToEnableBluetooth) unregisterReceiver(mReceiver);
+    }
+
+    private void persistDiscoverableEndTimestamp(long endTimestamp) {
+        SharedPreferences.Editor editor = mLocalManager.getSharedPreferences().edit();
+        editor.putLong(
+                BluetoothDiscoverableEnabler.SHARED_PREFERENCES_KEY_DISCOVERABLE_END_TIMESTAMP,
+                endTimestamp);
+        editor.commit();
+    }
+
+    @Override
+    public void onBackPressed() {
+        setResult(Activity.RESULT_CANCELED);
+        super.onBackPressed();
+    }
+}
diff --git a/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java b/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java
new file mode 100644
index 00000000000..c8698687f05
--- /dev/null
+++ b/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+import com.android.internal.app.AlertActivity;
+import com.android.internal.app.AlertController;
+import com.android.settings.R;
+
+import android.app.Activity;
+import android.bluetooth.BluetoothAdapter;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.TextView;
+
+/**
+ * RequestPermissionHelperActivity asks the user whether to enable discovery.
+ * This is usually started by RequestPermissionActivity.
+ */
+public class RequestPermissionHelperActivity extends AlertActivity implements
+        DialogInterface.OnClickListener {
+    private static final String TAG = "RequestPermissionHelperActivity";
+
+    public static final String ACTION_INTERNAL_REQUEST_BT_ON =
+        "com.android.settings.bluetooth.ACTION_INTERNAL_REQUEST_BT_ON";
+
+    public static final String ACTION_INTERNAL_REQUEST_BT_ON_AND_DISCOVERABLE =
+        "com.android.settings.bluetooth.ACTION_INTERNAL_REQUEST_BT_ON_AND_DISCOVERABLE";
+
+    private LocalBluetoothManager mLocalManager;
+
+    private int mTimeout;
+
+    // True if requesting BT to be turned on
+    // False if requesting BT to be turned on + discoverable mode
+    private boolean mEnableOnly;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (parseIntent()) {
+            finish();
+            return;
+        }
+
+        createDialog();
+    }
+
+    void createDialog() {
+        final AlertController.AlertParams p = mAlertParams;
+        p.mIconId = android.R.drawable.ic_dialog_info;
+        p.mTitle = getString(R.string.bluetooth_permission_request);
+
+        View view = getLayoutInflater().inflate(R.layout.bluetooth_discoverable, null);
+        p.mView = view;
+        TextView tv = (TextView) view.findViewById(R.id.message);
+
+        if (mEnableOnly) {
+            tv.setText(getString(R.string.bluetooth_ask_enablement));
+        } else {
+            tv.setText(getString(R.string.bluetooth_ask_enablement_and_discovery, mTimeout));
+        }
+
+        p.mPositiveButtonText = getString(R.string.yes);
+        p.mPositiveButtonListener = this;
+        p.mNegativeButtonText = getString(R.string.no);
+        p.mNegativeButtonListener = this;
+
+        setupAlert();
+    }
+
+    public void onClick(DialogInterface dialog, int which) {
+        int returnCode;
+        switch (which) {
+            case DialogInterface.BUTTON_POSITIVE:
+                int btState = 0;
+
+                try {
+                    // TODO There's a better way.
+                    int retryCount = 30;
+                    do {
+                        btState = mLocalManager.getBluetoothState();
+                        Thread.sleep(100);
+                    } while (btState == BluetoothAdapter.STATE_TURNING_OFF && --retryCount > 0);
+                } catch (InterruptedException e) {
+                    // don't care
+                }
+
+                if (btState == BluetoothAdapter.STATE_TURNING_ON
+                        || btState == BluetoothAdapter.STATE_ON
+                        || mLocalManager.getBluetoothAdapter().enable()) {
+                    returnCode = RequestPermissionActivity.RESULT_BT_STARTING_OR_STARTED;
+                } else {
+                    returnCode = Activity.RESULT_CANCELED;
+                }
+                break;
+
+            case DialogInterface.BUTTON_NEGATIVE:
+                returnCode = Activity.RESULT_CANCELED;
+                break;
+            default:
+                return;
+        }
+        setResult(returnCode);
+    }
+
+    private boolean parseIntent() {
+        Intent intent = getIntent();
+        if (intent != null && intent.getAction().equals(ACTION_INTERNAL_REQUEST_BT_ON)) {
+            mEnableOnly = true;
+        } else if (intent != null
+                && intent.getAction().equals(ACTION_INTERNAL_REQUEST_BT_ON_AND_DISCOVERABLE)) {
+            mEnableOnly = false;
+            // Value used for display purposes. Not range checking.
+            mTimeout = intent.getIntExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION,
+                    BluetoothDiscoverableEnabler.DEFAULT_DISCOVERABLE_TIMEOUT);
+        } else {
+            setResult(Activity.RESULT_CANCELED);
+            return true;
+        }
+
+        mLocalManager = LocalBluetoothManager.getInstance(this);
+        if (mLocalManager == null) {
+            Log.e(TAG, "Error: there's a problem starting bluetooth");
+            setResult(Activity.RESULT_CANCELED);
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public void onBackPressed() {
+        setResult(Activity.RESULT_CANCELED);
+        super.onBackPressed();
+    }
+}
diff --git a/src/com/android/settings/bluetooth/SettingsBtStatus.java b/src/com/android/settings/bluetooth/SettingsBtStatus.java
index d2cbef5c53e..e2285e9bca0 100644
--- a/src/com/android/settings/bluetooth/SettingsBtStatus.java
+++ b/src/com/android/settings/bluetooth/SettingsBtStatus.java
@@ -26,9 +26,9 @@ import com.android.settings.R;
  */
 public class SettingsBtStatus {
     private static final String TAG = "SettingsBtStatus";
-   
+
     // Connection status
-    
+
     public static final int CONNECTION_STATUS_UNKNOWN = 0;
     public static final int CONNECTION_STATUS_ACTIVE = 1;
     /** Use {@link #isConnected} to check for the connected state */
@@ -55,24 +55,24 @@ public class SettingsBtStatus {
             return 0;
         }
     }
-    
+
     public static final boolean isConnectionStatusConnected(int connectionStatus) {
         return connectionStatus == CONNECTION_STATUS_ACTIVE
                 || connectionStatus == CONNECTION_STATUS_CONNECTED;
     }
-    
+
     public static final boolean isConnectionStatusBusy(int connectionStatus) {
         return connectionStatus == CONNECTION_STATUS_CONNECTING
                 || connectionStatus == CONNECTION_STATUS_DISCONNECTING;
     }
-    
+
     public static final int getPairingStatusSummary(int bondState) {
         switch (bondState) {
         case BluetoothDevice.BOND_BONDED:
             return R.string.bluetooth_paired;
         case BluetoothDevice.BOND_BONDING:
             return R.string.bluetooth_pairing;
-        case BluetoothDevice.BOND_NOT_BONDED:
+        case BluetoothDevice.BOND_NONE:
             return R.string.bluetooth_not_connected;
         default:
             return 0;
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index 7d22d913a85..a736cc06e49 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.deviceinfo;
 
-import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -377,7 +377,7 @@ public class Status extends PreferenceActivity {
     }
 
     private void setBtStatus() {
-        BluetoothDevice bluetooth = (BluetoothDevice) getSystemService(BLUETOOTH_SERVICE);
+        BluetoothAdapter bluetooth = BluetoothAdapter.getDefaultAdapter();
         Preference btAddressPref = findPreference(KEY_BT_ADDRESS);
 
         if (bluetooth == null) {
@@ -393,7 +393,6 @@ public class Status extends PreferenceActivity {
     void updateTimes() {
         long at = SystemClock.uptimeMillis() / 1000;
         long ut = SystemClock.elapsedRealtime() / 1000;
-        long st = ut - at;
 
         if (ut == 0) {
             ut = 1;
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 10c9a43054e..10ab2d00f40 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -295,7 +295,12 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
     private void processAppUsage() {
         SensorManager sensorManager = (SensorManager)getSystemService(Context.SENSOR_SERVICE);
         final int which = mStatsType;
-        final double powerCpuNormal = mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_NORMAL);
+        final int speedSteps = mPowerProfile.getNumSpeedSteps();
+        final double[] powerCpuNormal = new double[speedSteps];
+        final long[] cpuSpeedStepTimes = new long[speedSteps];
+        for (int p = 0; p < speedSteps; p++) {
+            powerCpuNormal[p] = mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_ACTIVE, p);
+        }
         final double averageCostPerByte = getAverageDataCost();
         long uSecTime = mStats.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000, which);
         updateStatsPeriod(uSecTime);
@@ -322,7 +327,19 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
                     final long foregroundTime = ps.getForegroundTime(which);
                     cpuFgTime += foregroundTime * 10; // convert to millis
                     final long tmpCpuTime = (userTime + systemTime) * 10; // convert to millis
-                    final double processPower = tmpCpuTime * powerCpuNormal;
+                    int totalTimeAtSpeeds = 0;
+                    // Get the total first
+                    for (int step = 0; step < speedSteps; step++) {
+                        cpuSpeedStepTimes[step] = ps.getTimeAtCpuSpeedStep(step, which);
+                        totalTimeAtSpeeds += cpuSpeedStepTimes[step];
+                    }
+                    if (totalTimeAtSpeeds == 0) totalTimeAtSpeeds = 1;
+                    // Then compute the ratio of time spent at each speed
+                    double processPower = 0;
+                    for (int step = 0; step < speedSteps; step++) {
+                        double ratio = (double) cpuSpeedStepTimes[step] / totalTimeAtSpeeds;
+                        processPower += ratio * tmpCpuTime * powerCpuNormal[step];
+                    }
                     cpuTime += tmpCpuTime;
                     power += processPower;
                     if (highestDrain < processPower) {
@@ -394,7 +411,7 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
         double phoneOnPower = mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ACTIVE)
                 * phoneOnTimeMs / 1000;
         addEntry(getString(R.string.power_phone), DrainType.PHONE, phoneOnTimeMs,
-                android.R.drawable.ic_menu_call, phoneOnPower);
+                R.drawable.ic_settings_voice_calls, phoneOnPower);
     }
 
     private void addScreenUsage(long uSecNow) {
@@ -415,7 +432,7 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
         }
         power /= 1000; // To seconds
         addEntry(getString(R.string.power_screen), DrainType.SCREEN, screenOnTimeMs,
-                android.R.drawable.ic_menu_view, power);
+                R.drawable.ic_settings_display, power);
     }
 
     private void addRadioUsage(long uSecNow) {
@@ -428,9 +445,12 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
                     * mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ON, i);
             signalTimeMs += strengthTimeMs;
         }
+        long scanningTimeMs = mStats.getPhoneSignalScanningTime(uSecNow, mStatsType) / 1000;
+        power += scanningTimeMs / 1000 * mPowerProfile.getAveragePower(
+                PowerProfile.POWER_RADIO_SCANNING);
         BatterySipper bs =
                 addEntry(getString(R.string.power_cell), DrainType.CELL, signalTimeMs,
-                android.R.drawable.ic_menu_sort_by_size, power);
+                R.drawable.ic_settings_cell_standby, power);
         if (signalTimeMs != 0) {
             bs.noCoveragePercent = mStats.getPhoneSignalStrengthTime(0, uSecNow, mStatsType)
                     / 1000 * 100.0 / signalTimeMs;
@@ -444,7 +464,7 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
                 * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)
             + runningTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)) / 1000;
         addEntry(getString(R.string.power_wifi), DrainType.WIFI, runningTimeMs,
-                R.drawable.ic_wifi_signal_4, wifiPower);
+                R.drawable.ic_settings_wifi, wifiPower);
     }
 
     private void addIdleUsage(long uSecNow) {
@@ -452,7 +472,7 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
         double idlePower = (idleTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_IDLE))
                 / 1000;
         addEntry(getString(R.string.power_idle), DrainType.IDLE, idleTimeMs,
-                android.R.drawable.ic_lock_power_off, idlePower);
+                R.drawable.ic_settings_phone_idle, idlePower);
     }
 
     private void addBluetoothUsage(long uSecNow) {
@@ -464,7 +484,7 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
                 * mPowerProfile.getAveragePower(PowerProfile.POWER_BLUETOOTH_AT_CMD)) / 1000;
 
         addEntry(getString(R.string.power_bluetooth), DrainType.BLUETOOTH, btOnTimeMs,
-                com.android.internal.R.drawable.ic_volume_bluetooth_in_call, btPower);
+                R.drawable.ic_settings_bluetooth, btPower);
     }
 
     private double getAverageDataCost() {
@@ -602,6 +622,8 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
                 } else if ("mediaserver".equals(name)) {
                     name = getResources().getString(R.string.process_mediaserver_label);
                 }
+                iconId = R.drawable.ic_power_system;
+                icon = getResources().getDrawable(iconId);
                 return;
             } else {
                 //name = packages[0];
diff --git a/src/com/android/settings/quicklaunch/QuickLaunchSettings.java b/src/com/android/settings/quicklaunch/QuickLaunchSettings.java
index 40316b567df..fb9fbcdea0d 100644
--- a/src/com/android/settings/quicklaunch/QuickLaunchSettings.java
+++ b/src/com/android/settings/quicklaunch/QuickLaunchSettings.java
@@ -226,8 +226,7 @@ public class QuickLaunchSettings extends PreferenceActivity implements
                 Log.w(TAG, "Result from bookmark picker does not have an intent.");
                 return;
             }
-            
-            String title = data.getStringExtra(BookmarkPicker.EXTRA_TITLE);
+
             char shortcut = data.getCharExtra(BookmarkPicker.EXTRA_SHORTCUT, (char) 0);
             updateShortcut(shortcut, data);
             
diff --git a/src/com/android/settings/vpn/L2tpEditor.java b/src/com/android/settings/vpn/L2tpEditor.java
index 29036f23b88..05d51d637cf 100644
--- a/src/com/android/settings/vpn/L2tpEditor.java
+++ b/src/com/android/settings/vpn/L2tpEditor.java
@@ -57,7 +57,7 @@ class L2tpEditor extends VpnProfileEditor {
         final L2tpProfile profile = (L2tpProfile) getProfile();
         CheckBoxPreference secret = mSecret = new CheckBoxPreference(c);
         boolean enabled = profile.isSecretEnabled();
-        setSecretTitle(secret, R.string.vpn_l2tp_secret, enabled);
+        setCheckBoxTitle(secret, R.string.vpn_l2tp_secret);
         secret.setChecked(enabled);
         setSecretSummary(secret, enabled);
         secret.setOnPreferenceChangeListener(
@@ -67,8 +67,6 @@ class L2tpEditor extends VpnProfileEditor {
                         boolean enabled = (Boolean) newValue;
                         profile.setSecretEnabled(enabled);
                         mSecretHandler.getPreference().setEnabled(enabled);
-                        setSecretTitle(mSecret, R.string.vpn_l2tp_secret,
-                                enabled);
                         setSecretSummary(mSecret, enabled);
                         return true;
                     }
diff --git a/src/com/android/settings/vpn/L2tpIpsecEditor.java b/src/com/android/settings/vpn/L2tpIpsecEditor.java
index b14feb32d2c..276ee2fca6d 100644
--- a/src/com/android/settings/vpn/L2tpIpsecEditor.java
+++ b/src/com/android/settings/vpn/L2tpIpsecEditor.java
@@ -24,7 +24,8 @@ import android.preference.EditTextPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
-import android.security.CertTool;
+import android.security.Credentials;
+import android.security.KeyStore;
 import android.text.TextUtils;
 
 /**
@@ -33,6 +34,8 @@ import android.text.TextUtils;
 class L2tpIpsecEditor extends L2tpEditor {
     private static final String TAG = L2tpIpsecEditor.class.getSimpleName();
 
+    private KeyStore mKeyStore = KeyStore.getInstance();
+
     private ListPreference mUserCertificate;
     private ListPreference mCaCertificate;
 
@@ -67,7 +70,7 @@ class L2tpIpsecEditor extends L2tpEditor {
         mUserCertificate = createListPreference(c,
                 R.string.vpn_user_certificate_title,
                 mProfile.getUserCertificate(),
-                CertTool.getInstance().getAllUserCertificateKeys(),
+                mKeyStore.saw(Credentials.USER_CERTIFICATE),
                 new Preference.OnPreferenceChangeListener() {
                     public boolean onPreferenceChange(
                             Preference pref, Object newValue) {
@@ -86,7 +89,7 @@ class L2tpIpsecEditor extends L2tpEditor {
         mCaCertificate = createListPreference(c,
                 R.string.vpn_ca_certificate_title,
                 mProfile.getCaCertificate(),
-                CertTool.getInstance().getAllCaCertificateKeys(),
+                mKeyStore.saw(Credentials.CA_CERTIFICATE),
                 new Preference.OnPreferenceChangeListener() {
                     public boolean onPreferenceChange(
                             Preference pref, Object newValue) {
diff --git a/src/com/android/settings/vpn/PptpEditor.java b/src/com/android/settings/vpn/PptpEditor.java
index fafe6a76bb7..cfb3fa38710 100644
--- a/src/com/android/settings/vpn/PptpEditor.java
+++ b/src/com/android/settings/vpn/PptpEditor.java
@@ -45,7 +45,7 @@ class PptpEditor extends VpnProfileEditor {
         final PptpProfile profile = (PptpProfile) getProfile();
         CheckBoxPreference encryption = mEncryption = new CheckBoxPreference(c);
         boolean enabled = profile.isEncryptionEnabled();
-        setSecretTitle(encryption, R.string.vpn_pptp_encryption_title, enabled);
+        setCheckBoxTitle(encryption, R.string.vpn_pptp_encryption_title);
         encryption.setChecked(enabled);
         setEncryptionSummary(encryption, enabled);
         encryption.setOnPreferenceChangeListener(
@@ -54,8 +54,6 @@ class PptpEditor extends VpnProfileEditor {
                             Preference pref, Object newValue) {
                         boolean enabled = (Boolean) newValue;
                         profile.setEncryptionEnabled(enabled);
-                        setSecretTitle(mEncryption,
-                                R.string.vpn_pptp_encryption_title, enabled);
                         setEncryptionSummary(mEncryption, enabled);
                         return true;
                     }
diff --git a/src/com/android/settings/vpn/VpnProfileEditor.java b/src/com/android/settings/vpn/VpnProfileEditor.java
index 8dc36431769..100b78e7e75 100644
--- a/src/com/android/settings/vpn/VpnProfileEditor.java
+++ b/src/com/android/settings/vpn/VpnProfileEditor.java
@@ -174,12 +174,9 @@ class VpnProfileEditor {
                 : v);
     }
 
-    protected void setSecretTitle(
-            CheckBoxPreference pref, int fieldNameId, boolean enabled) {
+    protected void setCheckBoxTitle(CheckBoxPreference pref, int fieldNameId) {
         Context c = pref.getContext();
-        String formatString = enabled
-                ? c.getString(R.string.vpn_disable_field)
-                : c.getString(R.string.vpn_enable_field);
+        String formatString = c.getString(R.string.vpn_enable_field);
         pref.setTitle(String.format(formatString, c.getString(fieldNameId)));
     }
 
diff --git a/src/com/android/settings/vpn/VpnSettings.java b/src/com/android/settings/vpn/VpnSettings.java
index 7d4ea2516a0..d3803752555 100644
--- a/src/com/android/settings/vpn/VpnSettings.java
+++ b/src/com/android/settings/vpn/VpnSettings.java
@@ -47,8 +47,8 @@ import android.preference.PreferenceCategory;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.preference.Preference.OnPreferenceClickListener;
-import android.security.CertTool;
-import android.security.Keystore;
+import android.security.Credentials;
+import android.security.KeyStore;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.ContextMenu;
@@ -104,20 +104,13 @@ public class VpnSettings extends PreferenceActivity implements
     private static final int CONNECT_BUTTON = DialogInterface.BUTTON1;
     private static final int OK_BUTTON = DialogInterface.BUTTON1;
 
-    private static final int DIALOG_CONNECT = 1;
-    private static final int DIALOG_RECONNECT = 2;
-    private static final int DIALOG_AUTH_ERROR = 3;
-    private static final int DIALOG_UNKNOWN_SERVER = 4;
-    private static final int DIALOG_SECRET_NOT_SET = 5;
-    private static final int DIALOG_CHALLENGE_ERROR = 6;
-    private static final int DIALOG_REMOTE_HUNG_UP_ERROR = 7;
-    private static final int DIALOG_CONNECTION_LOST = 8;
+    private static final int DIALOG_CONNECT = VpnManager.VPN_ERROR_LARGEST + 1;
+    private static final int DIALOG_SECRET_NOT_SET = DIALOG_CONNECT + 1;
 
-    private static final int NO_ERROR = 0;
+    private static final int NO_ERROR = VpnManager.VPN_ERROR_NO_ERROR;
 
-    private static final String NAMESPACE_VPN = "vpn";
-    private static final String KEY_PREFIX_IPSEC_PSK = "ipsk000";
-    private static final String KEY_PREFIX_L2TP_SECRET = "lscrt000";
+    private static final String KEY_PREFIX_IPSEC_PSK = Credentials.VPN + 'i';
+    private static final String KEY_PREFIX_L2TP_SECRET = Credentials.VPN + 'l';
 
     private PreferenceScreen mAddVpn;
     private PreferenceCategory mVpnListContainer;
@@ -135,6 +128,8 @@ public class VpnSettings extends PreferenceActivity implements
     // states saved for unlocking keystore
     private Runnable mUnlockAction;
 
+    private KeyStore mKeyStore = KeyStore.getInstance();
+
     private VpnManager mVpnManager = new VpnManager(this);
 
     private ConnectivityReceiver mConnectivityReceiver =
@@ -178,7 +173,7 @@ public class VpnSettings extends PreferenceActivity implements
     public void onResume() {
         super.onResume();
 
-        if ((mUnlockAction != null) && isKeystoreUnlocked()) {
+        if ((mUnlockAction != null) && isKeyStoreUnlocked()) {
             Runnable action = mUnlockAction;
             mUnlockAction = null;
             runOnUiThread(action);
@@ -201,29 +196,17 @@ public class VpnSettings extends PreferenceActivity implements
             case DIALOG_CONNECT:
                 return createConnectDialog();
 
-            case DIALOG_RECONNECT:
-                return createReconnectDialog();
-
-            case DIALOG_AUTH_ERROR:
-                return createAuthErrorDialog();
-
-            case DIALOG_REMOTE_HUNG_UP_ERROR:
-                return createRemoteHungUpErrorDialog();
-
-            case DIALOG_CHALLENGE_ERROR:
-                return createChallengeErrorDialog();
-
-            case DIALOG_UNKNOWN_SERVER:
-                return createUnknownServerDialog();
-
             case DIALOG_SECRET_NOT_SET:
                 return createSecretNotSetDialog();
 
-            case DIALOG_CONNECTION_LOST:
-                return createConnectionLostDialog();
+            case VpnManager.VPN_ERROR_CHALLENGE:
+            case VpnManager.VPN_ERROR_UNKNOWN_SERVER:
+            case VpnManager.VPN_ERROR_PPP_NEGOTIATION_FAILED:
+                return createEditDialog(id);
 
             default:
-                return super.onCreateDialog(id);
+                Log.d(TAG, "create reconnect dialog for event " + id);
+                return createReconnectDialog(id);
         }
     }
 
@@ -239,40 +222,56 @@ public class VpnSettings extends PreferenceActivity implements
                 .setOnCancelListener(new DialogInterface.OnCancelListener() {
                             public void onCancel(DialogInterface dialog) {
                                 removeDialog(DIALOG_CONNECT);
-                                onIdle();
+                                changeState(mActiveProfile, VpnState.IDLE);
                             }
                         })
                 .create();
     }
 
-    private Dialog createReconnectDialog() {
-        return createCommonDialogBuilder()
-                .setMessage(R.string.vpn_confirm_reconnect)
-                .create();
+    private Dialog createReconnectDialog(int id) {
+        int msgId;
+        switch (id) {
+            case VpnManager.VPN_ERROR_AUTH:
+                msgId = R.string.vpn_auth_error_dialog_msg;
+                break;
+
+            case VpnManager.VPN_ERROR_REMOTE_HUNG_UP:
+                msgId = R.string.vpn_remote_hung_up_error_dialog_msg;
+                break;
+
+            case VpnManager.VPN_ERROR_CONNECTION_LOST:
+                msgId = R.string.vpn_reconnect_from_lost;
+                break;
+
+            case VpnManager.VPN_ERROR_REMOTE_PPP_HUNG_UP:
+                msgId = R.string.vpn_remote_ppp_hung_up_error_dialog_msg;
+                break;
+
+            default:
+                msgId = R.string.vpn_confirm_reconnect;
+        }
+        return createCommonDialogBuilder().setMessage(msgId).create();
     }
 
-    private Dialog createAuthErrorDialog() {
-        return createCommonDialogBuilder()
-                .setMessage(R.string.vpn_auth_error_dialog_msg)
-                .create();
-    }
+    private Dialog createEditDialog(int id) {
+        int msgId;
+        switch (id) {
+            case VpnManager.VPN_ERROR_CHALLENGE:
+                msgId = R.string.vpn_challenge_error_dialog_msg;
+                break;
 
-    private Dialog createRemoteHungUpErrorDialog() {
-        return createCommonDialogBuilder()
-                .setMessage(R.string.vpn_remote_hung_up_error_dialog_msg)
-                .create();
-    }
+            case VpnManager.VPN_ERROR_UNKNOWN_SERVER:
+                msgId = R.string.vpn_unknown_server_dialog_msg;
+                break;
 
-    private Dialog createChallengeErrorDialog() {
-        return createCommonEditDialogBuilder()
-                .setMessage(R.string.vpn_challenge_error_dialog_msg)
-                .create();
-    }
+            case VpnManager.VPN_ERROR_PPP_NEGOTIATION_FAILED:
+                msgId = R.string.vpn_ppp_negotiation_failed_dialog_msg;
+                break;
 
-    private Dialog createUnknownServerDialog() {
-        return createCommonEditDialogBuilder()
-                .setMessage(R.string.vpn_unknown_server_dialog_msg)
-                .create();
+            default:
+                return null;
+        }
+        return createCommonEditDialogBuilder().setMessage(msgId).create();
     }
 
     private Dialog createSecretNotSetDialog() {
@@ -299,12 +298,6 @@ public class VpnSettings extends PreferenceActivity implements
                         });
     }
 
-    private Dialog createConnectionLostDialog() {
-        return createCommonDialogBuilder()
-                .setMessage(R.string.vpn_reconnect_from_lost)
-                .create();
-    }
-
     private AlertDialog.Builder createCommonDialogBuilder() {
         return new AlertDialog.Builder(this)
                 .setTitle(android.R.string.dialog_alert_title)
@@ -410,13 +403,13 @@ public class VpnSettings extends PreferenceActivity implements
                 return;
             }
 
-            if (needKeystoreToSave(p)) {
+            if (needKeyStoreToSave(p)) {
                 Runnable action = new Runnable() {
                     public void run() {
                         onActivityResult(requestCode, resultCode, data);
                     }
                 };
-                if (!unlockKeystore(p, action)) return;
+                if (!unlockKeyStore(p, action)) return;
             }
 
             try {
@@ -451,7 +444,6 @@ public class VpnSettings extends PreferenceActivity implements
             Dialog d = (Dialog) dialog;
             String error = mConnectingActor.validateInputs(d);
             if (error == null) {
-                changeState(mActiveProfile, VpnState.CONNECTING);
                 mConnectingActor.connect(d);
                 removeDialog(DIALOG_CONNECT);
                 return;
@@ -475,7 +467,7 @@ public class VpnSettings extends PreferenceActivity implements
             }
         } else {
             removeDialog(DIALOG_CONNECT);
-            onIdle();
+            changeState(mActiveProfile, VpnState.IDLE);
         }
     }
 
@@ -619,22 +611,26 @@ public class VpnSettings extends PreferenceActivity implements
         startActivityForResult(intent, REQUEST_SELECT_VPN_TYPE);
     }
 
-    private boolean isKeystoreUnlocked() {
-        return (Keystore.getInstance().getState() == Keystore.UNLOCKED);
-    }
-
-
-    // Returns true if the profile needs to access keystore
-    private boolean needKeystoreToSave(VpnProfile p) {
-        return needKeystoreToConnect(p);
+    private boolean isKeyStoreUnlocked() {
+        return mKeyStore.test() == KeyStore.NO_ERROR;
     }
 
     // Returns true if the profile needs to access keystore
-    private boolean needKeystoreToEdit(VpnProfile p) {
+    private boolean needKeyStoreToSave(VpnProfile p) {
         switch (p.getType()) {
-            case L2TP_IPSEC:
             case L2TP_IPSEC_PSK:
-                return true;
+                L2tpIpsecPskProfile pskProfile = (L2tpIpsecPskProfile) p;
+                String presharedKey = pskProfile.getPresharedKey();
+                if (!TextUtils.isEmpty(presharedKey)) return true;
+                // pass through
+
+            case L2TP:
+                L2tpProfile l2tpProfile = (L2tpProfile) p;
+                if (l2tpProfile.isSecretEnabled() &&
+                        !TextUtils.isEmpty(l2tpProfile.getSecretString())) {
+                    return true;
+                }
+                // pass through
 
             default:
                 return false;
@@ -642,7 +638,7 @@ public class VpnSettings extends PreferenceActivity implements
     }
 
     // Returns true if the profile needs to access keystore
-    private boolean needKeystoreToConnect(VpnProfile p) {
+    private boolean needKeyStoreToConnect(VpnProfile p) {
         switch (p.getType()) {
             case L2TP_IPSEC:
             case L2TP_IPSEC_PSK:
@@ -657,46 +653,34 @@ public class VpnSettings extends PreferenceActivity implements
     }
 
     // Returns true if keystore is unlocked or keystore is not a concern
-    private boolean unlockKeystore(VpnProfile p, Runnable action) {
-        if (isKeystoreUnlocked()) return true;
+    private boolean unlockKeyStore(VpnProfile p, Runnable action) {
+        if (isKeyStoreUnlocked()) return true;
         mUnlockAction = action;
-        startActivity(
-                new Intent(SecuritySettings.ACTION_UNLOCK_CREDENTIAL_STORAGE));
+        Credentials.getInstance().unlock(this);
         return false;
     }
 
     private void startVpnEditor(final VpnProfile profile) {
-        if (needKeystoreToEdit(profile)) {
-            Runnable action = new Runnable() {
-                public void run() {
-                    startVpnEditor(profile);
-                }
-            };
-            if (!unlockKeystore(profile, action)) return;
-        }
-
         Intent intent = new Intent(this, VpnEditor.class);
         intent.putExtra(KEY_VPN_PROFILE, (Parcelable) profile);
         startActivityForResult(intent, REQUEST_ADD_OR_EDIT_PROFILE);
     }
 
     private synchronized void connect(final VpnProfile p) {
-        if (needKeystoreToConnect(p)) {
+        if (needKeyStoreToConnect(p)) {
             Runnable action = new Runnable() {
                 public void run() {
                     connect(p);
                 }
             };
-            if (!unlockKeystore(p, action)) return;
+            if (!unlockKeyStore(p, action)) return;
         }
 
-        mConnectingActor = getActor(p);
-        mActiveProfile = p;
         if (!checkSecrets(p)) return;
+        changeState(p, VpnState.CONNECTING);
         if (mConnectingActor.isConnectDialogNeeded()) {
             showDialog(DIALOG_CONNECT);
         } else {
-            changeState(p, VpnState.CONNECTING);
             mConnectingActor.connect(null);
         }
     }
@@ -737,7 +721,10 @@ public class VpnSettings extends PreferenceActivity implements
             break;
 
         case CONNECTING:
+            mConnectingActor = getActor(p);
+            // pass through
         case DISCONNECTING:
+            mActiveProfile = p;
             disableProfilePreferencesIfOneActive();
             break;
 
@@ -748,36 +735,12 @@ public class VpnSettings extends PreferenceActivity implements
         case IDLE:
             assert(mActiveProfile == p);
 
-            switch (mConnectingErrorCode) {
-                case NO_ERROR:
-                    onIdle();
-                    break;
-
-                case VpnManager.VPN_ERROR_AUTH:
-                    showDialog(DIALOG_AUTH_ERROR);
-                    break;
-
-                case VpnManager.VPN_ERROR_REMOTE_HUNG_UP:
-                    showDialog(DIALOG_REMOTE_HUNG_UP_ERROR);
-                    break;
-
-                case VpnManager.VPN_ERROR_CHALLENGE:
-                    showDialog(DIALOG_CHALLENGE_ERROR);
-                    break;
-
-                case VpnManager.VPN_ERROR_UNKNOWN_SERVER:
-                    showDialog(DIALOG_UNKNOWN_SERVER);
-                    break;
-
-                case VpnManager.VPN_ERROR_CONNECTION_LOST:
-                    showDialog(DIALOG_CONNECTION_LOST);
-                    break;
-
-                default:
-                    showDialog(DIALOG_RECONNECT);
-                    break;
+            if (mConnectingErrorCode == NO_ERROR) {
+                onIdle();
+            } else {
+                showDialog(mConnectingErrorCode);
+                mConnectingErrorCode = NO_ERROR;
             }
-            mConnectingErrorCode = NO_ERROR;
             break;
         }
     }
@@ -920,43 +883,32 @@ public class VpnSettings extends PreferenceActivity implements
         return mVpnManager.createVpnProfile(Enum.valueOf(VpnType.class, type));
     }
 
-    private String keyNameForDaemon(String keyName) {
-        return NAMESPACE_VPN + "_" + keyName;
-    }
-
     private boolean checkSecrets(VpnProfile p) {
-        Keystore ks = Keystore.getInstance();
-        HashSet<String> secretSet = new HashSet<String>();
         boolean secretMissing = false;
 
         if (p instanceof L2tpIpsecProfile) {
             L2tpIpsecProfile certProfile = (L2tpIpsecProfile) p;
-            CertTool certTool = CertTool.getInstance();
-            Collections.addAll(secretSet, certTool.getAllCaCertificateKeys());
+
             String cert = certProfile.getCaCertificate();
-            if (TextUtils.isEmpty(cert) || !secretSet.contains(cert)) {
+            if (TextUtils.isEmpty(cert) ||
+                    !mKeyStore.contains(Credentials.CA_CERTIFICATE + cert)) {
                 certProfile.setCaCertificate(null);
                 secretMissing = true;
             }
 
-            secretSet.clear();
-            Collections.addAll(secretSet, certTool.getAllUserCertificateKeys());
             cert = certProfile.getUserCertificate();
-            if (TextUtils.isEmpty(cert) || !secretSet.contains(cert)) {
+            if (TextUtils.isEmpty(cert) ||
+                    !mKeyStore.contains(Credentials.USER_CERTIFICATE + cert)) {
                 certProfile.setUserCertificate(null);
                 secretMissing = true;
             }
         }
 
-        secretSet.clear();
-        Collections.addAll(secretSet, ks.listKeys(NAMESPACE_VPN));
-
         if (p instanceof L2tpIpsecPskProfile) {
             L2tpIpsecPskProfile pskProfile = (L2tpIpsecPskProfile) p;
             String presharedKey = pskProfile.getPresharedKey();
-            String keyName = KEY_PREFIX_IPSEC_PSK + p.getId();
-            if (TextUtils.isEmpty(presharedKey)
-                    || !secretSet.contains(keyName)) {
+            String key = KEY_PREFIX_IPSEC_PSK + p.getId();
+            if (TextUtils.isEmpty(presharedKey) || !mKeyStore.contains(key)) {
                 pskProfile.setPresharedKey(null);
                 secretMissing = true;
             }
@@ -966,9 +918,8 @@ public class VpnSettings extends PreferenceActivity implements
             L2tpProfile l2tpProfile = (L2tpProfile) p;
             if (l2tpProfile.isSecretEnabled()) {
                 String secret = l2tpProfile.getSecretString();
-                String keyName = KEY_PREFIX_L2TP_SECRET + p.getId();
-                if (TextUtils.isEmpty(secret)
-                        || !secretSet.contains(keyName)) {
+                String key = KEY_PREFIX_L2TP_SECRET + p.getId();
+                if (TextUtils.isEmpty(secret) || !mKeyStore.contains(key)) {
                     l2tpProfile.setSecretString(null);
                     secretMissing = true;
                 }
@@ -976,6 +927,7 @@ public class VpnSettings extends PreferenceActivity implements
         }
 
         if (secretMissing) {
+            mActiveProfile = p;
             showDialog(DIALOG_SECRET_NOT_SET);
             return false;
         } else {
@@ -984,35 +936,31 @@ public class VpnSettings extends PreferenceActivity implements
     }
 
     private void processSecrets(VpnProfile p) {
-        Keystore ks = Keystore.getInstance();
         switch (p.getType()) {
             case L2TP_IPSEC_PSK:
                 L2tpIpsecPskProfile pskProfile = (L2tpIpsecPskProfile) p;
                 String presharedKey = pskProfile.getPresharedKey();
-                String keyName = KEY_PREFIX_IPSEC_PSK + p.getId();
-                if (!TextUtils.isEmpty(presharedKey)) {
-                    int ret = ks.put(NAMESPACE_VPN, keyName, presharedKey);
-                    if (ret != 0) {
-                        Log.e(TAG, "keystore write failed: key=" + keyName);
-                    }
+                String key = KEY_PREFIX_IPSEC_PSK + p.getId();
+                if (!TextUtils.isEmpty(presharedKey) &&
+                        !mKeyStore.put(key, presharedKey)) {
+                    Log.e(TAG, "keystore write failed: key=" + key);
                 }
-                pskProfile.setPresharedKey(keyNameForDaemon(keyName));
+                pskProfile.setPresharedKey(key);
                 // pass through
 
+            case L2TP_IPSEC:
             case L2TP:
                 L2tpProfile l2tpProfile = (L2tpProfile) p;
-                keyName = KEY_PREFIX_L2TP_SECRET + p.getId();
+                key = KEY_PREFIX_L2TP_SECRET + p.getId();
                 if (l2tpProfile.isSecretEnabled()) {
                     String secret = l2tpProfile.getSecretString();
-                    if (!TextUtils.isEmpty(secret)) {
-                        int ret = ks.put(NAMESPACE_VPN, keyName, secret);
-                        if (ret != 0) {
-                            Log.e(TAG, "keystore write failed: key=" + keyName);
-                        }
+                    if (!TextUtils.isEmpty(secret) &&
+                            !mKeyStore.put(key, secret)) {
+                        Log.e(TAG, "keystore write failed: key=" + key);
                     }
-                    l2tpProfile.setSecretString(keyNameForDaemon(keyName));
+                    l2tpProfile.setSecretString(key);
                 } else {
-                    ks.remove(NAMESPACE_VPN, keyName);
+                    mKeyStore.delete(key);
                 }
                 break;
         }
diff --git a/src/com/android/settings/vpn/VpnTypeSelection.java b/src/com/android/settings/vpn/VpnTypeSelection.java
index e74fb43b2a4..aa4bc5e30be 100644
--- a/src/com/android/settings/vpn/VpnTypeSelection.java
+++ b/src/com/android/settings/vpn/VpnTypeSelection.java
@@ -60,7 +60,7 @@ public class VpnTypeSelection extends PreferenceActivity {
 
             Preference pref = new Preference(this);
             pref.setTitle(message);
-            pref.setSummary(t.getDescription());
+            pref.setSummary(t.getDescriptionId());
             root.addPreference(pref);
         }
     }
diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
index d8747c939b3..3db90cfe236 100644
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
@@ -19,7 +19,7 @@ package com.android.settings.widget;
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
-import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothAdapter;
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -30,12 +30,13 @@ import android.location.LocationManager;
 import android.net.ConnectivityManager;
 import android.net.Uri;
 import android.net.wifi.WifiManager;
-import android.os.IHardwareService;
+import android.os.IPowerManager;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.provider.Settings;
 import android.util.Log;
 import android.widget.RemoteViews;
+import android.widget.Toast;
 import com.android.settings.R;
 import com.android.settings.bluetooth.LocalBluetoothManager;
 
@@ -143,39 +144,51 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
     private static void updateButtons(RemoteViews views, Context context) {
         switch (getWifiState(context)) {
             case STATE_DISABLED:
-                views.setImageViewResource(R.id.btn_wifi, R.drawable.widget_btn_wifi_off);
+                views.setImageViewResource(R.id.img_wifi, R.drawable.ic_appwidget_settings_wifi_off);
+                views.setImageViewResource(R.id.ind_wifi, R.drawable.appwidget_settings_ind_off_l);
                 break;
             case STATE_ENABLED:
-                views.setImageViewResource(R.id.btn_wifi, R.drawable.widget_btn_wifi);
+                views.setImageViewResource(R.id.img_wifi, R.drawable.ic_appwidget_settings_wifi_on);
+                views.setImageViewResource(R.id.ind_wifi, R.drawable.appwidget_settings_ind_on_l);
                 break;
             case STATE_INTERMEDIATE:
-                views.setImageViewResource(R.id.btn_wifi, R.drawable.widget_btn_wifi_gray);
+                views.setImageViewResource(R.id.img_wifi, R.drawable.ic_appwidget_settings_wifi_off);
+                views.setImageViewResource(R.id.ind_wifi, R.drawable.appwidget_settings_ind_mid_l);
                 break;
         }
         if (getBrightness(context)) {
-            views.setImageViewResource(R.id.btn_brightness, R.drawable.widget_btn_brightness);
+            views.setImageViewResource(R.id.img_brightness, R.drawable.ic_appwidget_settings_brightness_on);
+            views.setImageViewResource(R.id.ind_brightness, R.drawable.appwidget_settings_ind_on_r);
         } else {
-            views.setImageViewResource(R.id.btn_brightness, R.drawable.widget_btn_brightness_off);
+            views.setImageViewResource(R.id.img_brightness, R.drawable.ic_appwidget_settings_brightness_off);
+            views.setImageViewResource(R.id.ind_brightness, R.drawable.appwidget_settings_ind_off_r);
         }
-        if (getBackgroundDataState(context)) {
-            views.setImageViewResource(R.id.btn_sync, R.drawable.widget_btn_sync);
+        if (getSync(context)) {
+            views.setImageViewResource(R.id.img_sync, R.drawable.ic_appwidget_settings_sync_on);
+            views.setImageViewResource(R.id.ind_sync, R.drawable.appwidget_settings_ind_on_c);
         } else {
-            views.setImageViewResource(R.id.btn_sync, R.drawable.widget_btn_sync_off);
+            views.setImageViewResource(R.id.img_sync, R.drawable.ic_appwidget_settings_sync_off);
+            views.setImageViewResource(R.id.ind_sync, R.drawable.appwidget_settings_ind_off_c);
         }
         if (getGpsState(context)) {
-            views.setImageViewResource(R.id.btn_gps, R.drawable.widget_btn_gps);
+            views.setImageViewResource(R.id.img_gps, R.drawable.ic_appwidget_settings_gps_on);
+            views.setImageViewResource(R.id.ind_gps, R.drawable.appwidget_settings_ind_on_c);
         } else {
-            views.setImageViewResource(R.id.btn_gps, R.drawable.widget_btn_gps_off);
+            views.setImageViewResource(R.id.img_gps, R.drawable.ic_appwidget_settings_gps_off);
+            views.setImageViewResource(R.id.ind_gps, R.drawable.appwidget_settings_ind_off_c);
         }
         switch (getBluetoothState(context)) {
             case STATE_DISABLED:
-                views.setImageViewResource(R.id.btn_bluetooth, R.drawable.widget_btn_bluetooth_off);
+                views.setImageViewResource(R.id.img_bluetooth, R.drawable.ic_appwidget_settings_bluetooth_off);
+                views.setImageViewResource(R.id.ind_bluetooth, R.drawable.appwidget_settings_ind_off_c);
                 break;
             case STATE_ENABLED:
-                views.setImageViewResource(R.id.btn_bluetooth, R.drawable.widget_btn_bluetooth);
+                views.setImageViewResource(R.id.img_bluetooth, R.drawable.ic_appwidget_settings_bluetooth_on);
+                views.setImageViewResource(R.id.ind_bluetooth, R.drawable.appwidget_settings_ind_on_c);
                 break;
             case STATE_INTERMEDIATE:
-                views.setImageViewResource(R.id.btn_bluetooth, R.drawable.widget_btn_bluetooth_gray);
+                views.setImageViewResource(R.id.img_bluetooth, R.drawable.ic_appwidget_settings_bluetooth_off);
+                views.setImageViewResource(R.id.ind_bluetooth, R.drawable.appwidget_settings_ind_mid_c);
                 break;
         }
     }
@@ -187,7 +200,8 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
      * @param appWidgetId
      * @return
      */
-    private static PendingIntent getLaunchPendingIntent(Context context, int appWidgetId, int buttonId) {
+    private static PendingIntent getLaunchPendingIntent(Context context, int appWidgetId,
+            int buttonId) {
         Intent launchIntent = new Intent();
         launchIntent.setClass(context, SettingsAppWidgetProvider.class);
         launchIntent.addCategory(Intent.CATEGORY_ALTERNATIVE);
@@ -214,7 +228,7 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
             } else if (buttonId == BUTTON_BRIGHTNESS) {
                 toggleBrightness(context);
             } else if (buttonId == BUTTON_SYNC) {
-                toggleBackgroundData(context);
+                toggleSync(context);
             } else if (buttonId == BUTTON_GPS) {
                 toggleGps(context);
             } else if (buttonId == BUTTON_BLUETOOTH) {
@@ -256,6 +270,7 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
         } else if (wifiState == STATE_DISABLED) {
             wifiManager.setWifiEnabled(true);
         }
+        Toast.makeText(context, R.string.gadget_toggle_wifi, Toast.LENGTH_SHORT).show();
     }
 
     /**
@@ -265,25 +280,56 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
      * @return true if enabled
      */
     private static boolean getBackgroundDataState(Context context) {
-        ConnectivityManager connManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        ConnectivityManager connManager =
+                (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         return connManager.getBackgroundDataSetting();
     }
 
     /**
-     * Toggle background data and sync tickles.
+     * Gets the state of auto-sync.
+     *
+     * @param context
+     * @return true if enabled
+     */
+    private static boolean getSync(Context context) {
+        boolean backgroundData = getBackgroundDataState(context);
+        boolean sync = ContentResolver.getMasterSyncAutomatically();
+        return backgroundData && sync;
+    }
+
+    /**
+     * Toggle auto-sync
      *
      * @param context
      */
-    private void toggleBackgroundData(Context context) {
-        ConnectivityManager connManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        boolean sync = getBackgroundDataState(context);
-        connManager.setBackgroundDataSetting(!sync);
+    private void toggleSync(Context context) {
+        ConnectivityManager connManager =
+                (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        boolean backgroundData = getBackgroundDataState(context);
+        boolean sync = ContentResolver.getMasterSyncAutomatically();
 
-        IContentService contentService = ContentResolver.getContentService();
-        try {
-            contentService.setListenForNetworkTickles(!sync);
-        } catch (RemoteException e) {
-            Log.d(TAG, "toggleBackgroundData: " + e);
+        // four cases to handle:
+        // setting toggled from off to on:
+        // 1. background data was off, sync was off: turn on both
+        if (!backgroundData && !sync) {
+            connManager.setBackgroundDataSetting(true);
+            ContentResolver.setMasterSyncAutomatically(true);
+        }
+
+        // 2. background data was off, sync was on: turn on background data
+        if (!backgroundData && sync) {
+            connManager.setBackgroundDataSetting(true);
+        }
+
+        // 3. background data was on, sync was off: turn on sync
+        if (backgroundData && !sync) {
+            ContentResolver.setMasterSyncAutomatically(true);
+        }
+
+        // setting toggled from on to off:
+        // 4. background data was on, sync was on: turn off sync
+        if (backgroundData && sync) {
+            ContentResolver.setMasterSyncAutomatically(false);
         }
     }
 
@@ -306,7 +352,8 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
     private void toggleGps(Context context) {
         ContentResolver resolver = context.getContentResolver();
         boolean enabled = getGpsState(context);
-        Settings.Secure.setLocationProviderEnabled(resolver, LocationManager.GPS_PROVIDER, !enabled);
+        Settings.Secure.setLocationProviderEnabled(resolver, LocationManager.GPS_PROVIDER,
+                !enabled);
     }
 
     /**
@@ -317,9 +364,9 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
      */
     private static boolean getBrightness(Context context) {
         try {
-            IHardwareService hardware = IHardwareService.Stub.asInterface(
-                    ServiceManager.getService("hardware"));
-            if (hardware != null) {
+            IPowerManager power = IPowerManager.Stub.asInterface(
+                    ServiceManager.getService("power"));
+            if (power != null) {
                 int brightness = Settings.System.getInt(context.getContentResolver(),
                         Settings.System.SCREEN_BRIGHTNESS);
                 return brightness > 100;
@@ -337,9 +384,9 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
      */
     private void toggleBrightness(Context context) {
         try {
-            IHardwareService hardware = IHardwareService.Stub.asInterface(
-                    ServiceManager.getService("hardware"));
-            if (hardware != null) {
+            IPowerManager power = IPowerManager.Stub.asInterface(
+                    ServiceManager.getService("power"));
+            if (power != null) {
                 ContentResolver cr = context.getContentResolver();
                 int brightness = Settings.System.getInt(cr,
                         Settings.System.SCREEN_BRIGHTNESS);
@@ -352,10 +399,17 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
                 } else {
                     brightness = MINIMUM_BACKLIGHT;
                 }
-                hardware.setBacklights(brightness);
+                power.setBacklightBrightness(brightness);
                 Settings.System.putInt(cr, Settings.System.SCREEN_BRIGHTNESS, brightness);
-                brightness = Settings.System.getInt(cr,
-                        Settings.System.SCREEN_BRIGHTNESS);
+                if (context.getResources().getBoolean(
+                        com.android.internal.R.bool.config_automatic_brightness_available)) {
+                    // Disable automatic brightness
+                    Settings.System.putInt(context.getContentResolver(),
+                            Settings.System.SCREEN_BRIGHTNESS_MODE,
+                            Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL);
+                    // Set it again in case auto brightness was on
+                    power.setBacklightBrightness(brightness);
+                }
             }
         } catch (RemoteException e) {
             Log.d(TAG, "toggleBrightness: " + e);
@@ -378,9 +432,9 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
             }
         }
         int state = mLocalBluetoothManager.getBluetoothState();
-        if (state == BluetoothDevice.BLUETOOTH_STATE_OFF) {
+        if (state == BluetoothAdapter.STATE_OFF) {
             return STATE_DISABLED;
-        } else if (state == BluetoothDevice.BLUETOOTH_STATE_ON) {
+        } else if (state == BluetoothAdapter.STATE_ON) {
             return STATE_ENABLED;
         } else {
             return STATE_INTERMEDIATE;
@@ -399,5 +453,6 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
         } else if (state == STATE_DISABLED) {
             mLocalBluetoothManager.setBluetoothEnabled(true);
         }
+        Toast.makeText(context, R.string.gadget_toggle_bluetooth, Toast.LENGTH_SHORT).show();
     }
 }
diff --git a/src/com/android/settings/wifi/AccessPointDialog.java b/src/com/android/settings/wifi/AccessPointDialog.java
index 5851a184d01..4804d7837d5 100644
--- a/src/com/android/settings/wifi/AccessPointDialog.java
+++ b/src/com/android/settings/wifi/AccessPointDialog.java
@@ -17,15 +17,14 @@
 package com.android.settings.wifi;
 
 import com.android.settings.R;
-import com.android.settings.SecuritySettings;
 
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Resources;
-import android.security.CertTool;
-import android.security.Keystore;
+import android.security.Credentials;
+import android.security.KeyStore;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
@@ -74,17 +73,15 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
     private static final int SECURITY_AUTO = 0;
     private static final int SECURITY_NONE = 1;
     private static final int SECURITY_WEP = 2;
-    private static final int SECURITY_WPA_PERSONAL = 3;
-    private static final int SECURITY_WPA2_PERSONAL = 4;
-    private static final int SECURITY_WPA_EAP = 5;
-    private static final int SECURITY_IEEE8021X = 6;
+    private static final int SECURITY_PSK = 3;
+    private static final int SECURITY_EAP = 4;
 
     private static final int[] WEP_TYPE_VALUES = {
             AccessPointState.WEP_PASSWORD_AUTO, AccessPointState.WEP_PASSWORD_ASCII,
             AccessPointState.WEP_PASSWORD_HEX
     };
     private static final String NOT_APPLICABLE = "N/A";
-    private static final String BLOB_HEADER = "blob://";
+    private static final String KEYSTORE_HEADER = "keystore://";
 
     // Button positions, default to impossible values
     private int mConnectButtonPos = Integer.MAX_VALUE; 
@@ -119,8 +116,6 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
     private Spinner mCaCertSpinner;
     private TextView mClientCertText;
     private Spinner mClientCertSpinner;
-    private TextView mPrivateKeyPasswdText;
-    private EditText mPrivateKeyPasswdEdit;
     private EditText[] mEnterpriseTextFields;
 
     
@@ -133,13 +128,13 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
     private TextView mSecurityText;
     private Spinner mSecuritySpinner;
     private Spinner mWepTypeSpinner;
-    private CertTool mCertTool;
+    private KeyStore mKeyStore;
 
     public AccessPointDialog(Context context, WifiLayer wifiLayer) {
         super(context);
 
         mWifiLayer = wifiLayer;
-        mCertTool = CertTool.getInstance();
+        mKeyStore = KeyStore.getInstance();
     }
 
     @Override
@@ -222,7 +217,7 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
         updateCertificateSelection();
         setGenericPasswordVisible(true);
         // Both WPA and WPA2 show the same caption, so either is ok
-        updatePasswordCaption(AccessPointState.WPA);
+        updatePasswordCaption(AccessPointState.PSK);
     }
 
     /** Called after flags are set, the dialog's layout/etc should be set up here */
@@ -347,18 +342,22 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
     }
 
     private String[] getAllCaCertificateKeys() {
-        return appendEmptyInSelection(mCertTool.getAllCaCertificateKeys());
+        return appendEmptyInSelection(mKeyStore.saw(Credentials.CA_CERTIFICATE));
     }
 
     private String[] getAllUserCertificateKeys() {
-        return appendEmptyInSelection(mCertTool.getAllUserCertificateKeys());
+        return appendEmptyInSelection(mKeyStore.saw(Credentials.USER_CERTIFICATE));
     }
 
     private String[] appendEmptyInSelection(String[] keys) {
-      String[] selections = new String[keys.length + 1];
-      System.arraycopy(keys, 0, selections, 0, keys.length);
-      selections[keys.length] = NOT_APPLICABLE;
-      return selections;
+        if (keys == null) {
+            return new String[] {NOT_APPLICABLE};
+        } else {
+            String[] selections = new String[keys.length + 1];
+            System.arraycopy(keys, 0, selections, 0, keys.length);
+            selections[keys.length] = NOT_APPLICABLE;
+            return selections;
+        }
     }
 
     private void setEnterpriseFields(View view) {
@@ -371,8 +370,6 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
         mClientCertText =
                 (TextView) view.findViewById(R.id.client_certificate_text);
         mCaCertText = (TextView) view.findViewById(R.id.ca_certificate_text);
-        mPrivateKeyPasswdEdit =
-                (EditText) view.findViewById(R.id.private_key_passwd_edit);
         mEapText = (TextView) view.findViewById(R.id.eap_text);
         mEapSpinner = (Spinner) view.findViewById(R.id.eap_spinner);
         mEapSpinner.setOnItemSelectedListener(this);
@@ -399,7 +396,7 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
         setSpinnerAdapter(mCaCertSpinner, getAllCaCertificateKeys());
 
         mEnterpriseTextFields = new EditText[] {
-            mIdentityEdit, mAnonymousIdentityEdit, mPrivateKeyPasswdEdit
+            mIdentityEdit, mAnonymousIdentityEdit
         };
 
     }
@@ -455,12 +452,12 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
     }
 
     private void updatePasswordCaption(String security) {
-        
-        if (mPasswordText != null && security != null
-                && security.equals(AccessPointState.WEP)) {
-            mPasswordText.setText(R.string.please_type_hex_key);
-        } else {
-            mPasswordText.setText(R.string.please_type_passphrase);
+        if (mPasswordText != null) {
+            if (security != null && security.equals(AccessPointState.WEP)) {
+                mPasswordText.setText(R.string.please_type_hex_key);
+            } else {
+                mPasswordText.setText(R.string.please_type_passphrase);
+            }
         }
     }
     
@@ -518,9 +515,7 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
 
         if (mState.isEnterprise()) {
             if(!mState.configured) {
-                updateEnterpriseFields(
-                        AccessPointState.WPA_EAP.equals(mState.security) ?
-                        SECURITY_WPA_EAP : SECURITY_IEEE8021X);
+                updateEnterpriseFields();
             }
         }
         updatePasswordField();
@@ -576,13 +571,8 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
         }
 
         switch (securityType) {
-            case SECURITY_WPA_PERSONAL: {
-                mState.setSecurity(AccessPointState.WPA);
-                break;
-            }
-
-            case SECURITY_WPA2_PERSONAL: {
-                mState.setSecurity(AccessPointState.WPA2);
+            case SECURITY_PSK: {
+                mState.setSecurity(AccessPointState.PSK);
                 break;
             }
 
@@ -597,12 +587,8 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
                     break;
             }
 
-            case SECURITY_WPA_EAP:
-                mState.setSecurity(AccessPointState.WPA_EAP);
-                break;
-
-            case SECURITY_IEEE8021X:
-                mState.setSecurity(AccessPointState.IEEE8021X);
+            case SECURITY_EAP:
+                mState.setSecurity(AccessPointState.EAP);
                 break;
 
             case SECURITY_NONE:
@@ -612,9 +598,7 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
         }
 
         if (mState.isEnterprise() && !mState.configured) {
-            updateEnterpriseFields(
-                    AccessPointState.WPA_EAP.equals(mState.security) ?
-                    SECURITY_WPA_EAP : SECURITY_IEEE8021X);
+            updateEnterpriseFields();
         }
 
         if (!mWifiLayer.saveNetwork(mState)) {
@@ -642,57 +626,35 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
             getContext().getResources().getStringArray(arrayResId), selection);
     }
 
-    private void updateEnterpriseFields(int securityType) {
+    private void updateEnterpriseFields() {
         int i;
         String value;
         for (i = AccessPointState.IDENTITY ;
-                i <= AccessPointState.PRIVATE_KEY_PASSWD ; i++) {
+                i <= AccessPointState.ANONYMOUS_IDENTITY ; i++) {
             value = mEnterpriseTextFields[i].getText().toString();
-            if (!TextUtils.isEmpty(value) ||
-                    (i == AccessPointState.PRIVATE_KEY_PASSWD)) {
+            if (!TextUtils.isEmpty(value)) {
                 mState.setEnterpriseField(i, value);
             }
         }
         Spinner spinner = mClientCertSpinner;
         int index = spinner.getSelectedItemPosition();
         if (index != (spinner.getCount() - 1)) {
-            String key = (String)spinner.getSelectedItem();
-            value = mCertTool.getUserCertificate(key);
-            if (!TextUtils.isEmpty(value)) {
-                mState.setEnterpriseField(AccessPointState.CLIENT_CERT,
-                        BLOB_HEADER + value);
-            }
-            value = mCertTool.getUserPrivateKey(key);
-            if (!TextUtils.isEmpty(value)) {
-                mState.setEnterpriseField(AccessPointState.PRIVATE_KEY,
-                        BLOB_HEADER + value);
-            }
+            String key = (String) spinner.getSelectedItem();
+            mState.setEnterpriseField(AccessPointState.CLIENT_CERT,
+                    KEYSTORE_HEADER + Credentials.USER_CERTIFICATE + key);
+            mState.setEnterpriseField(AccessPointState.PRIVATE_KEY,
+                    KEYSTORE_HEADER + Credentials.USER_PRIVATE_KEY + key);
         }
         spinner = mCaCertSpinner;
         index = spinner.getSelectedItemPosition();
         if (index != (spinner.getCount() - 1)) {
-            String key = (String)spinner.getSelectedItem();
-            value = mCertTool.getCaCertificate(key);
-            if (!TextUtils.isEmpty(value)) {
-                mState.setEnterpriseField(AccessPointState.CA_CERT,
-                        BLOB_HEADER + value);
-            }
-        }
-        switch (securityType) {
-            case SECURITY_IEEE8021X: 
-            case SECURITY_WPA_EAP: {
-                if (securityType == SECURITY_WPA_EAP) {
-                    mState.setSecurity(AccessPointState.WPA_EAP);
-                } else {
-                    mState.setSecurity(AccessPointState.IEEE8021X);
-                }
-                mState.setEap(mEapSpinner.getSelectedItemPosition());
-                mState.setPhase2((String)mPhase2Spinner.getSelectedItem());
-                break;
-            }
-            default:
-                mState.setSecurity(AccessPointState.OPEN);
+            String key = (String) spinner.getSelectedItem();
+            mState.setEnterpriseField(AccessPointState.CA_CERT,
+                    KEYSTORE_HEADER + Credentials.CA_CERTIFICATE + key);
         }
+        mState.setSecurity(AccessPointState.EAP);
+        mState.setEap(mEapSpinner.getSelectedItemPosition());
+        mState.setPhase2((String) mPhase2Spinner.getSelectedItem());
     }
 
     /**
@@ -785,24 +747,21 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
                 setWepVisible(false);
                 setGenericPasswordVisible(mState.hasSecurity());
                 // Shows the generic 'wireless password'
-                updatePasswordCaption(AccessPointState.WPA);
+                updatePasswordCaption(AccessPointState.PSK);
                 break;
             }
-            
-            case SECURITY_WPA_PERSONAL:
-            case SECURITY_WPA2_PERSONAL: {
+
+            case SECURITY_PSK: {
                 setWepVisible(false);
                 setGenericPasswordVisible(true);
                 // Both WPA and WPA2 show the same caption, so either is ok
-                updatePasswordCaption(AccessPointState.WPA);
+                updatePasswordCaption(AccessPointState.PSK);
                 break;
             }
-            case SECURITY_WPA_EAP:
-            case SECURITY_IEEE8021X: {
+            case SECURITY_EAP: {
                 // Unlock the keystore if it is not unlocked yet.
-                if (Keystore.getInstance().getState() != Keystore.UNLOCKED) {
-                    getContext().startActivity(new Intent(
-                            SecuritySettings.ACTION_UNLOCK_CREDENTIAL_STORAGE));
+                if (mKeyStore.test() != KeyStore.NO_ERROR) {
+                    Credentials.getInstance().unlock(getContext());
                     return;
                 }
                 enableEnterpriseFields();
diff --git a/src/com/android/settings/wifi/AccessPointPreference.java b/src/com/android/settings/wifi/AccessPointPreference.java
index 10e09475e0d..6dd5492ec0b 100644
--- a/src/com/android/settings/wifi/AccessPointPreference.java
+++ b/src/com/android/settings/wifi/AccessPointPreference.java
@@ -33,14 +33,11 @@ public class AccessPointPreference extends Preference implements
     // Signal strength indicator
     private static final int UI_SIGNAL_LEVELS = 4;
 
-    private WifiSettings mWifiSettings;
-    
     private AccessPointState mState;
 
     public AccessPointPreference(WifiSettings wifiSettings, AccessPointState state) {
         super(wifiSettings, null);
         
-        mWifiSettings = wifiSettings;
         mState = state;
         
         setWidgetLayoutResource(R.layout.preference_widget_wifi_signal);
diff --git a/src/com/android/settings/wifi/AccessPointState.java b/src/com/android/settings/wifi/AccessPointState.java
index 899c3047a5f..5aefa557b27 100644
--- a/src/com/android/settings/wifi/AccessPointState.java
+++ b/src/com/android/settings/wifi/AccessPointState.java
@@ -38,15 +38,11 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
     private static final String TAG = "AccessPointState";
     
     // Constants used for different security types
-    public static final String WPA2 = "WPA2";
-    public static final String WPA = "WPA";
+    public static final String PSK = "PSK";
     public static final String WEP = "WEP";
+    public static final String EAP = "EAP";
     public static final String OPEN = "Open";
 
-    /* For EAP Enterprise fields */
-    public static final String WPA_EAP = "WPA-EAP";
-    public static final String IEEE8021X = "IEEE8021X";
-
     public static final String[] EAP_METHOD = { "PEAP", "TLS", "TTLS" };
 
     /** String present in capabilities if the scan result is ad-hoc */
@@ -103,11 +99,10 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
     /* Enterprise Fields */
     public static final int IDENTITY = 0;
     public static final int ANONYMOUS_IDENTITY = 1;
-    public static final int PRIVATE_KEY_PASSWD = 2;
-    public static final int CLIENT_CERT = 3;
-    public static final int CA_CERT = 4;
-    public static final int PRIVATE_KEY = 5;
-    public static final int MAX_ENTRPRISE_FIELD = 6;
+    public static final int CLIENT_CERT = 2;
+    public static final int CA_CERT = 3;
+    public static final int PRIVATE_KEY = 4;
+    public static final int MAX_ENTRPRISE_FIELD = 5;
     private String mEnterpriseFields[] = new String[MAX_ENTRPRISE_FIELD];
     private String mEap;
     private String mPhase2;
@@ -278,8 +273,7 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
     }
 
     public boolean isEnterprise() {
-        return (WPA_EAP.equals(security) ||
-                AccessPointState.IEEE8021X.equals(security));
+        return (AccessPointState.EAP.equals(security));
     }
 
     public void setSecurity(String security) {
@@ -296,10 +290,8 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
     public String getHumanReadableSecurity() {
         if (security.equals(OPEN)) return mContext.getString(R.string.wifi_security_open);
         else if (security.equals(WEP)) return mContext.getString(R.string.wifi_security_wep);
-        else if (security.equals(WPA)) return mContext.getString(R.string.wifi_security_wpa);
-        else if (security.equals(WPA2)) return mContext.getString(R.string.wifi_security_wpa2);
-        else if (security.equals(WPA_EAP)) return mContext.getString(R.string.wifi_security_wpa_eap);
-        else if (security.equals(IEEE8021X)) return mContext.getString(R.string.wifi_security_ieee8021x);
+        else if (security.equals(PSK)) return mContext.getString(R.string.wifi_security_psk);
+        else if (security.equals(EAP)) return mContext.getString(R.string.wifi_security_eap);
 
         return mContext.getString(R.string.wifi_security_unknown);
     }
@@ -325,7 +317,7 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
      */
     public static String getScanResultSecurity(ScanResult scanResult) {
         final String cap = scanResult.capabilities;
-        final String[] securityModes = { WEP, WPA, WPA2, WPA_EAP, IEEE8021X };
+        final String[] securityModes = { WEP, PSK, EAP };
         for (int i = securityModes.length - 1; i >= 0; i--) {
             if (cap.contains(securityModes[i])) {
                 return securityModes[i];
@@ -427,31 +419,14 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
      * @return The security of a given {@link WifiConfiguration}.
      */
     public static String getWifiConfigurationSecurity(WifiConfiguration wifiConfig) {
-
-        if (wifiConfig.allowedKeyManagement.get(KeyMgmt.NONE)) {
-            // If we never set group ciphers, wpa_supplicant puts all of them.
-            // For open, we don't set group ciphers.
-            // For WEP, we specifically only set WEP40 and WEP104, so CCMP
-            // and TKIP should not be there.
-            if (!wifiConfig.allowedGroupCiphers.get(GroupCipher.CCMP)
-                    && (wifiConfig.allowedGroupCiphers.get(GroupCipher.WEP40)
-                            || wifiConfig.allowedGroupCiphers.get(GroupCipher.WEP104))) {
-                return WEP;
-            } else {
-                return OPEN;
-            }
-        } else if (wifiConfig.allowedKeyManagement.get(KeyMgmt.WPA_EAP)) {
-            return WPA_EAP;
-        } else if (wifiConfig.allowedKeyManagement.get(KeyMgmt.IEEE8021X)) {
-            return IEEE8021X;
-        } else if (wifiConfig.allowedProtocols.get(Protocol.RSN)) {
-            return WPA2;
-        } else if (wifiConfig.allowedProtocols.get(Protocol.WPA)) {
-            return WPA;
-        } else {
-            Log.w(TAG, "Unknown security type from WifiConfiguration, falling back on open.");
-            return OPEN;
+        if (!TextUtils.isEmpty(wifiConfig.eap.value())) {
+            return EAP;
+        } else if (!TextUtils.isEmpty(wifiConfig.preSharedKey)) {
+            return PSK;
+        } else if (!TextUtils.isEmpty(wifiConfig.wepKeys[0])) {
+            return WEP;
         }
+        return OPEN;
     }
     
     public void updateFromWifiInfo(WifiInfo wifiInfo, NetworkInfo.DetailedState state) {
@@ -504,48 +479,42 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
         config.priority = priority;
         config.hiddenSSID = hiddenSsid;
         config.SSID = convertToQuotedString(ssid);
-        config.eap = mEap;
+        config.eap.setValue(mEap);
 
         if (!TextUtils.isEmpty(mPhase2)) {
-            config.phase2 = convertToQuotedString("auth=" + mPhase2);
+            config.phase2.setValue(convertToQuotedString("auth=" + mPhase2));
         } else {
-            config.phase2 = null;
+            config.phase2.setValue(null);
         }
         if (!TextUtils.isEmpty(mEnterpriseFields[IDENTITY])) {
-            config.identity =
-                    convertToQuotedString(mEnterpriseFields[IDENTITY]);
+            config.identity.setValue(
+                    convertToQuotedString(mEnterpriseFields[IDENTITY]));
         } else {
-            config.identity = null;
+            config.identity.setValue(null);
         }
         if (!TextUtils.isEmpty(mEnterpriseFields[ANONYMOUS_IDENTITY])) {
-            config.anonymousIdentity = convertToQuotedString(
-                    mEnterpriseFields[ANONYMOUS_IDENTITY]);
+            config.anonymous_identity.setValue(convertToQuotedString(
+                    mEnterpriseFields[ANONYMOUS_IDENTITY]));
         } else {
-            config.anonymousIdentity = null;
+            config.anonymous_identity.setValue(null);
         }
         if (!TextUtils.isEmpty(mEnterpriseFields[CLIENT_CERT])) {
-            config.clientCert = convertToQuotedString(
-                    mEnterpriseFields[CLIENT_CERT]);
+            config.client_cert.setValue(convertToQuotedString(
+                    mEnterpriseFields[CLIENT_CERT]));
         } else {
-            config.clientCert = null;
+            config.client_cert.setValue(null);
         }
         if (!TextUtils.isEmpty(mEnterpriseFields[CA_CERT])) {
-            config.caCert = convertToQuotedString(
-                    mEnterpriseFields[CA_CERT]);
+            config.ca_cert.setValue(convertToQuotedString(
+                    mEnterpriseFields[CA_CERT]));
         } else {
-            config.caCert = null;
+            config.ca_cert.setValue(null);
         }
         if (!TextUtils.isEmpty(mEnterpriseFields[PRIVATE_KEY])) {
-            config.privateKey = convertToQuotedString(
-                    mEnterpriseFields[PRIVATE_KEY]);
+            config.private_key.setValue(convertToQuotedString(
+                    mEnterpriseFields[PRIVATE_KEY]));
         } else {
-            config.privateKey = null;
-        }
-        if (!TextUtils.isEmpty(mEnterpriseFields[PRIVATE_KEY_PASSWD])) {
-            config.privateKeyPasswd = convertToQuotedString(
-                    mEnterpriseFields[PRIVATE_KEY_PASSWD]);
-        } else {
-            config.privateKeyPasswd = null;
+            config.private_key.setValue(null);
         }
         setupSecurity(config);
     }
@@ -563,7 +532,6 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
         }
         
         if (security.equals(WEP)) {
-            
             // If password is empty, it should be left untouched
             if (!TextUtils.isEmpty(mPassword)) {
                 if (mWepPasswordType == WEP_PASSWORD_AUTO) {
@@ -578,28 +546,11 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
                             : mPassword;
                 }
             }
-            
-            config.wepTxKeyIndex = 0;
-            
             config.allowedAuthAlgorithms.set(AuthAlgorithm.OPEN);
             config.allowedAuthAlgorithms.set(AuthAlgorithm.SHARED);
-
             config.allowedKeyManagement.set(KeyMgmt.NONE);
-            
-            config.allowedGroupCiphers.set(GroupCipher.WEP40);
-            config.allowedGroupCiphers.set(GroupCipher.WEP104);
-            
-        } else if (security.equals(WPA) || security.equals(WPA2)){
-            config.allowedGroupCiphers.set(GroupCipher.TKIP);
-            config.allowedGroupCiphers.set(GroupCipher.CCMP);
-            
-            config.allowedKeyManagement.set(KeyMgmt.WPA_PSK);
-            
-            config.allowedPairwiseCiphers.set(PairwiseCipher.CCMP);
-            config.allowedPairwiseCiphers.set(PairwiseCipher.TKIP);
-
-            config.allowedProtocols.set(security.equals(WPA2) ? Protocol.RSN : Protocol.WPA);
-            
+            config.wepTxKeyIndex = 0;
+        } else if (security.equals(PSK)){
             // If password is empty, it should be left untouched
             if (!TextUtils.isEmpty(mPassword)) {
                 if (mPassword.length() == 64 && isHex(mPassword)) {
@@ -610,20 +561,14 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
                     config.preSharedKey = convertToQuotedString(mPassword);
                 }
             }
-            
+        } else if (security.equals(EAP)) {
+            config.allowedKeyManagement.set(KeyMgmt.WPA_EAP);
+            config.allowedKeyManagement.set(KeyMgmt.IEEE8021X);
+            if (!TextUtils.isEmpty(mPassword)) {
+                config.password.setValue(convertToQuotedString(mPassword));
+            }
         } else if (security.equals(OPEN)) {
             config.allowedKeyManagement.set(KeyMgmt.NONE);
-        } else if (security.equals(WPA_EAP) || security.equals(IEEE8021X)) {
-            config.allowedGroupCiphers.set(GroupCipher.TKIP);
-            config.allowedGroupCiphers.set(GroupCipher.CCMP);
-            if (security.equals(WPA_EAP)) {
-                config.allowedKeyManagement.set(KeyMgmt.WPA_EAP);
-            } else {
-                config.allowedKeyManagement.set(KeyMgmt.IEEE8021X);
-            }
-            if (!TextUtils.isEmpty(mPassword)) {
-                config.password = convertToQuotedString(mPassword);
-            }
         }
     }
     
@@ -825,16 +770,10 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
     private String getVerboseSecurity() {
         if (WEP.equals(security)) {
             return mContext.getString(R.string.wifi_security_verbose_wep);
-        } else if (WPA.equals(security)) {
-            return mContext.getString(R.string.wifi_security_verbose_wpa);
-        } else if (WPA2.equals(security)) {
-            return mContext.getString(R.string.wifi_security_verbose_wpa2);
-        } else if (OPEN.equals(security)) {
-            return mContext.getString(R.string.wifi_security_verbose_open);
-        } else if (WPA_EAP.equals(security)) {
-            return mContext.getString(R.string.wifi_security_verbose_wpa_eap);
-        } else if (IEEE8021X.equals(security)) {
-            return mContext.getString(R.string.wifi_security_verbose_ieee8021x);
+        } else if (PSK.equals(security)) {
+            return mContext.getString(R.string.wifi_security_verbose_psk);
+        } else if (EAP.equals(security)) {
+            return mContext.getString(R.string.wifi_security_verbose_eap);
         } else {
             return null;
         }
diff --git a/src/com/android/settings/wifi/AdvancedSettings.java b/src/com/android/settings/wifi/AdvancedSettings.java
index 323d5c77095..5906e70c2c4 100644
--- a/src/com/android/settings/wifi/AdvancedSettings.java
+++ b/src/com/android/settings/wifi/AdvancedSettings.java
@@ -64,11 +64,19 @@ public class AdvancedSettings extends PreferenceActivity
         addPreferencesFromResource(R.xml.wifi_advanced_settings);
         
         mUseStaticIpCheckBox = (CheckBoxPreference) findPreference(KEY_USE_STATIC_IP);
+        mUseStaticIpCheckBox.setOnPreferenceChangeListener(this);
 
         for (int i = 0; i < mPreferenceKeys.length; i++) {
             Preference preference = findPreference(mPreferenceKeys[i]);
             preference.setOnPreferenceChangeListener(this);
         }
+
+        /*
+         * Fix the Run-time IllegalStateException that ListPreference requires an entries
+         * array and an entryValues array, this exception occurs when user open/close the
+         * slider in the Regulatory domain dialog.
+         */
+        initNumChannelsPreference();
     }
     
     @Override
@@ -141,7 +149,7 @@ public class AdvancedSettings extends PreferenceActivity
             try {
                 int numChannels = Integer.parseInt((String) newValue);
                 WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
-                if (!wifiManager.setNumAllowedChannels(numChannels)) {
+                if (!wifiManager.setNumAllowedChannels(numChannels, true)) {
                     Toast.makeText(this, R.string.wifi_setting_num_channels_error,
                             Toast.LENGTH_SHORT).show();
                 }
@@ -160,7 +168,16 @@ public class AdvancedSettings extends PreferenceActivity
                         Toast.LENGTH_SHORT).show();
                 return false;
             }
-                
+
+        } else if (key.equals(KEY_USE_STATIC_IP)) {
+            boolean value = ((Boolean) newValue).booleanValue();
+
+            try {
+                Settings.System.putInt(getContentResolver(),
+                        Settings.System.WIFI_USE_STATIC_IP, value ? 1 : 0);
+            } catch (NumberFormatException e) {
+                return false;
+            }
         } else {
             String value = (String) newValue;
             
@@ -170,6 +187,12 @@ public class AdvancedSettings extends PreferenceActivity
             }
             
             preference.setSummary(value);
+            for (int i = 0; i < mSettingNames.length; i++) {
+                if (key.equals(mPreferenceKeys[i])) {
+                    Settings.System.putString(getContentResolver(), mSettingNames[i], value);
+                    break;
+                }
+            }
         }
         
         return true;
diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index 88cfe06b7de..10a672b5f57 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -23,6 +23,7 @@ import static android.net.wifi.WifiManager.WIFI_STATE_ENABLING;
 import static android.net.wifi.WifiManager.WIFI_STATE_UNKNOWN;
 
 import com.android.settings.R;
+import com.android.settings.AirplaneModeEnabler;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -32,6 +33,7 @@ import android.net.NetworkInfo;
 import android.net.wifi.WifiManager;
 import android.preference.Preference;
 import android.preference.CheckBoxPreference;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Config;
 import android.util.Log;
@@ -121,7 +123,7 @@ public class WifiEnabler implements Preference.OnPreferenceChangeListener {
             mWifiCheckBoxPref
                     .setSummary(wifiState == WIFI_STATE_DISABLED ? mOriginalSummary : null);
             
-            mWifiCheckBoxPref.setEnabled(isEnabledByDependency());
+            mWifiCheckBoxPref.setEnabled(isWifiAllowed(mContext));
             
         } else if (wifiState == WIFI_STATE_DISABLING || wifiState == WIFI_STATE_ENABLING) {
             mWifiCheckBoxPref.setSummary(wifiState == WIFI_STATE_ENABLING ? R.string.wifi_starting
@@ -151,24 +153,23 @@ public class WifiEnabler implements Preference.OnPreferenceChangeListener {
         }
     }
 
-    private boolean isEnabledByDependency() {
-        Preference dep = getDependencyPreference();
-        if (dep == null) {
+    private static boolean isWifiAllowed(Context context) {
+        // allowed if we are not in airplane mode
+        if (!AirplaneModeEnabler.isAirplaneModeOn(context)) {
             return true;
         }
-        
-        return !dep.shouldDisableDependents();
-    }
-    
-    private Preference getDependencyPreference() {
-        String depKey = mWifiCheckBoxPref.getDependency();
-        if (TextUtils.isEmpty(depKey)) {
-            return null;
+        // allowed if wifi is not in AIRPLANE_MODE_RADIOS
+        String radios = Settings.System.getString(context.getContentResolver(),
+                Settings.System.AIRPLANE_MODE_RADIOS);
+        if (radios == null || !radios.contains(Settings.System.RADIO_WIFI)) {
+            return true;
         }
-        
-        return mWifiCheckBoxPref.getPreferenceManager().findPreference(depKey);
+        // allowed if wifi is in AIRPLANE_MODE_TOGGLEABLE_RADIOS
+        radios = Settings.System.getString(context.getContentResolver(),
+                Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
+        return (radios != null && radios.contains(Settings.System.RADIO_WIFI));
     }
-    
+
     private static String getHumanReadableWifiState(int wifiState) {
         switch (wifiState) {
             case WIFI_STATE_DISABLED:
diff --git a/src/com/android/settings/wifi/WifiLayer.java b/src/com/android/settings/wifi/WifiLayer.java
index 5d896aaec2c..ce518e1d2a6 100644
--- a/src/com/android/settings/wifi/WifiLayer.java
+++ b/src/com/android/settings/wifi/WifiLayer.java
@@ -774,7 +774,9 @@ public class WifiLayer {
              * We pass null for security since we have a network ID (i.e., it's
              * not a wildcard), and rely on it matching.
              */
-            return findApLocked(wifiInfo.getNetworkId(), wifiInfo.getBSSID(), ssid, null);
+            synchronized (this) {
+                return findApLocked(wifiInfo.getNetworkId(), wifiInfo.getBSSID(), ssid, null);
+            }
         } else {
             return null;
         }
@@ -1013,8 +1015,10 @@ public class WifiLayer {
              * We pass null for security since we have a network ID (i.e., it's
              * not a wildcard), and rely on it matching.
              */
-            ap = findApLocked(wifiInfo.getNetworkId(), wifiInfo.getBSSID(), wifiInfo
-                    .getSSID(), null);
+            synchronized (this) {
+                ap = findApLocked(wifiInfo.getNetworkId(), wifiInfo.getBSSID(), wifiInfo
+                        .getSSID(), null);
+            }
         }
 
         if (ap != null) {
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index f18992a578a..cac77e3251f 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -18,7 +18,6 @@ package com.android.settings.wifi;
 
 import com.android.settings.ProgressCategory;
 import com.android.settings.R;
-import com.android.settings.SecuritySettings;
 
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -30,7 +29,8 @@ import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
 import android.preference.CheckBoxPreference;
 import android.provider.Settings;
-import android.security.Keystore;
+import android.security.Credentials;
+import android.security.KeyStore;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.Menu;
@@ -51,11 +51,11 @@ public class WifiSettings extends PreferenceActivity implements WifiLayer.Callba
         DialogInterface.OnDismissListener {
 
     private static final String TAG = "WifiSettings";
-    
+
     //============================
     // Preference/activity member variables
     //============================
-    
+
     private static final String INSTANCE_KEY_DIALOG_BUNDLE =
             "com.android.settings.wifi.WifiSettings:dialogBundle";
     /*
@@ -64,42 +64,44 @@ public class WifiSettings extends PreferenceActivity implements WifiLayer.Callba
      * dialog management only creates once.
      */
     private Dialog mDialog;
-    
+
+    private static final String KEY_ONLY_ACCESS_POINTS = "only_access_points";
     private static final String KEY_ADD_OTHER_NETWORK = "add_other_network";
 
     private static final int CONTEXT_MENU_ID_CONNECT = Menu.FIRST;
     private static final int CONTEXT_MENU_ID_FORGET = Menu.FIRST + 1;
     private static final int CONTEXT_MENU_ID_CHANGE_PASSWORD = Menu.FIRST + 2;
 
-    private static final int MENU_ID_SCAN = Menu.FIRST; 
-    private static final int MENU_ID_ADVANCED = Menu.FIRST + 1; 
-    
+    private static final int MENU_ID_SCAN = Menu.FIRST;
+    private static final int MENU_ID_ADVANCED = Menu.FIRST + 1;
+
     private static final String KEY_WIFI_ENABLED = "wifi_enabled";
     private static final String KEY_OPEN_NETWORK_NOTIFICATIONS_ENABLED =
             "open_network_notifications_enabled";
     private static final String KEY_ACCESS_POINTS = "access_points";
-    
+
     private ProgressCategory mApCategory;
     private CheckBoxPreference mWifiEnabled;
     private WifiEnabler mWifiEnabler;
-    private CheckBoxPreference mOpenNetworkNotificationsEnabled; 
+    private CheckBoxPreference mOpenNetworkNotificationsEnabled;
     private Preference mAddOtherNetwork;
-    
+
     private WeakHashMap<AccessPointState, AccessPointPreference> mAps;
 
+    private KeyStore mKeyStore = KeyStore.getInstance();
     private AccessPointState mResumeState = null;
     private int mResumeMode;
-    
+
     //============================
     // Wifi member variables
     //============================
-    
+
     private WifiLayer mWifiLayer;
-        
+
     //============================
     // Activity lifecycle
     //============================
-    
+
     public WifiSettings() {
         mAps = new WeakHashMap<AccessPointState, AccessPointPreference>();
         mWifiLayer = new WifiLayer(this, this);
@@ -115,15 +117,23 @@ public class WifiSettings extends PreferenceActivity implements WifiLayer.Callba
         onCreatedWifi();
         mWifiLayer.onCreatedCallback();
     }
-    
+
+    private int getPreferenceResource() {
+        if (getIntent().getBooleanExtra(KEY_ONLY_ACCESS_POINTS, false)) {
+            return R.xml.wifi_access_points;
+        } else {
+            return R.xml.wifi_settings;
+        }
+    }
+
     /**
      * Shouldn't have any dependency on the wifi layer.
      */
     private void onCreatePreferences() {
-        addPreferencesFromResource(R.xml.wifi_settings);
-        
+        addPreferencesFromResource(getPreferenceResource());
+
         final PreferenceScreen preferenceScreen = getPreferenceScreen();
-        
+
         mApCategory = (ProgressCategory) preferenceScreen.findPreference(KEY_ACCESS_POINTS);
         // We don't want the ordering to be the order preferences are added,
         // instead we want*:
@@ -132,39 +142,43 @@ public class WifiSettings extends PreferenceActivity implements WifiLayer.Callba
         //   3) preferred, APs out of range
         //   * this ordering logic is in AccessPointPreference's compareTo
         mApCategory.setOrderingAsAdded(false);
-        
-        mWifiEnabled = (CheckBoxPreference) preferenceScreen.findPreference(KEY_WIFI_ENABLED);
-        mWifiEnabler = new WifiEnabler(this, (WifiManager) getSystemService(WIFI_SERVICE),
-                mWifiEnabled);
-        
-        mOpenNetworkNotificationsEnabled = (CheckBoxPreference) preferenceScreen
-                .findPreference(KEY_OPEN_NETWORK_NOTIFICATIONS_ENABLED);
-        mOpenNetworkNotificationsEnabled.setChecked(Settings.Secure.getInt(getContentResolver(),
-            Settings.Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1);        
-        
+
+        if (!getIntent().getBooleanExtra(KEY_ONLY_ACCESS_POINTS, false)) {
+            mWifiEnabled = (CheckBoxPreference) preferenceScreen.findPreference(KEY_WIFI_ENABLED);
+            mWifiEnabler = new WifiEnabler(this, (WifiManager) getSystemService(WIFI_SERVICE),
+                    mWifiEnabled);
+
+            mOpenNetworkNotificationsEnabled = (CheckBoxPreference) preferenceScreen
+                    .findPreference(KEY_OPEN_NETWORK_NOTIFICATIONS_ENABLED);
+            mOpenNetworkNotificationsEnabled.setChecked(Settings.Secure.getInt(getContentResolver(),
+                    Settings.Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1);
+        }
+
         mAddOtherNetwork = preferenceScreen.findPreference(KEY_ADD_OTHER_NETWORK);
-        
+
         registerForContextMenu(getListView());
     }
 
     private void onCreatedWifi() {
     }
-    
+
     @Override
     protected void onResume() {
         super.onResume();
         mWifiLayer.onResume();
-        mWifiEnabler.resume();
+        if (mWifiEnabler != null) {
+            mWifiEnabler.resume();
+        }
         // do what we should have after keystore is unlocked.
         if (mResumeState != null) {
-            if (Keystore.getInstance().getState() == Keystore.UNLOCKED) {
+            if (mKeyStore.test() == KeyStore.NO_ERROR) {
                 showAccessPointDialog(mResumeState, mResumeMode);
             }
             mResumeMode = -1;
             mResumeState = null;
         } else {
             if (mResumeMode == AccessPointDialog.MODE_CONFIGURE) {
-                if (Keystore.getInstance().getState() == Keystore.UNLOCKED) {
+                if (mKeyStore.test() == KeyStore.NO_ERROR) {
                     ((AccessPointDialog) mDialog).enableEnterpriseFields();
                 }
             }
@@ -175,13 +189,15 @@ public class WifiSettings extends PreferenceActivity implements WifiLayer.Callba
     protected void onPause() {
         super.onPause();
         mWifiLayer.onPause();
-        mWifiEnabler.pause();
+        if (mWifiEnabler != null) {
+            mWifiEnabler.pause();
+        }
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        
+
         if (mDialog != null) {
             mDialog.dismiss();
         }
@@ -190,31 +206,31 @@ public class WifiSettings extends PreferenceActivity implements WifiLayer.Callba
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        
+
         menu.add(0, MENU_ID_SCAN, 0, R.string.scan_wifi)
             .setIcon(R.drawable.ic_menu_scan_network);
-        
+
         menu.add(0, MENU_ID_ADVANCED, 0, R.string.wifi_menu_advanced)
             .setIcon(android.R.drawable.ic_menu_manage);
-        
+
         return true;
     }
-    
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         super.onOptionsItemSelected(item);
-        
+
         switch (item.getItemId()) {
 
             case MENU_ID_SCAN:
                 mWifiLayer.attemptScan();
                 return true;
-                
+
             case MENU_ID_ADVANCED:
                 Intent intent = new Intent(this, AdvancedSettings.class);
                 startActivity(intent);
                 return true;
-                
+
             default:
                 return false;
         }
@@ -223,7 +239,7 @@ public class WifiSettings extends PreferenceActivity implements WifiLayer.Callba
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        
+
         if (mDialog != null) {
             Bundle dialogBundle = mDialog.onSaveInstanceState();
             outState.putBundle(INSTANCE_KEY_DIALOG_BUNDLE, dialogBundle);
@@ -233,7 +249,7 @@ public class WifiSettings extends PreferenceActivity implements WifiLayer.Callba
     @Override
     protected void onRestoreInstanceState(Bundle state) {
         super.onRestoreInstanceState(state);
-        
+
         Bundle dialogBundle = state.getBundle(INSTANCE_KEY_DIALOG_BUNDLE);
         if (dialogBundle != null) {
             mDialog = new AccessPointDialog(this, mWifiLayer);
@@ -255,21 +271,21 @@ public class WifiSettings extends PreferenceActivity implements WifiLayer.Callba
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
         super.onCreateContextMenu(menu, v, menuInfo);
-     
+
         AccessPointState state = getStateFromMenuInfo(menuInfo);
         if (state == null) {
             return;
         }
-     
+
         menu.setHeaderTitle(state.getHumanReadableSsid());
-        
+
         if (state.isConnectable()) {
             menu.add(0, CONTEXT_MENU_ID_CONNECT, 0, R.string.wifi_context_menu_connect);
         }
-        
+
         if (state.isForgetable()) {
             menu.add(0, CONTEXT_MENU_ID_FORGET, 1, R.string.wifi_context_menu_forget);
-            
+
             if (state.hasPassword()) {
                 menu.add(0, CONTEXT_MENU_ID_CHANGE_PASSWORD, 2,
                         R.string.wifi_context_menu_change_password);
@@ -286,19 +302,19 @@ public class WifiSettings extends PreferenceActivity implements WifiLayer.Callba
         }
 
         switch (item.getItemId()) {
-            
+
             case CONTEXT_MENU_ID_CONNECT:
                 connectToNetwork(state);
                 return true;
-                
+
             case CONTEXT_MENU_ID_FORGET:
                 mWifiLayer.forgetNetwork(state);
                 return true;
-                
+
             case CONTEXT_MENU_ID_CHANGE_PASSWORD:
                 showAccessPointDialog(state, AccessPointDialog.MODE_CONFIGURE);
                 return true;
-                
+
             default:
                 return false;
         }
@@ -316,12 +332,12 @@ public class WifiSettings extends PreferenceActivity implements WifiLayer.Callba
             mWifiLayer.connectToNetwork(state);
         }
     }
-    
+
     private AccessPointState getStateFromMenuInfo(ContextMenuInfo menuInfo) {
         if ((menuInfo == null) || !(menuInfo instanceof AdapterContextMenuInfo)) {
             return null;
         }
-        
+
         AdapterContextMenuInfo adapterMenuInfo = (AdapterContextMenuInfo) menuInfo;
         Preference pref = (Preference) getPreferenceScreen().getRootAdapter().getItem(
                 adapterMenuInfo.position);
@@ -331,11 +347,11 @@ public class WifiSettings extends PreferenceActivity implements WifiLayer.Callba
 
         return ((AccessPointPreference) pref).getAccessPointState();
     }
-    
+
     //============================
     // Preference callbacks
     //============================
-    
+
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         super.onPreferenceTreeClick(preferenceScreen, preference);
@@ -350,10 +366,10 @@ public class WifiSettings extends PreferenceActivity implements WifiLayer.Callba
             AccessPointState state = ((AccessPointPreference) preference).getAccessPointState();
             showAccessPointDialog(state, AccessPointDialog.MODE_INFO);
         }
-        
+
         return false;
     }
-    
+
     //============================
     // Wifi-related
     //============================
@@ -371,12 +387,10 @@ public class WifiSettings extends PreferenceActivity implements WifiLayer.Callba
         mResumeMode = AccessPointDialog.MODE_CONFIGURE;
         showDialog(dialog);
     }
-    
+
     public void showAccessPointDialog(AccessPointState state, int mode) {
-        if (state.isEnterprise() &&
-                Keystore.getInstance().getState() != Keystore.UNLOCKED) {
-            startActivity(new Intent(
-                    SecuritySettings.ACTION_UNLOCK_CREDENTIAL_STORAGE));
+        if (state.isEnterprise() && mKeyStore.test() != KeyStore.NO_ERROR) {
+            Credentials.getInstance().unlock(this);
             mResumeState = state;
             mResumeMode = mode;
             return;
@@ -392,14 +406,14 @@ public class WifiSettings extends PreferenceActivity implements WifiLayer.Callba
         if (mDialog != null) {
             mDialog.dismiss();
         }
-        
+
         mDialog = dialog;
-        dialog.setOnDismissListener(this);
         if (dialog != null) {
+            dialog.setOnDismissListener(this);
             dialog.show();
         }
     }
-    
+
     //============================
     // Wifi callbacks
     //============================
@@ -410,36 +424,36 @@ public class WifiSettings extends PreferenceActivity implements WifiLayer.Callba
 
     public void onScanningStatusChanged(boolean started) {
         mApCategory.setProgress(started);
-    }    
+    }
 
     public void onAccessPointSetChanged(AccessPointState ap, boolean added) {
 
         AccessPointPreference pref = mAps.get(ap);
-        
+
         if (WifiLayer.LOGV) {
             Log.v(TAG, "onAccessPointSetChanged with " + ap + " and "
                     + (added ? "added" : "removed") + ", found pref " + pref);
         }
-        
+
         if (added) {
-            
+
             if (pref == null) {
                 pref = new AccessPointPreference(this, ap);
                 mAps.put(ap, pref);
             } else {
                 pref.setEnabled(true);
             }
-            
+
             mApCategory.addPreference(pref);
-            
+
         } else {
 
             mAps.remove(ap);
-            
+
             if (pref != null) {
                 mApCategory.removePreference(pref);
             }
-            
+
         }
     }
 
@@ -460,8 +474,8 @@ public class WifiSettings extends PreferenceActivity implements WifiLayer.Callba
             // If we're already showing a dialog, ignore this request
             return;
         }
-        
+
         showAccessPointDialog(ap, AccessPointDialog.MODE_RETRY_PASSWORD);
     }
-    
+
 }
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index cf2e03c0548..8a0ce218230 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,8 +17,18 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.settings.tests">
 
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+
     <application>
         <uses-library android:name="android.test.runner" />
+        <activity android:name="BluetoothRequestPermissionTest"
+            android:label="Bluetooth Perm Test" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
 
     <instrumentation android:name="SettingsLaunchPerformance"
@@ -26,4 +36,4 @@
         android:label="Settings Launch Performance">
     </instrumentation>
 
-</manifest> 
+</manifest>
diff --git a/tests/res/layout/bluetooth_request_permission_test.xml b/tests/res/layout/bluetooth_request_permission_test.xml
new file mode 100644
index 00000000000..8bb0daa7dac
--- /dev/null
+++ b/tests/res/layout/bluetooth_request_permission_test.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <ListView android:id="@+id/msg_container"
+        android:layout_width="fill_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:transcriptMode="normal"/>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        style="@android:style/ButtonBar">
+
+        <Button android:id="@+id/enable"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/enable" />
+
+        <Button android:id="@+id/discover"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/discoverable" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/tests/res/values/strings.xml b/tests/res/values/strings.xml
new file mode 100644
index 00000000000..b06782feed9
--- /dev/null
+++ b/tests/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Test only. Do not translate. -->
+    <!-- Test only. Do not translate. -->
+    <!-- Test only. Do not translate. -->
+    <string name="enable">Enable</string>
+    <string name="discoverable">Discoverable</string>
+</resources>
diff --git a/tests/src/com/android/settings/tests/BluetoothRequestPermissionTest.java b/tests/src/com/android/settings/tests/BluetoothRequestPermissionTest.java
new file mode 100644
index 00000000000..105c98e8ade
--- /dev/null
+++ b/tests/src/com/android/settings/tests/BluetoothRequestPermissionTest.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.tests;
+
+import android.app.Activity;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ListView;
+
+public class BluetoothRequestPermissionTest extends Activity {
+    private static final String TAG = "BluetoothRequestPermissionTest";
+
+    private ArrayAdapter<String> mMsgAdapter;
+
+    private class BtOnClickListener implements OnClickListener {
+        final boolean mEnableOnly; // enable or enable + discoverable
+
+        public BtOnClickListener(boolean enableOnly) {
+            mEnableOnly = enableOnly;
+        }
+
+        public void onClick(View v) {
+            requestPermission(mEnableOnly);
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        setContentView(R.layout.bluetooth_request_permission_test);
+
+        Button enable = (Button) findViewById(R.id.enable);
+        enable.setOnClickListener(new BtOnClickListener(true /* enable */));
+
+        Button discover = (Button) findViewById(R.id.discover);
+        discover.setOnClickListener(new BtOnClickListener(false /* enable & discoverable */));
+
+        mMsgAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1);
+
+        ListView listView = (ListView) findViewById(R.id.msg_container);
+        listView.setAdapter(mMsgAdapter);
+
+        registerReceiver(mReceiver, new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED));
+        addMsg("Initialized");
+    }
+
+    void requestPermission(boolean enableOnly) {
+        Intent i = new Intent();
+        if (enableOnly) {
+            addMsg("Starting activity to enable bt");
+            i.setAction(BluetoothAdapter.ACTION_REQUEST_ENABLE);
+        } else {
+            addMsg("Starting activity to enable bt + discovery");
+            i.setAction(BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE);
+            i.putExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION, 20);
+        }
+        startActivityForResult(i, 1);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode != 1) {
+            Log.e(TAG, "Unexpected onActivityResult " + requestCode + " " + resultCode);
+            return;
+        }
+
+        if (resultCode == Activity.RESULT_CANCELED) {
+            addMsg("Result = RESULT_CANCELED");
+        } else if (resultCode == Activity.RESULT_OK) {
+            addMsg("Result = RESULT_OK (not expected for discovery)");
+        } else {
+            addMsg("Result = " + resultCode);
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        unregisterReceiver(mReceiver);
+    }
+
+    private void addMsg(String msg) {
+        mMsgAdapter.add(msg);
+        Log.d(TAG, "msg");
+    }
+
+    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent == null)
+                return;
+            if (BluetoothAdapter.ACTION_STATE_CHANGED.equals(intent.getAction())) {
+                String stateStr = "???";
+                switch (intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothDevice.ERROR)) {
+                    case BluetoothAdapter.STATE_OFF:
+                        stateStr = "off";
+                        break;
+                    case BluetoothAdapter.STATE_TURNING_ON:
+                        stateStr = "turning on";
+                        break;
+                    case BluetoothAdapter.STATE_ON:
+                        stateStr = "on";
+                        break;
+                    case BluetoothAdapter.STATE_TURNING_OFF:
+                        stateStr = "turning off";
+                        break;
+                }
+                addMsg("Bluetooth status = " + stateStr);
+            }
+        }
+    };
+}