diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9b2391a..35dd268 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1100,7 +1100,7 @@
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.fuelgauge.PowerUsageSummary" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/application_settings" />
+                android:resource="@id/battery_settings" />
         </activity>
 
         <activity
@@ -1185,7 +1185,8 @@
         </activity>
 
         <activity android:name="Settings$DataUsageSummaryActivity"
-                android:label="@string/data_usage_summary_title">
+                android:label="@string/data_usage_summary_title"
+                android:uiOptions="none">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/res/drawable-hdpi/encroid_progress.png b/res/drawable-hdpi/encroid_progress.png
index 1e8e624..f4fb961 100644
--- a/res/drawable-hdpi/encroid_progress.png
+++ b/res/drawable-hdpi/encroid_progress.png
Binary files differ
diff --git a/res/drawable-hdpi/encroid_resignin.png b/res/drawable-hdpi/encroid_resignin.png
index 326a32a..d0e1082 100644
--- a/res/drawable-hdpi/encroid_resignin.png
+++ b/res/drawable-hdpi/encroid_resignin.png
Binary files differ
diff --git a/res/drawable-hdpi/encroid_waiting.png b/res/drawable-hdpi/encroid_waiting.png
index 9111609..1143cb7 100644
--- a/res/drawable-hdpi/encroid_waiting.png
+++ b/res/drawable-hdpi/encroid_waiting.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_applications.png b/res/drawable-hdpi/ic_settings_applications.png
old mode 100755
new mode 100644
index 5cea33f..4d3f128
--- a/res/drawable-hdpi/ic_settings_applications.png
+++ b/res/drawable-hdpi/ic_settings_applications.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_backup.png b/res/drawable-hdpi/ic_settings_backup.png
new file mode 100644
index 0000000..802c335
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_backup.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_battery.png b/res/drawable-hdpi/ic_settings_battery.png
old mode 100755
new mode 100644
index e3b0fb3..fe57826
--- a/res/drawable-hdpi/ic_settings_battery.png
+++ b/res/drawable-hdpi/ic_settings_battery.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_bluetooth2.png b/res/drawable-hdpi/ic_settings_bluetooth2.png
old mode 100755
new mode 100644
index 20ceb20..454b552
--- a/res/drawable-hdpi/ic_settings_bluetooth2.png
+++ b/res/drawable-hdpi/ic_settings_bluetooth2.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_data_usage.png b/res/drawable-hdpi/ic_settings_data_usage.png
old mode 100755
new mode 100644
index 20ceb20..a8af00e
--- a/res/drawable-hdpi/ic_settings_data_usage.png
+++ b/res/drawable-hdpi/ic_settings_data_usage.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_development.png b/res/drawable-hdpi/ic_settings_development.png
old mode 100755
new mode 100644
index e3b0fb3..bbc702b
--- a/res/drawable-hdpi/ic_settings_development.png
+++ b/res/drawable-hdpi/ic_settings_development.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_location.png b/res/drawable-hdpi/ic_settings_location.png
old mode 100755
new mode 100644
index 4202f5b..dcd0f4e
--- a/res/drawable-hdpi/ic_settings_location.png
+++ b/res/drawable-hdpi/ic_settings_location.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_privacy.png b/res/drawable-hdpi/ic_settings_privacy.png
deleted file mode 100644
index b15ba6d..0000000
--- a/res/drawable-hdpi/ic_settings_privacy.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_storage.png b/res/drawable-hdpi/ic_settings_storage.png
old mode 100755
new mode 100644
index e3b0fb3..59c7042
--- a/res/drawable-hdpi/ic_settings_storage.png
+++ b/res/drawable-hdpi/ic_settings_storage.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_update.png b/res/drawable-hdpi/ic_settings_update.png
new file mode 100644
index 0000000..9bf920d
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_update.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_wireless.png b/res/drawable-hdpi/ic_settings_wireless.png
old mode 100755
new mode 100644
index 20ceb20..faed9e3
--- a/res/drawable-hdpi/ic_settings_wireless.png
+++ b/res/drawable-hdpi/ic_settings_wireless.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1.png b/res/drawable-hdpi/ic_wifi_lock_signal_1.png
index 34bbbab..6e4a64a 100644
--- a/res/drawable-hdpi/ic_wifi_lock_signal_1.png
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_1.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2.png b/res/drawable-hdpi/ic_wifi_lock_signal_2.png
index 2ad54ca..3e78f16 100644
--- a/res/drawable-hdpi/ic_wifi_lock_signal_2.png
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_2.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3.png b/res/drawable-hdpi/ic_wifi_lock_signal_3.png
index d4e36d2..56e6934 100644
--- a/res/drawable-hdpi/ic_wifi_lock_signal_3.png
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_3.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4.png b/res/drawable-hdpi/ic_wifi_lock_signal_4.png
index 224eead..33426d3 100644
--- a/res/drawable-hdpi/ic_wifi_lock_signal_4.png
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_4.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_1.png b/res/drawable-hdpi/ic_wifi_signal_1.png
index bb6a2eb..9aeff96 100644
--- a/res/drawable-hdpi/ic_wifi_signal_1.png
+++ b/res/drawable-hdpi/ic_wifi_signal_1.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_2.png b/res/drawable-hdpi/ic_wifi_signal_2.png
index 0a91615..85c1a26 100644
--- a/res/drawable-hdpi/ic_wifi_signal_2.png
+++ b/res/drawable-hdpi/ic_wifi_signal_2.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_3.png b/res/drawable-hdpi/ic_wifi_signal_3.png
index b6f05e6..e28ec131 100644
--- a/res/drawable-hdpi/ic_wifi_signal_3.png
+++ b/res/drawable-hdpi/ic_wifi_signal_3.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_4.png b/res/drawable-hdpi/ic_wifi_signal_4.png
index 11e8a73..aa00c8b 100644
--- a/res/drawable-hdpi/ic_wifi_signal_4.png
+++ b/res/drawable-hdpi/ic_wifi_signal_4.png
Binary files differ
diff --git a/res/drawable-mdpi/encroid_progress.png b/res/drawable-mdpi/encroid_progress.png
index 0dc40c7..e832c2a 100644
--- a/res/drawable-mdpi/encroid_progress.png
+++ b/res/drawable-mdpi/encroid_progress.png
Binary files differ
diff --git a/res/drawable-mdpi/encroid_resignin.png b/res/drawable-mdpi/encroid_resignin.png
index edf9fec..70be860 100644
--- a/res/drawable-mdpi/encroid_resignin.png
+++ b/res/drawable-mdpi/encroid_resignin.png
Binary files differ
diff --git a/res/drawable-mdpi/encroid_waiting.png b/res/drawable-mdpi/encroid_waiting.png
index 2104c0e..a9ac2f7 100644
--- a/res/drawable-mdpi/encroid_waiting.png
+++ b/res/drawable-mdpi/encroid_waiting.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_applications.png b/res/drawable-mdpi/ic_settings_applications.png
old mode 100755
new mode 100644
index 745ff2a..33e23b3
--- a/res/drawable-mdpi/ic_settings_applications.png
+++ b/res/drawable-mdpi/ic_settings_applications.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_backup.png b/res/drawable-mdpi/ic_settings_backup.png
new file mode 100644
index 0000000..e9140d7
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_backup.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_battery.png b/res/drawable-mdpi/ic_settings_battery.png
index e1f478b..6c71cc4 100644
--- a/res/drawable-mdpi/ic_settings_battery.png
+++ b/res/drawable-mdpi/ic_settings_battery.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_bluetooth2.png b/res/drawable-mdpi/ic_settings_bluetooth2.png
old mode 100755
new mode 100644
index f8acded..b05656f
--- a/res/drawable-mdpi/ic_settings_bluetooth2.png
+++ b/res/drawable-mdpi/ic_settings_bluetooth2.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_data_usage.png b/res/drawable-mdpi/ic_settings_data_usage.png
old mode 100755
new mode 100644
index f8acded..8064773
--- a/res/drawable-mdpi/ic_settings_data_usage.png
+++ b/res/drawable-mdpi/ic_settings_data_usage.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_development.png b/res/drawable-mdpi/ic_settings_development.png
index e1f478b..647ceb9 100644
--- a/res/drawable-mdpi/ic_settings_development.png
+++ b/res/drawable-mdpi/ic_settings_development.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_location.png b/res/drawable-mdpi/ic_settings_location.png
index 09b0a63..07b9f27 100644
--- a/res/drawable-mdpi/ic_settings_location.png
+++ b/res/drawable-mdpi/ic_settings_location.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_privacy.png b/res/drawable-mdpi/ic_settings_privacy.png
deleted file mode 100644
index 4487db5..0000000
--- a/res/drawable-mdpi/ic_settings_privacy.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_storage.png b/res/drawable-mdpi/ic_settings_storage.png
index e1f478b..d44f91a 100644
--- a/res/drawable-mdpi/ic_settings_storage.png
+++ b/res/drawable-mdpi/ic_settings_storage.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_update.png b/res/drawable-mdpi/ic_settings_update.png
new file mode 100644
index 0000000..a290b08
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_update.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_wireless.png b/res/drawable-mdpi/ic_settings_wireless.png
old mode 100755
new mode 100644
index f8acded..37d84b8
--- a/res/drawable-mdpi/ic_settings_wireless.png
+++ b/res/drawable-mdpi/ic_settings_wireless.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1.png b/res/drawable-mdpi/ic_wifi_lock_signal_1.png
index 75a5e20..e37b5ab 100644
--- a/res/drawable-mdpi/ic_wifi_lock_signal_1.png
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_1.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2.png b/res/drawable-mdpi/ic_wifi_lock_signal_2.png
index 16543b9..ba9acf9 100644
--- a/res/drawable-mdpi/ic_wifi_lock_signal_2.png
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_2.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3.png b/res/drawable-mdpi/ic_wifi_lock_signal_3.png
index 6324023..434543c 100644
--- a/res/drawable-mdpi/ic_wifi_lock_signal_3.png
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_3.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4.png b/res/drawable-mdpi/ic_wifi_lock_signal_4.png
index 358541d..479acaf 100644
--- a/res/drawable-mdpi/ic_wifi_lock_signal_4.png
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_4.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_1.png b/res/drawable-mdpi/ic_wifi_signal_1.png
index 140f16f..5e6e1a2 100644
--- a/res/drawable-mdpi/ic_wifi_signal_1.png
+++ b/res/drawable-mdpi/ic_wifi_signal_1.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_2.png b/res/drawable-mdpi/ic_wifi_signal_2.png
index 24c1671..29954e7 100644
--- a/res/drawable-mdpi/ic_wifi_signal_2.png
+++ b/res/drawable-mdpi/ic_wifi_signal_2.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_3.png b/res/drawable-mdpi/ic_wifi_signal_3.png
index 1079375..8818534 100644
--- a/res/drawable-mdpi/ic_wifi_signal_3.png
+++ b/res/drawable-mdpi/ic_wifi_signal_3.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_4.png b/res/drawable-mdpi/ic_wifi_signal_4.png
index 4dd1a54..7adadf0 100644
--- a/res/drawable-mdpi/ic_wifi_signal_4.png
+++ b/res/drawable-mdpi/ic_wifi_signal_4.png
Binary files differ
diff --git a/res/drawable-xhdpi/app_gauge.9.png b/res/drawable-xhdpi/app_gauge.9.png
new file mode 100644
index 0000000..ceb798c
--- /dev/null
+++ b/res/drawable-xhdpi/app_gauge.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_bg.9.png b/res/drawable-xhdpi/appwidget_bg.9.png
new file mode 100644
index 0000000..e887b7b
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_bg.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_focus_c.9.png b/res/drawable-xhdpi/appwidget_inner_focus_c.9.png
new file mode 100644
index 0000000..c24cc06
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_inner_focus_c.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_focus_l.9.png b/res/drawable-xhdpi/appwidget_inner_focus_l.9.png
new file mode 100644
index 0000000..4182270
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_inner_focus_l.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_focus_r.9.png b/res/drawable-xhdpi/appwidget_inner_focus_r.9.png
new file mode 100644
index 0000000..d97d021
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_inner_focus_r.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_press_c.9.png b/res/drawable-xhdpi/appwidget_inner_press_c.9.png
new file mode 100644
index 0000000..798d79e
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_inner_press_c.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_press_l.9.png b/res/drawable-xhdpi/appwidget_inner_press_l.9.png
new file mode 100644
index 0000000..7421fab
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_inner_press_l.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_press_r.9.png b/res/drawable-xhdpi/appwidget_inner_press_r.9.png
new file mode 100644
index 0000000..bb2bfc3
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_inner_press_r.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_divider.9.png b/res/drawable-xhdpi/appwidget_settings_divider.9.png
new file mode 100644
index 0000000..47cd9f4
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_divider.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_mid_c.9.png b/res/drawable-xhdpi/appwidget_settings_ind_mid_c.9.png
new file mode 100644
index 0000000..a05852b
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_mid_c.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_mid_l.9.png b/res/drawable-xhdpi/appwidget_settings_ind_mid_l.9.png
new file mode 100644
index 0000000..5deea80
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_mid_l.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_mid_r.9.png b/res/drawable-xhdpi/appwidget_settings_ind_mid_r.9.png
new file mode 100644
index 0000000..0db6a5a
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_mid_r.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_off_c.9.png b/res/drawable-xhdpi/appwidget_settings_ind_off_c.9.png
new file mode 100644
index 0000000..afbdfd9
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_off_c.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_off_l.9.png b/res/drawable-xhdpi/appwidget_settings_ind_off_l.9.png
new file mode 100644
index 0000000..6db4b0e
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_off_l.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_off_r.9.png b/res/drawable-xhdpi/appwidget_settings_ind_off_r.9.png
new file mode 100644
index 0000000..9af4c76
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_off_r.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_on_c.9.png b/res/drawable-xhdpi/appwidget_settings_ind_on_c.9.png
new file mode 100644
index 0000000..0cca144
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_on_c.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_on_l.9.png b/res/drawable-xhdpi/appwidget_settings_ind_on_l.9.png
new file mode 100644
index 0000000..df0ee20
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_on_l.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_on_r.9.png b/res/drawable-xhdpi/appwidget_settings_ind_on_r.9.png
new file mode 100644
index 0000000..7d2105a
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_on_r.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/dotted_line_480px.png b/res/drawable-xhdpi/dotted_line_480px.png
new file mode 100644
index 0000000..7a9d024
--- /dev/null
+++ b/res/drawable-xhdpi/dotted_line_480px.png
Binary files differ
diff --git a/res/drawable-xhdpi/encroid_progress.png b/res/drawable-xhdpi/encroid_progress.png
new file mode 100644
index 0000000..ed9d10f
--- /dev/null
+++ b/res/drawable-xhdpi/encroid_progress.png
Binary files differ
diff --git a/res/drawable-xhdpi/encroid_resignin.png b/res/drawable-xhdpi/encroid_resignin.png
new file mode 100644
index 0000000..1c593da
--- /dev/null
+++ b/res/drawable-xhdpi/encroid_resignin.png
Binary files differ
diff --git a/res/drawable-xhdpi/encroid_waiting.png b/res/drawable-xhdpi/encroid_waiting.png
new file mode 100644
index 0000000..aea5d57
--- /dev/null
+++ b/res/drawable-xhdpi/encroid_waiting.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_off.png b/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_off.png
new file mode 100644
index 0000000..1040b55
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_on.png b/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_on.png
new file mode 100644
index 0000000..47b14b8
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_on.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_brightness_auto.png b/res/drawable-xhdpi/ic_appwidget_settings_brightness_auto.png
new file mode 100644
index 0000000..6ab4610
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_brightness_auto.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_brightness_off.png b/res/drawable-xhdpi/ic_appwidget_settings_brightness_off.png
new file mode 100644
index 0000000..9734349
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_brightness_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_brightness_on.png b/res/drawable-xhdpi/ic_appwidget_settings_brightness_on.png
new file mode 100644
index 0000000..746f307
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_brightness_on.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_gps_off.png b/res/drawable-xhdpi/ic_appwidget_settings_gps_off.png
new file mode 100644
index 0000000..5c4b208
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_gps_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_gps_on.png b/res/drawable-xhdpi/ic_appwidget_settings_gps_on.png
new file mode 100644
index 0000000..2861ea5
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_gps_on.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_sync_off.png b/res/drawable-xhdpi/ic_appwidget_settings_sync_off.png
new file mode 100644
index 0000000..98bfb45
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_sync_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_sync_on.png b/res/drawable-xhdpi/ic_appwidget_settings_sync_on.png
new file mode 100644
index 0000000..c3d308f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_sync_on.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_wifi_off.png b/res/drawable-xhdpi/ic_appwidget_settings_wifi_off.png
new file mode 100644
index 0000000..c9cb47f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_wifi_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_wifi_on.png b/res/drawable-xhdpi/ic_appwidget_settings_wifi_on.png
new file mode 100644
index 0000000..180d4d7
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_wifi_on.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_cellphone.png b/res/drawable-xhdpi/ic_bt_cellphone.png
new file mode 100644
index 0000000..57bad3f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_bt_cellphone.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_config.png b/res/drawable-xhdpi/ic_bt_config.png
new file mode 100644
index 0000000..6754469
--- /dev/null
+++ b/res/drawable-xhdpi/ic_bt_config.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_headphones_a2dp.png b/res/drawable-xhdpi/ic_bt_headphones_a2dp.png
new file mode 100644
index 0000000..125c013
--- /dev/null
+++ b/res/drawable-xhdpi/ic_bt_headphones_a2dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_headset_hfp.png b/res/drawable-xhdpi/ic_bt_headset_hfp.png
new file mode 100644
index 0000000..b7f8108
--- /dev/null
+++ b/res/drawable-xhdpi/ic_bt_headset_hfp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_imaging.png b/res/drawable-xhdpi/ic_bt_imaging.png
new file mode 100644
index 0000000..724a134
--- /dev/null
+++ b/res/drawable-xhdpi/ic_bt_imaging.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_keyboard_hid.png b/res/drawable-xhdpi/ic_bt_keyboard_hid.png
new file mode 100644
index 0000000..a4c310c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_bt_keyboard_hid.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_laptop.png b/res/drawable-xhdpi/ic_bt_laptop.png
new file mode 100644
index 0000000..ead98e3
--- /dev/null
+++ b/res/drawable-xhdpi/ic_bt_laptop.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_misc_hid.png b/res/drawable-xhdpi/ic_bt_misc_hid.png
new file mode 100644
index 0000000..231c6ef
--- /dev/null
+++ b/res/drawable-xhdpi/ic_bt_misc_hid.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_network_pan.png b/res/drawable-xhdpi/ic_bt_network_pan.png
new file mode 100644
index 0000000..2b425c4
--- /dev/null
+++ b/res/drawable-xhdpi/ic_bt_network_pan.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_pointing_hid.png b/res/drawable-xhdpi/ic_bt_pointing_hid.png
new file mode 100644
index 0000000..bb01e17
--- /dev/null
+++ b/res/drawable-xhdpi/ic_bt_pointing_hid.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_btn_next.png b/res/drawable-xhdpi/ic_btn_next.png
new file mode 100644
index 0000000..feae23c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_btn_next.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_emergency.png b/res/drawable-xhdpi/ic_emergency.png
new file mode 100644
index 0000000..3d4a233
--- /dev/null
+++ b/res/drawable-xhdpi/ic_emergency.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_item_delete.png b/res/drawable-xhdpi/ic_item_delete.png
new file mode 100644
index 0000000..2dcd299
--- /dev/null
+++ b/res/drawable-xhdpi/ic_item_delete.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_list_sync_anim0.png b/res/drawable-xhdpi/ic_list_sync_anim0.png
new file mode 100644
index 0000000..9909f6a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_list_sync_anim0.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_list_sync_anim1.png b/res/drawable-xhdpi/ic_list_sync_anim1.png
new file mode 100644
index 0000000..f751f2a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_list_sync_anim1.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_list_sync_anim2.png b/res/drawable-xhdpi/ic_list_sync_anim2.png
new file mode 100644
index 0000000..374db6a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_list_sync_anim2.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_list_sync_anim3.png b/res/drawable-xhdpi/ic_list_sync_anim3.png
new file mode 100644
index 0000000..ec3fde6
--- /dev/null
+++ b/res/drawable-xhdpi/ic_list_sync_anim3.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_list_syncerror.png b/res/drawable-xhdpi/ic_list_syncerror.png
new file mode 100644
index 0000000..dd7b504
--- /dev/null
+++ b/res/drawable-xhdpi/ic_list_syncerror.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_3d_globe.png b/res/drawable-xhdpi/ic_menu_3d_globe.png
new file mode 100644
index 0000000..1fda0a2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_3d_globe.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_add.png b/res/drawable-xhdpi/ic_menu_add.png
new file mode 100644
index 0000000..6b1df2f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_add.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_delete_holo_dark.png b/res/drawable-xhdpi/ic_menu_delete_holo_dark.png
new file mode 100644
index 0000000..9c31231
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_delete_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_refresh_holo_dark.png b/res/drawable-xhdpi/ic_menu_refresh_holo_dark.png
new file mode 100644
index 0000000..3db90ee
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_refresh_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_scan_network.png b/res/drawable-xhdpi/ic_menu_scan_network.png
new file mode 100644
index 0000000..3f74ca7
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_scan_network.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_network_signal_0.png b/res/drawable-xhdpi/ic_network_signal_0.png
new file mode 100644
index 0000000..b609ecf
--- /dev/null
+++ b/res/drawable-xhdpi/ic_network_signal_0.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_network_signal_1.png b/res/drawable-xhdpi/ic_network_signal_1.png
new file mode 100644
index 0000000..854921f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_network_signal_1.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_network_signal_2.png b/res/drawable-xhdpi/ic_network_signal_2.png
new file mode 100644
index 0000000..3db4ce6
--- /dev/null
+++ b/res/drawable-xhdpi/ic_network_signal_2.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_network_signal_3.png b/res/drawable-xhdpi/ic_network_signal_3.png
new file mode 100644
index 0000000..18003e5
--- /dev/null
+++ b/res/drawable-xhdpi/ic_network_signal_3.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_network_signal_4.png b/res/drawable-xhdpi/ic_network_signal_4.png
new file mode 100644
index 0000000..5e2b009
--- /dev/null
+++ b/res/drawable-xhdpi/ic_network_signal_4.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_power_system.png b/res/drawable-xhdpi/ic_power_system.png
new file mode 100644
index 0000000..9a360f7
--- /dev/null
+++ b/res/drawable-xhdpi/ic_power_system.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_about.png b/res/drawable-xhdpi/ic_settings_about.png
new file mode 100644
index 0000000..84c3cd1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_about.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_accessibility.png b/res/drawable-xhdpi/ic_settings_accessibility.png
new file mode 100644
index 0000000..2fec7a3
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_accessibility.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_applications.png b/res/drawable-xhdpi/ic_settings_applications.png
new file mode 100644
index 0000000..8eda83f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_applications.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_backup.png b/res/drawable-xhdpi/ic_settings_backup.png
new file mode 100644
index 0000000..61f6af3
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_backup.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_battery.png b/res/drawable-xhdpi/ic_settings_battery.png
new file mode 100644
index 0000000..f7aa7a4
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_battery.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_bluetooth.png b/res/drawable-xhdpi/ic_settings_bluetooth.png
new file mode 100644
index 0000000..a75b550
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_bluetooth.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_bluetooth2.png b/res/drawable-xhdpi/ic_settings_bluetooth2.png
new file mode 100644
index 0000000..80a94ac
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_bluetooth2.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_cell_standby.png b/res/drawable-xhdpi/ic_settings_cell_standby.png
new file mode 100644
index 0000000..cf783dc
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_cell_standby.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_data_usage.png b/res/drawable-xhdpi/ic_settings_data_usage.png
index 176dd11..8c8f620 100644
--- a/res/drawable-xhdpi/ic_settings_data_usage.png
+++ b/res/drawable-xhdpi/ic_settings_data_usage.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_date_time.png b/res/drawable-xhdpi/ic_settings_date_time.png
new file mode 100644
index 0000000..ca8cac6
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_date_time.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_development.png b/res/drawable-xhdpi/ic_settings_development.png
new file mode 100644
index 0000000..18d2dc8
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_development.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_display.png b/res/drawable-xhdpi/ic_settings_display.png
new file mode 100644
index 0000000..3f073b4
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_display.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_dock.png b/res/drawable-xhdpi/ic_settings_dock.png
new file mode 100644
index 0000000..483579a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_dock.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_language.png b/res/drawable-xhdpi/ic_settings_language.png
new file mode 100644
index 0000000..2c42db3
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_language.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_location.png b/res/drawable-xhdpi/ic_settings_location.png
new file mode 100644
index 0000000..29ed43c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_location.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_more_wireless.png b/res/drawable-xhdpi/ic_settings_more_wireless.png
new file mode 100644
index 0000000..a611c92
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_more_wireless.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_phone_idle.png b/res/drawable-xhdpi/ic_settings_phone_idle.png
new file mode 100644
index 0000000..09c322f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_phone_idle.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_security.png b/res/drawable-xhdpi/ic_settings_security.png
new file mode 100644
index 0000000..4cc9d4b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_security.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_sound.png b/res/drawable-xhdpi/ic_settings_sound.png
new file mode 100644
index 0000000..687025d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_sound.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_storage.png b/res/drawable-xhdpi/ic_settings_storage.png
new file mode 100644
index 0000000..0807c9f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_storage.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_sync.png b/res/drawable-xhdpi/ic_settings_sync.png
new file mode 100644
index 0000000..a66d8a4
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_sync.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_update.png b/res/drawable-xhdpi/ic_settings_update.png
new file mode 100644
index 0000000..7659a6f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_update.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_voice_calls.png b/res/drawable-xhdpi/ic_settings_voice_calls.png
new file mode 100644
index 0000000..07b9074
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_voice_calls.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_wifi.png b/res/drawable-xhdpi/ic_settings_wifi.png
new file mode 100644
index 0000000..2bd4648
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_wifi.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_wireless.png b/res/drawable-xhdpi/ic_settings_wireless.png
new file mode 100644
index 0000000..79d0ef5
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_wireless.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_green.png b/res/drawable-xhdpi/ic_sync_green.png
new file mode 100644
index 0000000..1c49594
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_green.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_grey.png b/res/drawable-xhdpi/ic_sync_grey.png
new file mode 100644
index 0000000..8a17f37
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_grey.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_red.png b/res/drawable-xhdpi/ic_sync_red.png
new file mode 100644
index 0000000..92d02e1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_red.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sysbar_quicksettings.png b/res/drawable-xhdpi/ic_sysbar_quicksettings.png
new file mode 100644
index 0000000..a057db8
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sysbar_quicksettings.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tab_selected_all.png b/res/drawable-xhdpi/ic_tab_selected_all.png
new file mode 100644
index 0000000..b59933b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tab_selected_all.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tab_selected_download.png b/res/drawable-xhdpi/ic_tab_selected_download.png
new file mode 100644
index 0000000..8e76bbb
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tab_selected_download.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tab_selected_running.png b/res/drawable-xhdpi/ic_tab_selected_running.png
new file mode 100644
index 0000000..8eda83f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tab_selected_running.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tab_selected_sdcard.png b/res/drawable-xhdpi/ic_tab_selected_sdcard.png
new file mode 100644
index 0000000..536326c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tab_selected_sdcard.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tab_unselected_all.png b/res/drawable-xhdpi/ic_tab_unselected_all.png
new file mode 100644
index 0000000..b59933b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tab_unselected_all.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tab_unselected_download.png b/res/drawable-xhdpi/ic_tab_unselected_download.png
new file mode 100644
index 0000000..8e76bbb
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tab_unselected_download.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tab_unselected_running.png b/res/drawable-xhdpi/ic_tab_unselected_running.png
new file mode 100644
index 0000000..8eda83f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tab_unselected_running.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tab_unselected_sdcard.png b/res/drawable-xhdpi/ic_tab_unselected_sdcard.png
new file mode 100644
index 0000000..536326c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tab_unselected_sdcard.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1.png
new file mode 100644
index 0000000..598a6e1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_1.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2.png
new file mode 100644
index 0000000..1728d1e
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_2.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3.png
new file mode 100644
index 0000000..54d9f23
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_3.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4.png
new file mode 100644
index 0000000..1061891
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_4.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_1.png b/res/drawable-xhdpi/ic_wifi_signal_1.png
new file mode 100644
index 0000000..3707994
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_1.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_2.png b/res/drawable-xhdpi/ic_wifi_signal_2.png
new file mode 100644
index 0000000..f9afb6a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_2.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_3.png b/res/drawable-xhdpi/ic_wifi_signal_3.png
new file mode 100644
index 0000000..a84fdcb
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_3.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_4.png b/res/drawable-xhdpi/ic_wifi_signal_4.png
new file mode 100644
index 0000000..db13a1c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_4.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_0.png b/res/drawable-xhdpi/lock_anim_0.png
new file mode 100644
index 0000000..5e8e6dc
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_0.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_1.png b/res/drawable-xhdpi/lock_anim_1.png
new file mode 100644
index 0000000..96fbd03
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_1.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_10.png b/res/drawable-xhdpi/lock_anim_10.png
new file mode 100644
index 0000000..e2e83b1
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_10.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_11.png b/res/drawable-xhdpi/lock_anim_11.png
new file mode 100644
index 0000000..68de396
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_11.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_12.png b/res/drawable-xhdpi/lock_anim_12.png
new file mode 100644
index 0000000..11e51c7
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_12.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_13.png b/res/drawable-xhdpi/lock_anim_13.png
new file mode 100644
index 0000000..86a6115
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_13.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_14.png b/res/drawable-xhdpi/lock_anim_14.png
new file mode 100644
index 0000000..5bff2fa
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_14.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_2.png b/res/drawable-xhdpi/lock_anim_2.png
new file mode 100644
index 0000000..68e59c8
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_2.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_3.png b/res/drawable-xhdpi/lock_anim_3.png
new file mode 100644
index 0000000..16272ed
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_3.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_4.png b/res/drawable-xhdpi/lock_anim_4.png
new file mode 100644
index 0000000..af6fbc4
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_4.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_5.png b/res/drawable-xhdpi/lock_anim_5.png
new file mode 100644
index 0000000..1e631b5
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_5.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_6.png b/res/drawable-xhdpi/lock_anim_6.png
new file mode 100644
index 0000000..93fcf39
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_6.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_7.png b/res/drawable-xhdpi/lock_anim_7.png
new file mode 100644
index 0000000..b5c5277
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_7.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_8.png b/res/drawable-xhdpi/lock_anim_8.png
new file mode 100644
index 0000000..bcaec0d
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_8.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_9.png b/res/drawable-xhdpi/lock_anim_9.png
new file mode 100644
index 0000000..c481d1a
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_9.png
Binary files differ
diff --git a/res/drawable-xhdpi/nav_divider.png b/res/drawable-xhdpi/nav_divider.png
new file mode 100644
index 0000000..00e3852
--- /dev/null
+++ b/res/drawable-xhdpi/nav_divider.png
Binary files differ
diff --git a/res/drawable-xhdpi/password_field_default.9.png b/res/drawable-xhdpi/password_field_default.9.png
new file mode 100644
index 0000000..cf8329e
--- /dev/null
+++ b/res/drawable-xhdpi/password_field_default.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/preview.png b/res/drawable-xhdpi/preview.png
new file mode 100644
index 0000000..8dfe17f
--- /dev/null
+++ b/res/drawable-xhdpi/preview.png
Binary files differ
diff --git a/res/drawable-xhdpi/setups_bg_complete.png b/res/drawable-xhdpi/setups_bg_complete.png
new file mode 100644
index 0000000..bcf55ad
--- /dev/null
+++ b/res/drawable-xhdpi/setups_bg_complete.png
Binary files differ
diff --git a/res/drawable-xhdpi/setups_bg_default.png b/res/drawable-xhdpi/setups_bg_default.png
new file mode 100644
index 0000000..12d171f
--- /dev/null
+++ b/res/drawable-xhdpi/setups_bg_default.png
Binary files differ
diff --git a/res/drawable-xhdpi/setups_bg_wifi.png b/res/drawable-xhdpi/setups_bg_wifi.png
new file mode 100644
index 0000000..aa086c7
--- /dev/null
+++ b/res/drawable-xhdpi/setups_bg_wifi.png
Binary files differ
diff --git a/res/drawable-xhdpi/stat_sys_phone_call.png b/res/drawable-xhdpi/stat_sys_phone_call.png
new file mode 100644
index 0000000..3089858
--- /dev/null
+++ b/res/drawable-xhdpi/stat_sys_phone_call.png
Binary files differ
diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml
index 958cc16..cb817c5 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -20,7 +20,6 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    android:background="@android:color/background_dark"
     android:gravity="center_horizontal">
 
     <!-- header text ('Enter Pin') -->
diff --git a/res/layout/choose_lock_pattern.xml b/res/layout/choose_lock_pattern.xml
index a356315..f932b4e 100644
--- a/res/layout/choose_lock_pattern.xml
+++ b/res/layout/choose_lock_pattern.xml
@@ -18,8 +18,7 @@
     android:id="@+id/topLayout"
     android:orientation="vertical"
     android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:background="@color/black">
+    android:layout_height="match_parent">
 
     <!-- takes up all space above button bar at bottom -->
     <LinearLayout
diff --git a/res/layout/confirm_lock_pattern.xml b/res/layout/confirm_lock_pattern.xml
index 5c6d812..bd100d4 100644
--- a/res/layout/confirm_lock_pattern.xml
+++ b/res/layout/confirm_lock_pattern.xml
@@ -18,8 +18,7 @@
     android:id="@+id/topLayout"
     android:orientation="vertical"
     android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:background="@color/black">
+    android:layout_height="match_parent">
 
     <TextView android:id="@+id/headerText"
         android:layout_width="match_parent"
diff --git a/res/layout/data_usage_app_title.xml b/res/layout/data_usage_app_title.xml
new file mode 100644
index 0000000..baaa685
--- /dev/null
+++ b/res/layout/data_usage_app_title.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:singleLine="true"
+    android:ellipsize="marquee"
+    android:textAppearance="?android:attr/textAppearanceMedium" />
diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml
index 3ae8a03..c1f6c27 100644
--- a/res/layout/data_usage_chart.xml
+++ b/res/layout/data_usage_chart.xml
@@ -30,7 +30,7 @@
         settings:primaryDrawable="@drawable/data_grid_primary"
         settings:secondaryDrawable="@drawable/data_grid_secondary"
         settings:borderDrawable="@drawable/data_grid_border"
-        settings:labelColor="#24aae1" />
+        settings:labelColor="#667bb5" />
 
     <com.android.settings.widget.ChartNetworkSeriesView
         android:id="@+id/series"
diff --git a/res/layout/data_usage_detail.xml b/res/layout/data_usage_detail.xml
index 2c8e490..8d0c0cc 100644
--- a/res/layout/data_usage_detail.xml
+++ b/res/layout/data_usage_detail.xml
@@ -20,17 +20,20 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/app_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="16dip" />
+    <ImageView
+        android:id="@+id/app_icon"
+        android:layout_width="48dip"
+        android:layout_height="48dip"
+        android:layout_marginLeft="16dip"
+        android:scaleType="centerInside" />
 
-    <TextView
-        android:id="@+id/app_subtitle"
+    <LinearLayout
+        android:id="@+id/app_titles"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="16dip" />
+        android:layout_height="match_parent"
+        android:layout_marginLeft="16dip"
+        android:layout_marginTop="8dip"
+        android:orientation="vertical" />
 
     <Button
         android:id="@+id/app_settings"
diff --git a/res/layout/data_usage_header.xml b/res/layout/data_usage_header.xml
index 9602898..528fc34 100644
--- a/res/layout/data_usage_header.xml
+++ b/res/layout/data_usage_header.xml
@@ -43,6 +43,8 @@
         android:paddingRight="16dip"
         android:paddingTop="8dip"
         android:paddingBottom="8dip"
+        android:singleLine="true"
+        android:ellipsize="marquee"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
     <TextView
diff --git a/res/layout/data_usage_item.xml b/res/layout/data_usage_item.xml
index 36f8b4d..b41d486 100644
--- a/res/layout/data_usage_item.xml
+++ b/res/layout/data_usage_item.xml
@@ -21,7 +21,15 @@
     android:paddingRight="16dip"
     android:paddingTop="8dip"
     android:paddingBottom="8dip"
-    android:columnCount="2">
+    android:columnCount="3">
+
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="48dip"
+        android:layout_height="48dip"
+        android:layout_rowSpan="2"
+        android:layout_marginRight="8dip"
+        android:scaleType="centerInside" />
 
     <TextView
         android:id="@android:id/title"
diff --git a/res/layout/preference_bluetooth.xml b/res/layout/preference_bluetooth.xml
index bd437a9..e10c65f 100644
--- a/res/layout/preference_bluetooth.xml
+++ b/res/layout/preference_bluetooth.xml
@@ -19,13 +19,6 @@
     android:layout_height="wrap_content"
     android:gravity="center_vertical">
 
-    <LinearLayout android:id="@+id/profileIcons"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_alignParentRight="true"
-        />
-
     <!-- Divider -->
     <ImageView
         android:id="@+id/divider"
diff --git a/res/layout/preference_dialog_ringervolume.xml b/res/layout/preference_dialog_ringervolume.xml
index 4944f91..66067b3 100644
--- a/res/layout/preference_dialog_ringervolume.xml
+++ b/res/layout/preference_dialog_ringervolume.xml
@@ -59,7 +59,7 @@
                 <ImageView android:id="@+id/media_mute_button"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:padding="8dip"
+                        android:padding="16dip"
                         android:background="?android:attr/selectableItemBackground"
                     />
 
@@ -68,7 +68,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:paddingTop="2dip"
-                        android:paddingLeft="20dip"
+                        android:paddingLeft="12dip"
                         android:paddingRight="20dip" />
         </LinearLayout>
 
@@ -100,7 +100,7 @@
                     <ImageView android:id="@+id/ringer_mute_button"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:padding="8dip"
+                            android:padding="16dip"
                             android:background="?android:attr/selectableItemBackground"
                         />
 
@@ -109,7 +109,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:paddingTop="2dip"
-                            android:paddingLeft="20dip"
+                            android:paddingLeft="12dip"
                             android:paddingRight="20dip" />
             </LinearLayout>
 
@@ -143,7 +143,7 @@
                     <ImageView android:id="@+id/notification_mute_button"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:padding="8dip"
+                            android:padding="16dip"
                             android:background="?android:attr/selectableItemBackground"
                         />
 
@@ -152,7 +152,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:paddingTop="2dip"
-                            android:paddingLeft="20dip"
+                            android:paddingLeft="12dip"
                             android:paddingRight="20dip" />
             </LinearLayout>
 
@@ -173,12 +173,13 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="8dip"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:gravity="center_vertical">
 
                 <ImageView android:id="@+id/alarm_mute_button"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:padding="8dip"
+                        android:padding="16dip"
                         android:background="?android:attr/selectableItemBackground"
                     />
                 <SeekBar android:id="@+id/alarm_volume_seekbar"
@@ -186,7 +187,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:paddingTop="2dip"
-                        android:paddingLeft="20dip"
+                        android:paddingLeft="12dip"
                         android:paddingRight="20dip" />
         </LinearLayout>
 
diff --git a/res/layout/vpn_dialog.xml b/res/layout/vpn_dialog.xml
index b4779e6..841e093 100644
--- a/res/layout/vpn_dialog.xml
+++ b/res/layout/vpn_dialog.xml
@@ -56,7 +56,7 @@
                         android:hint="@string/vpn_not_used"/>
             </LinearLayout>
 
-            <LinearLayout android:id="@+id/ipsec_id"
+            <LinearLayout android:id="@+id/ipsec_psk"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
@@ -64,13 +64,7 @@
                 <TextView style="@style/vpn_label" android:text="@string/vpn_ipsec_identifier"/>
                 <EditText style="@style/vpn_value" android:id="@+id/ipsec_identifier"
                         android:hint="@string/vpn_not_used"/>
-            </LinearLayout>
 
-            <LinearLayout android:id="@+id/ipsec_psk"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:visibility="gone">
                 <TextView style="@style/vpn_label" android:text="@string/vpn_ipsec_secret"/>
                 <EditText style="@style/vpn_value" android:id="@+id/ipsec_secret"
                         android:password="true"/>
diff --git a/res/mipmap-xhdpi/ic_launcher_settings.png b/res/mipmap-xhdpi/ic_launcher_settings.png
new file mode 100644
index 0000000..50ca0db
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 71159a9..3a917ae 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -2072,7 +2072,7 @@
     <skip />
     <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
     <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <!-- no translation found for cryptkeeper_emergency_call (198578731586097145) -->
     <skip />
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 349b97e..3d9fe66 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -2074,7 +2074,7 @@
     <skip />
     <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
     <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <!-- no translation found for cryptkeeper_emergency_call (198578731586097145) -->
     <skip />
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 1ab399b..f216898 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -68,13 +68,15 @@
     <item msgid="490158884605093126">"كبير جدًا"</item>
     <item msgid="2123802548987439763">"كبير جدًا"</item>
   </string-array>
-    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
-    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
-    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
-    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
-    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
-    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
-    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
+  <string-array name="entryvalues_font_size">
+    <item msgid="8122189478379706788">"0.70"</item>
+    <item msgid="186029675505810577">"0.85"</item>
+    <item msgid="5864822191921585498">"0.95"</item>
+    <item msgid="5580820036923893743">"1.0"</item>
+    <item msgid="5106590751949630532">"1.05"</item>
+    <item msgid="1803159594904488544">"1.15"</item>
+    <item msgid="7410681469566563300">"1.30"</item>
+  </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"بطيء للغاية"</item>
     <item msgid="2361722960903353554">"بطيء"</item>
@@ -213,9 +215,11 @@
     <item msgid="535934025797984365">"بروتوكول CHAP"</item>
     <item msgid="8383098660619805783">"بروتوكول مصادقة كلمات المرور أو بروتوكول CHAP"</item>
   </string-array>
-    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
-    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
-    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
+  <string-array name="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"سعة تخزين الجهاز الداخلية"</item>
     <item msgid="3738430123799803530">"بطاقة SD قابلة للإزالة"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 4378e91..3765578 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -148,8 +148,7 @@
     <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"المس للاتصال بـ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"هل تريد الاتصال بـ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"؟"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"طلب دفتر الهاتف"</string>
-    <!-- no translation found for bluetooth_pb_acceptance_dialog_text (5203107624986011263) -->
-    <skip />
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"يريد %1$s الدخول إلى جهات الاتصال وسجل المكالمات. هل تريد منحه حق الدخول إلى %2$s؟"</string>
     <string name="bluetooth_pb_alwaysallowed" msgid="3953839482721299910">"هل يتم السماح بذلك دائمًا؟"</string>
     <string name="date_and_time" msgid="4114084177056654663">"إعدادات التاريخ والوقت"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 م"</string>
@@ -804,7 +803,7 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"تم تسجيل دخولك حاليًا في الحسابات التالية:"\n</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"الموسيقى"</li>\n<li>"الصور"</li>\n<li>"بيانات المستخدم الأخرى"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"لمسح الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يلزم محو "<b>"وحدة تخزين USB"</b>"."</string>
-    <!-- syntax error in translation for master_clear_desc_erase_external_storage (7339100478676372901) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:177 in java.io.StringReader@721cdeff)  -->
+    <!-- syntax error in translation for master_clear_desc_erase_external_storage (7339100478676372901) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:177 in java.io.StringReader@272d7a10)  -->
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"محو وحدة تخزين USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"محو بطاقة SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"محو كل البيانات على وحدة تخزين USB الداخلية، مثل الموسيقى والصور."</string>
@@ -1521,7 +1520,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"الحد"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"التطبيقات المزالة"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"تم استلام <xliff:g id="RECEIVED">%1$s</xliff:g>، تم إرسال <xliff:g id="SENT">%2$s</xliff:g>"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"الاتصال بالطوارئ"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"العودة إلى المكالمة"</string>
@@ -1544,8 +1543,7 @@
     <string name="vpn_username" msgid="1863901629860867849">"اسم المستخدم"</string>
     <string name="vpn_password" msgid="6756043647233596772">"كلمة المرور"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"حفظ معلومات الحساب"</string>
-    <!-- no translation found for vpn_not_used (9094191054524660891) -->
-    <skip />
+    <string name="vpn_not_used" msgid="9094191054524660891">"(غير مستخدم)"</string>
     <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(عدم التحقق من ملكية الخادم)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"إلغاء"</string>
     <string name="vpn_save" msgid="4233484051644764510">"حفظ"</string>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 7ed3bde..f23b3a3 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -68,13 +68,15 @@
     <item msgid="490158884605093126">"Много голям"</item>
     <item msgid="2123802548987439763">"Извънредно голям"</item>
   </string-array>
-    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
-    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
-    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
-    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
-    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
-    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
-    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
+  <string-array name="entryvalues_font_size">
+    <item msgid="8122189478379706788">"0,70"</item>
+    <item msgid="186029675505810577">"0,85"</item>
+    <item msgid="5864822191921585498">"0,95"</item>
+    <item msgid="5580820036923893743">"1,0"</item>
+    <item msgid="5106590751949630532">"1,05"</item>
+    <item msgid="1803159594904488544">"1,15"</item>
+    <item msgid="7410681469566563300">"1,30"</item>
+  </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Много бавна"</item>
     <item msgid="2361722960903353554">"Бавна"</item>
@@ -132,14 +134,18 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
-    <!-- no translation found for wifi_p2p_wps_setup:0 (5085064298144493867) -->
-    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
-    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
-    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
-    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
-    <!-- no translation found for wifi_p2p_status:2 (7455862395128183796) -->
-    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
-    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Бутон"</item>
+    <item msgid="8084424421884876981">"ПИН от съответното устройство"</item>
+    <item msgid="9033470670389392191">"ПИН от това у-во"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Установена е връзка"</item>
+    <item msgid="3189211552661432651">"Има покана"</item>
+    <item msgid="7455862395128183796">"Неуспешно"</item>
+    <item msgid="7785896708926971207">"Налице"</item>
+    <item msgid="829499112585677508">"Извън обхват"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="1106621950288502195">"2 минути"</item>
     <item msgid="5780349442819375570">"5 минути"</item>
@@ -209,9 +215,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP или CHAP"</item>
   </string-array>
-    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
-    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
-    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
+  <string-array name="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Вътрешно хранилище на устройство"</item>
     <item msgid="3738430123799803530">"SD карта, която може да се премахва"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index a37504c3..4275f96 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -94,15 +94,12 @@
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Студено"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Откриваемо"</string>
-    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
-    <skip />
-    <!-- outdated translation 8573385118329733931 -->     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Откриваемо"</string>
-    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
-    <skip />
-    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
-    <skip />
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Видимо за вс. у-ва с Bluetooth в района (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Видимо за всички устройства с Bluetooth в района"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Не е видимо за други устройства с Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Видимо само за сдвоени устройства"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Устройството да стане откриваемо"</string>
-    <!-- outdated translation 6634508002347847278 -->     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Време за изчакване за откриване"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Време за изчакване за видимост"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Задаване на време, за което устройството ще бъде откриваемо"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Заключване на гласовото набиране"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Предотвратява употребата на набирането за Bluetooth при заключен екран"</string>
@@ -110,16 +107,11 @@
     <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>
-    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
-    <skip />
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Преименуване на таблета"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Преименуване на телефона"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Преименуване"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Да се прекъсне ли връзката?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Това ще прекрати връзката ви със:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</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>
@@ -129,15 +121,14 @@
     <string name="bluetooth_not_connected" msgid="3389882907500605937">"Сдвояване с това устройство"</string>
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Сдвояване..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Сдвоено, но несвързано"</string>
-    <!-- outdated translation 6873461446424952003 -->     <string name="bluetooth_device" msgid="5291950341750186887">"„свободни ръце“/слушалки"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Устройство с Bluetooth без име"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Търси се"</string>
     <string name="progress_tap_to_pair" msgid="4192342336107106334">"Докосн. за сдвояване"</string>
     <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"В района няма намерени у-ва с Bluetooth."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Заявка за сдвояване чрез Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Заявка за сдвояване"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Избор за сдвояване с/ъс<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
-    <skip />
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Показване на получени файлове"</string>
     <string name="device_picker" msgid="8721012448931226323">"Избиране на Bluetooth устройство"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Заявка за разрешение на Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Приложение иска разрешение да включи Bluetooth. Искате ли да направите това?"</string>
@@ -157,8 +148,7 @@
     <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Докоснете, за да се свържете с/ъс „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Искате ли да се свържете с/ъс „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Заявка за телефонен указател"</string>
-    <!-- no translation found for bluetooth_pb_acceptance_dialog_text (5203107624986011263) -->
-    <skip />
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"От %1$s се иска достъп до вашите контакти и история на обаждания. Да се даде ли достъп до %2$s?"</string>
     <string name="bluetooth_pb_alwaysallowed" msgid="3953839482721299910">"Винаги ли да е разрешено?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Настройки за дата и час"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13:00"</string>
@@ -405,26 +395,17 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Управление на връзки, задаване на име и откриваемост на устройство"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Заявка за сдвояване чрез Bluetooth"</string>
-    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
-    <skip />
-    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
-    <skip />
-    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
-    <skip />
-    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
-    <skip />
-    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
-    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"За сдвояване със:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Въведете необходимия ПИН на устройството:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"За сдвояване със:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Въведете необходимия код за достъп на устройството:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"ПИН кодът съдържа букви или символи"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Обикновено 0000 или 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Възможно е също така да се наложи да въведете този ПИН на другото устройство."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Възможно е също така да се наложи да въведете този код за достъп на другото устройство."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"За сдвояване със:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Уверете се, че устройството показва този код за достъп:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"От:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Да се сдвои с това устройство?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"За сдвояване със:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Въведете на устройството:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, последвано от „Return“ или „Enter“."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Сдвояване"</string>
-    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Без сдвояване"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Отказ"</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="6065697229258906937">"Възникна проблем при сдвояването с <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, защото PIN кодът или този за достъп не е правилен."</string>
@@ -490,8 +471,7 @@
     <skip />
     <!-- no translation found for zeroclick_off_summary (2896320184904157018) -->
     <skip />
-    <!-- no translation found for zeroclick_label (6908892664706309626) -->
-    <skip />
+    <string name="zeroclick_label" msgid="6908892664706309626">"Споделяне без кликване"</string>
     <!-- no translation found for zeroclick_explained (3953149564512166049) -->
     <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
@@ -573,24 +553,15 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Шлюз"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Дължина на мрежов префикс"</string>
-    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
-    <skip />
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Настройка за връзка със свързани устройства"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Информация за устройството"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Защитена настройка на Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Въведете ПИН"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Запомняне на тази връзка"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Търсене"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Създаване на група"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Разширени"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Преносима гореща точка за Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Активна преносима гореща точка <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Грешка на преносимата гореща точка за Wi-Fi"</string>
@@ -603,8 +574,7 @@
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодия на телефон"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <!-- outdated translation 8741571721868253103 -->     <string name="all_volume_title" msgid="4296957391257836961">"Сила на звука"</string>
-    <!-- no translation found for musicfx_title (3853457094486073206) -->
-    <skip />
+    <string name="musicfx_title" msgid="3853457094486073206">"Музикални ефекти"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Сила на звука при звънене"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вибрира при тих режим"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Вибриране"</string>
@@ -1053,10 +1023,8 @@
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Неуспешно преместване на приложение. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Предпочитано място за инсталиране"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Промяна на предпочитаното място за инсталиране на нови приложения"</string>
-    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
-    <skip />
-    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
-    <skip />
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Деакт. на вградено приложение"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Деактивирането на вградено приложение може да причини неправилно функциониране на други приложения. Наистина ли искате да го направите?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Употреба на хранилището"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Преглед на хранилището, използвано от приложения"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Течащи услуги:"</string>
@@ -1444,8 +1412,7 @@
     <!-- no translation found for accessibility_sync_error (8703299118794272041) -->
     <skip />
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Настройки за синхрон"</string>
-    <!-- no translation found for sync_is_failing (1591561768344128377) -->
-    <skip />
+    <string name="sync_is_failing" msgid="1591561768344128377">"Синхронизирането понастоящем среща проблеми. Ще продължи скоро."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Добавяне на профил"</string>
     <string name="header_general_sync_settings" msgid="3487451896424238469">"Общи настр. за синхронизиране"</string>
     <string name="background_data" msgid="5779592891375473817">"Данни на заден план"</string>
@@ -1506,7 +1473,7 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Скала на аним.: Прозорец"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Скала на анимация: Преход"</string>
     <string name="debug_applications_category" msgid="6221644998451283813">"Приложения"</string>
-    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Дейности – без запазване"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Без съхран. на дейностите"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Унищож. на всяка дейност при напускане от потребител"</string>
     <string name="app_process_limit_title" msgid="4280600650253107163">"Лимит за фонови процеси"</string>
     <!-- no translation found for show_all_anrs (28462979638729082) -->
@@ -1519,7 +1486,7 @@
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Огран. на данните на заден план"</string>
     <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Отделяне на използването на 4G"</string>
     <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Ползване на Wi-Fi – показване"</string>
-    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Употреба на Ethernet – Показване"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Да се покаже употр. на Ethernet"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Промяна на цикъла…"</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Ден от месец за възстанов. на цикъла за използване на данни:"</string>
     <!-- no translation found for data_usage_empty (9089930257306304588) -->
@@ -1552,9 +1519,8 @@
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"предупреждение"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ограничение"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Премахнати приложения"</string>
-    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
-    <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> получени, <xliff:g id="SENT">%2$s</xliff:g> изпратени"</string>
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Спешно обаждане"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Назад към обаждането"</string>
@@ -1577,8 +1543,7 @@
     <string name="vpn_username" msgid="1863901629860867849">"Потребителско име"</string>
     <string name="vpn_password" msgid="6756043647233596772">"Парола"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"Да се запази информацията за профила"</string>
-    <!-- no translation found for vpn_not_used (9094191054524660891) -->
-    <skip />
+    <string name="vpn_not_used" msgid="9094191054524660891">"(неизползвано)"</string>
     <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(без потвърждаване на сървъра)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Отказ"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Запазване"</string>
@@ -1597,40 +1562,25 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Да се активира ли сертификатът от сертифициращ орган за системата?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Да се деактивира ли сертификатът от сертифициращ орган за системата?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Да се премахне ли завинаги сертификатът от сертифициращ орган за потребителя?"</string>
-    <!-- no translation found for accessibility_tutorial_title (7577630829320003070) -->
-    <skip />
+    <string name="accessibility_tutorial_title" msgid="7577630829320003070">"Урок за Talk As I Touch"</string>
     <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Напред"</string>
     <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Назад"</string>
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Край"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Пропускане"</string>
-    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_1 (2465037336858060269) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_4 (5374753806314829405) -->
-    <skip />
-    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
-    <skip />
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Урок 1: Изследване на екрана"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="2465037336858060269">"След като включите Talk As I Touch, можете да докосвате екрана, за да чуете описание на това, което е под пръста ви. Например текущият екран съдържа икони на приложения. Намерете една от тях, като докоснете екрана и плъзнете пръста си наоколо."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Добре! Продължете да плъзгате пръста си върху екрана, докато намерите поне още една икона."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"За да активирате нещо, което докосвате, го натиснете. Плъзнете пръста си, докато намерите иконата на <xliff:g id="APP_NAME">%s</xliff:g>. После я докоснете веднъж, за да я активирате."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Пръстът ви докосва иконата на <xliff:g id="APP_NAME">%s</xliff:g>. Докоснете веднъж, за да я активирате."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Пръстът ви се придвижи до иконата на <xliff:g id="APP_NAME">%s</xliff:g> и след това се отдалечи. Бавно плъзнете пръста си около екрана, докато намерите отново иконата за браузъра."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Добре. За да се придвижите към следващия урок, намерете и активирайте бутона „<xliff:g id="NEXT">%s</xliff:g>“, който се намира в долния десен ъгъл на екрана."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Урок 2: Превъртане посредством два пръста"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"За превъртане през списък можете да плъзнете два пръста по екрана. Например текущият екран съдържа списък с имена на приложения, които можете да превъртате нагоре или надолу. Първо опитайте да идентифицирате няколко елемента от списъка, като плъзнете наоколо с пръст."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Добре! Продължете да плъзгате пръста си, за да намерите поне още един елемент."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Сега поставете два пръста върху елемент от списъка и ги плъзнете нагоре. Ако стигнете горната част на екрана, вдигнете пръстите си, поставете ги по-долу върху списъка и продължете да плъзгате нагоре."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Добре! Продължете да плъзгате пръстите си нагоре, за да превъртите още."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="5374753806314829405">"Завършихте урока. За изход и връщане към настройката за Talk As I Touch, намерете и докоснете бутона „<xliff:g id="FINISH">%s</xliff:g>“."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Проверка на правописа"</string>
     <!-- no translation found for current_backup_pw_prompt (8314880813545036591) -->
     <skip />
     <!-- no translation found for new_backup_pw_prompt (3491404828757901644) -->
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index e4fc2e3..669f29c 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -134,14 +134,18 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
-    <!-- no translation found for wifi_p2p_wps_setup:0 (5085064298144493867) -->
-    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
-    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
-    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
-    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
-    <!-- no translation found for wifi_p2p_status:2 (7455862395128183796) -->
-    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
-    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Botó per prémer"</item>
+    <item msgid="8084424421884876981">"PIN de l\'altre dispositiu"</item>
+    <item msgid="9033470670389392191">"PIN des d\'aquest dispositiu"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Connectat"</item>
+    <item msgid="3189211552661432651">"Convidat"</item>
+    <item msgid="7455862395128183796">"Ha fallat"</item>
+    <item msgid="7785896708926971207">"Disponible"</item>
+    <item msgid="829499112585677508">"Fora de l\'abast"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="1106621950288502195">"Dos minuts"</item>
     <item msgid="5780349442819375570">"Cinc minuts"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 399cc5f..58bae48 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -94,15 +94,12 @@
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Fred"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Detectable"</string>
-    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
-    <skip />
-    <!-- outdated translation 8573385118329733931 -->     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Detectable"</string>
-    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
-    <skip />
-    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
-    <skip />
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible per a tots els dispositius Bluetooth propers (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible per a tots els dispositius Bluetooth propers"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"No visible per a altres dispositius Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Només visibles per als dispositius vinculats"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Fes que el dispositiu es pugui detectar"</string>
-    <!-- outdated translation 6634508002347847278 -->     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Temps durant el qual és detectable"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Temps d\'espera de la visibilitat"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Defineix durant quanta estona podrà detectar-se el dispositiu"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloqueja el marcatge per veu"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedeix l\'ús del marcador Bluetooth quan la pantalla estigui bloquejada"</string>
@@ -110,16 +107,11 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nom del dispositiu"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"No s\'ha definit cap nom; s\'utilitza el nom del compte"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Cerca dispositius"</string>
-    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
-    <skip />
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Canvia el nom de la tableta"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Canvia el nom del telèfon"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Canvia el nom"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vols desconnectar-lo?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Això posarà fi a la teva connexió amb: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"Es desconnectarà <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Connectat"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconnectat"</string>
@@ -129,15 +121,14 @@
     <string name="bluetooth_not_connected" msgid="3389882907500605937">"Emparella aquest dispositiu"</string>
     <string name="bluetooth_pairing" msgid="1426882272690346242">"S\'està emparellant..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Emparellat però no connectat"</string>
-    <!-- outdated translation 6873461446424952003 -->     <string name="bluetooth_device" msgid="5291950341750186887">"mans lliures/auricular"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Dispositiu Bluetooth sense nom"</string>
     <string name="progress_scanning" msgid="192587958424295789">"S\'està cercant"</string>
     <string name="progress_tap_to_pair" msgid="4192342336107106334">"Toca per aparellar"</string>
     <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"No s\'han trobat dispositius Bluetooth a prop."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Sol·licitud d\'emparellament de Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Sol·licitud d\'emparellament"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Selecciona l\'emparellament amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
-    <skip />
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostra els fitxers rebuts"</string>
     <string name="device_picker" msgid="8721012448931226323">"Selector de dispositiu Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Sol·licitud de permís de Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Una aplicació està sol·licitant permís per activar Bluetooth. Vols fer-ho?"</string>
@@ -404,26 +395,17 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Gestiona les connexions, defineix el nom i la detecció del dispositiu"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Sol·licitud d\'emparellament de Bluetooth"</string>
-    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
-    <skip />
-    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
-    <skip />
-    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
-    <skip />
-    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
-    <skip />
-    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
-    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Per emparellar-te amb: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;Introdueix el PIN obligatori del dispositiu:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Per emparellar-te amb: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;Introdueix la contrasenya obligatòria del dispositiu:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"El PIN conté lletres o símbols"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Generalment 0000 o 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Pot ser que també hagis d\'introduir aquest PIN a l\'altre dispositiu."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Pot ser que també hagis d\'introduir aquesta contrasenya a l\'altre dispositiu."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Per emparellar-te amb: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt; Assegura\'t que apareix aquesta contrasenya: &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"De: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt; Vols emparellar-lo amb aquest dispositiu?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Per emparellar-lo amb: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;Introdueix:&lt;br&gt;&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; i, a continuació, prem Retorn."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Emparella"</string>
-    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"No emparellis"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancel·la"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Atenció"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Hi ha hagut un problema en fer l\'emparellament amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"S\'ha produït un problema en fer l\'emparellament amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g> perquè el PIN o la contrasenya són incorrectes."</string>
@@ -489,8 +471,7 @@
     <skip />
     <!-- no translation found for zeroclick_off_summary (2896320184904157018) -->
     <skip />
-    <!-- no translation found for zeroclick_label (6908892664706309626) -->
-    <skip />
+    <string name="zeroclick_label" msgid="6908892664706309626">"Compartició zero-clic"</string>
     <!-- no translation found for zeroclick_explained (3953149564512166049) -->
     <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-fi"</string>
@@ -572,24 +553,15 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Passarel·la"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longitud de prefix de xarxa"</string>
-    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
-    <skip />
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Configuració de la connectivitat d\'igual a igual"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Informació del dispositiu"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Configuració de Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Introdueix el PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Recorda aquesta connexió"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Cerca"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Crea un grup"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avançat"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Punt de connexió Wi-fi portàtil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Punt de connexió portàtil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> actiu"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error de punt de connexió Wi-fi portàtil"</string>
@@ -602,8 +574,7 @@
     <string name="ringtone_title" msgid="5379026328015343686">"To del telèfon"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <!-- outdated translation 8741571721868253103 -->     <string name="all_volume_title" msgid="4296957391257836961">"Volum"</string>
-    <!-- no translation found for musicfx_title (3853457094486073206) -->
-    <skip />
+    <string name="musicfx_title" msgid="3853457094486073206">"Efectes musicals"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volum del timbre"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibra quan estigui en silenci"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibra"</string>
@@ -1052,10 +1023,8 @@
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"No s\'ha pogut desplaçar l\'aplicació. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Ubicació d\'instal·lació preferida"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Canvia la ubicació d\'instal·lació preferida per a les aplicacions noves."</string>
-    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
-    <skip />
-    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
-    <skip />
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Desact. les aplic. integrades"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"La desactivació d\'una aplicació integrada pot provocar que altres aplicacions no funcionin correctament. N\'estàs segur?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Ús d\'emmagatzematge"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Mostra l\'emmagatzematge utilitzat per les aplicacions"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Serveis en execució"</string>
@@ -1550,9 +1519,8 @@
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">" <xliff:g id="NUMBER">^1</xliff:g> "</font>" "<font size="9">" <xliff:g id="UNIT">^2</xliff:g> "</font>" "\n" "<font size="12">"advertència"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limitació"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicacions eliminades"</string>
-    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
-    <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> rebuts, <xliff:g id="SENT">%2$s</xliff:g> enviats"</string>
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Trucada d\'emergència"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Torna a la trucada"</string>
@@ -1594,40 +1562,25 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Vols activar el certificat de CA del sistema?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Vols desactivar el certificat de CA del sistema?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Vols eliminar de forma permanent el certificat de CA d\'usuari?"</string>
-    <!-- no translation found for accessibility_tutorial_title (7577630829320003070) -->
-    <skip />
+    <string name="accessibility_tutorial_title" msgid="7577630829320003070">"Tutorial de Talk as I Touch"</string>
     <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Següent"</string>
     <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Enrere"</string>
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Finalitza"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Omet tut."</string>
-    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_1 (2465037336858060269) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_4 (5374753806314829405) -->
-    <skip />
-    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
-    <skip />
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lliçó 1: exploració de la pantalla"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="2465037336858060269">"Després d\'activar el Talk as I Touch, pots tocar la pantalla per escoltar una descripció sobre què hi ha sota el teu dit. Per exemple, la pantalla actual conté icones de les aplicacions. Troba\'n una tocant la pantalla i fent-hi lliscar el dit."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Bé, mantén el dit a la pantalla i continua fent-lo lliscar per trobar com a mínim una altra icona."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Per activar una cosa que estàs tocant, fes lliscar el dit fins a trobar la icona de <xliff:g id="APP_NAME">%s</xliff:g>. A continuació, prem la icona una vegada per activar-la."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Tens el dit a sobre de la icona de <xliff:g id="APP_NAME">%s</xliff:g>. Pica-la una vegada per activar-la."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"El teu dit s\'ha mogut per sobre de la icona de <xliff:g id="APP_NAME">%s</xliff:g> i després s\'ha allunyat. Fes lliscar el dit lentament per la pantalla de nou fins que trobis la icona del navegador."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Molt bé. Per passar a la lliçó següent, cerca i activa el botó <xliff:g id="NEXT">%s</xliff:g> que hi ha a prop de l\'extrem inferior dret de la pantalla."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lliçó 2: desplaçament amb dos dits"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Per desplaçar-se per una llista, pots fer lliscar dos dits al llarg de la pantalla. Per exemple, la pantalla actual conté una llista de noms d\'aplicacions que es pot desplaçar cap amunt o cap avall. En primer lloc, intenta identificar alguns elements de la llista fent lliscar un dit per la pantalla."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Bé, continua fent lliscar el dit pertot arreu per cercar com a mínim un element més de la llista."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Ara posa dos dits sobre un element de la llista i fes lliscar els dos dits cap amunt. Si arribes a la part superior de la pantalla, aixeca els dits, posa\'ls a la part de baix de la llista, i segueix fent-los lliscar cap amunt."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Bé, continua fent lliscar els dits cap amunt per continuar desplaçant-te."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="5374753806314829405">"Has completat el tutorial. Per sortir i tornar a la configuració de Talk as I Touch, cerca i toca el botó <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Correcció ortogràfica"</string>
     <!-- no translation found for current_backup_pw_prompt (8314880813545036591) -->
     <skip />
     <!-- no translation found for new_backup_pw_prompt (3491404828757901644) -->
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 6fe8f3b..3ff2fca 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -134,14 +134,18 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
-    <!-- no translation found for wifi_p2p_wps_setup:0 (5085064298144493867) -->
-    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
-    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
-    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
-    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
-    <!-- no translation found for wifi_p2p_status:2 (7455862395128183796) -->
-    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
-    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Stlačení tlačítka"</item>
+    <item msgid="8084424421884876981">"PIN ze sdíleného zařízení"</item>
+    <item msgid="9033470670389392191">"PIN z tohoto zaříz."</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Připojeno"</item>
+    <item msgid="3189211552661432651">"Pozvané"</item>
+    <item msgid="7455862395128183796">"Nezdařilo se"</item>
+    <item msgid="7785896708926971207">"K dispozici"</item>
+    <item msgid="829499112585677508">"Mimo dosah"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="1106621950288502195">"2 minuty"</item>
     <item msgid="5780349442819375570">"5 minut"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 292f494..555ff9c 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -94,15 +94,12 @@
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Nejméně zajímavé"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Viditelné"</string>
-    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
-    <skip />
-    <!-- outdated translation 8573385118329733931 -->     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Viditelné"</string>
-    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
-    <skip />
-    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
-    <skip />
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Viditelné pro všechna okolní zařízení Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Viditelné pro všechny okolní zařízení Bluetooth"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Neviditelné pro ostatní zařízení Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Viditelné pouze pro spárovaná zařízení"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Přepne zařízení do viditelného režimu"</string>
-    <!-- outdated translation 6634508002347847278 -->     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Časový limit viditelného režimu"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Časový limit viditelnosti"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Nastavit dobu, po kterou bude zařízení ve viditelném režimu"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Uzamknout hlasové vytáčení"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zabránit použití vytáčení Bluetooth při uzamčené obrazovce"</string>
@@ -110,16 +107,11 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Název zařízení"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Název není nastaven, použit název účtu"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Vyhledat zařízení"</string>
-    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
-    <skip />
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Přejmenovat tablet"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Přejmenovat telefon"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Přejmenovat"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Odpojit?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tímto způsobem ukončíte připojení k zařízení:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno."</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Připojeno"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Odpojeno"</string>
@@ -129,15 +121,14 @@
     <string name="bluetooth_not_connected" msgid="3389882907500605937">"Párovat s tímto zařízením"</string>
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Párování..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Spárováno, ale nepřipojeno"</string>
-    <!-- outdated translation 6873461446424952003 -->     <string name="bluetooth_device" msgid="5291950341750186887">"Náhlavní souprava či handsfree"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Nepojmenované zařízení Bluetooth"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Hledání"</string>
     <string name="progress_tap_to_pair" msgid="4192342336107106334">"Klepnutím spárujete"</string>
     <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"V okolí nejsou žádná zařízení Bluetooth."</string>
     <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="618099089987569242">"Vybrat k párování se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
-    <skip />
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Zobrazit přijaté soubory"</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="8211158472876087588">"Aplikace požaduje povolení zapnout připojení Bluetooth. Chcete toto povolení udělit?"</string>
@@ -404,26 +395,17 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"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_pairing_request" msgid="6385750334766370310">"Požadavek na párování zařízení Bluetooth"</string>
-    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
-    <skip />
-    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
-    <skip />
-    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
-    <skip />
-    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
-    <skip />
-    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
-    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Párování se zařízením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zadejte požadovaný kód PIN zařízení:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Párování se zařízením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zadejte požadovaný přístupový klíč zařízení:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN obsahuje písmena nebo symboly"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Obvykle 0000 nebo 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Tento kód PIN bude možná nutné zadat i v dalším zařízení."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Tento přístupový klíč bude možná nutné zadat i v dalším zařízení."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Párování se zařízením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zkontrolujte, zda zařízení zobrazuje tento přístupový klíč:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Ze zařízení:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Párovat s tímto zařízením?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Párování se zařízením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zadejte v něm kód:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, a následně potvrďte tlačítkem Return nebo Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Párovat"</string>
-    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Nepárovat"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Zrušit"</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="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>
@@ -489,8 +471,7 @@
     <skip />
     <!-- no translation found for zeroclick_off_summary (2896320184904157018) -->
     <skip />
-    <!-- no translation found for zeroclick_label (6908892664706309626) -->
-    <skip />
+    <string name="zeroclick_label" msgid="6908892664706309626">"Sdílení bez kliknutí"</string>
     <!-- no translation found for zeroclick_explained (3953149564512166049) -->
     <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"WiFi"</string>
@@ -572,24 +553,15 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"Server DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Brána"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Délka síťové předpony"</string>
-    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
-    <skip />
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Přímé připojení sítě Wi-Fi"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Nastavit připojení typu peer-to-peer"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Informace o zařízení"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Nastavení zabezpečení sítě Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Zadejte kód PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Pamatovat si toto připojení"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Vyhledat"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Vytvořit skupinu"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Rozšířené"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Přenosný hotspot Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Přenosný hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivní"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Chyba přenosného hotspotu Wi-Fi"</string>
@@ -602,8 +574,7 @@
     <string name="ringtone_title" msgid="5379026328015343686">"Vyzváněcí tón telefonu"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <!-- outdated translation 8741571721868253103 -->     <string name="all_volume_title" msgid="4296957391257836961">"Hlasitost"</string>
-    <!-- no translation found for musicfx_title (3853457094486073206) -->
-    <skip />
+    <string name="musicfx_title" msgid="3853457094486073206">"Hudební efekty"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Hlasitost vyzvánění"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrovat v tichém režimu"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibrace"</string>
@@ -1051,10 +1022,8 @@
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Přesunutí aplikace se nezdařilo. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Preferované umístění pro instalaci"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Změna preferovaného umístění pro instalaci nových aplikací"</string>
-    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
-    <skip />
-    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
-    <skip />
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Zakázat integrované aplikace"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Zákaz integrovaných aplikací může způsobit nesprávné fungování ostatních aplikací. Chcete pokračovat?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Využití úložiště"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Zobrazit aplikacemi používané úložiště"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Spuštěné služby"</string>
@@ -1549,9 +1518,8 @@
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"upozornění"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="12">"limit:"</font>" "<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n</string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Odebrané aplikace"</string>
-    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
-    <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"Přijato <xliff:g id="RECEIVED">%1$s</xliff:g>, odesláno <xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Tísňové volání"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Zpět k hovoru"</string>
@@ -1593,40 +1561,25 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Povolit certifikát CA systému?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Zakázat certifikát CA systému?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Natrvalo odstranit uživatelský certifikát CA?"</string>
-    <!-- no translation found for accessibility_tutorial_title (7577630829320003070) -->
-    <skip />
+    <string name="accessibility_tutorial_title" msgid="7577630829320003070">"Kurz funkce Talk As I Touch"</string>
     <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Další"</string>
     <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Zpět"</string>
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Dokončit"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Přeskočit výukový program"</string>
-    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_1 (2465037336858060269) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_4 (5374753806314829405) -->
-    <skip />
-    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
-    <skip />
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lekce 1: Zkoumání obrazovky"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="2465037336858060269">"Po zapnutí režimu Talk As I Touch (Hovořit při dotyku) si můžete po dotyku na obrazovku vyslechnout popis položek, které se nacházejí pod vaším prstem. Příklad: Aktuální obrazovka obsahuje ikony aplikací. Dotykem na obrazovku a přejížděním prstu najděte jednu z nich."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Dobře, přejíždějte prstem po obrazovce, dokud nenajdete ještě alespoň jednu ikonu."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Chcete-li aktivovat položku, které se dotýkáte, klepněte na ni. Přejíždějte prstem, až najdete ikonu aplikace <xliff:g id="APP_NAME">%s</xliff:g>. Poté ikonu aktivujte jedním klepnutím."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Prst se nachází v ikoně aplikace <xliff:g id="APP_NAME">%s</xliff:g>. Ikonu aktivujete jedním klepnutím."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Přesunuli jste prst na ikonu aplikace <xliff:g id="APP_NAME">%s</xliff:g>, ale pak jste jej z ikony přesunuli pryč. Pomalu přejíždějte prstem po obrazovce, dokud znovu nenajde ikonu prohlížeče."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Dobře. Chcete-li přejít do další lekce, najděte a aktivujte tlačítko <xliff:g id="NEXT">%s</xliff:g> umístěné v pravém dolním rohu obrazovky."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lekce 2: Posunování pomocí dvou prstů"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Chcete-li procházet seznam, přejíždějte prsty po obrazovce. Příklad: Aktuální obrazovka obsahuje seznam názvů aplikací, který můžete posunovat nahoru a dolů. Nejdříve zkuste určit několik položek seznamu přejížděním jednoho prstu."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Dobře. Pokračujte v přejíždění prstem a najděte ještě alespoň jednu položku."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Nyní umístěte dva prsty na položku seznamu a přejíždějte prsty směrem nahoru. Jakmile dosáhnete horní části obrazovky, zvedněte prsty, umístěte je do nižší části seznamu a pokračujte v přejíždění směrem nahoru."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Dobře, přejeďte prstem nahoru a posuňte seznam ještě víc."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="5374753806314829405">"Dokončili jste kurz. Pokud jej chcete ukončit a vrátit se do nastavení funkce Talk As I Touch, najděte tlačítko <xliff:g id="FINISH">%s</xliff:g> a klepněte na něj."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Oprava pravopisu"</string>
     <!-- no translation found for current_backup_pw_prompt (8314880813545036591) -->
     <skip />
     <!-- no translation found for new_backup_pw_prompt (3491404828757901644) -->
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index ef880b3..a6e05fd 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -68,13 +68,15 @@
     <item msgid="490158884605093126">"Ekstra stor"</item>
     <item msgid="2123802548987439763">"Meget stor"</item>
   </string-array>
-    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
-    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
-    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
-    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
-    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
-    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
-    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
+  <string-array name="entryvalues_font_size">
+    <item msgid="8122189478379706788">"0,70"</item>
+    <item msgid="186029675505810577">"0,85"</item>
+    <item msgid="5864822191921585498">"0,95"</item>
+    <item msgid="5580820036923893743">"1,0"</item>
+    <item msgid="5106590751949630532">"1,50"</item>
+    <item msgid="1803159594904488544">"1.15"</item>
+    <item msgid="7410681469566563300">"1,30"</item>
+  </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Meget langsom"</item>
     <item msgid="2361722960903353554">"Langsom"</item>
@@ -213,9 +215,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP eller CHAP"</item>
   </string-array>
-    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
-    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
-    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
+  <string-array name="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Intern lagring på enheden"</item>
     <item msgid="3738430123799803530">"SD-kort, der kan fjernes"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index d74719c..72f7c0b 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -148,8 +148,7 @@
     <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Tryk for at oprette forbindelse til \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Ønsker du at oprette forbindelse til \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Anmodning om telefonbog"</string>
-    <!-- no translation found for bluetooth_pb_acceptance_dialog_text (5203107624986011263) -->
-    <skip />
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s vil gerne have adgang til dine kontaktpersoner og opkaldsoversigt. Vil du give %2$s adgang?"</string>
     <string name="bluetooth_pb_alwaysallowed" msgid="3953839482721299910">"Altid tilladt?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Indstillinger for dato og tid"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 pm"</string>
@@ -1520,7 +1519,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"grænse"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Fjernede apps"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> modtaget, <xliff:g id="SENT">%2$s</xliff:g> sendt"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Nødopkald"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tilbage til opkald"</string>
@@ -1543,8 +1542,7 @@
     <string name="vpn_username" msgid="1863901629860867849">"Brugernavn"</string>
     <string name="vpn_password" msgid="6756043647233596772">"Adgangskode"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"Gem kontooplysninger"</string>
-    <!-- no translation found for vpn_not_used (9094191054524660891) -->
-    <skip />
+    <string name="vpn_not_used" msgid="9094191054524660891">"bruges ikke"</string>
     <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(ingen bekræftelse af serveren)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Annuller"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Gem"</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index fb69e40..aa0f817 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -68,13 +68,15 @@
     <item msgid="490158884605093126">"Extragroß"</item>
     <item msgid="2123802548987439763">"Sehr groß"</item>
   </string-array>
-    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
-    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
-    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
-    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
-    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
-    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
-    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
+  <string-array name="entryvalues_font_size">
+    <item msgid="8122189478379706788">"0,70"</item>
+    <item msgid="186029675505810577">"0,85"</item>
+    <item msgid="5864822191921585498">"0,95"</item>
+    <item msgid="5580820036923893743">"1,0"</item>
+    <item msgid="5106590751949630532">"1,05"</item>
+    <item msgid="1803159594904488544">"1,15"</item>
+    <item msgid="7410681469566563300">"1,30"</item>
+  </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Sehr langsam"</item>
     <item msgid="2361722960903353554">"Langsam"</item>
@@ -132,14 +134,18 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
-    <!-- no translation found for wifi_p2p_wps_setup:0 (5085064298144493867) -->
-    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
-    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
-    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
-    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
-    <!-- no translation found for wifi_p2p_status:2 (7455862395128183796) -->
-    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
-    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Push-Schaltfläche"</item>
+    <item msgid="8084424421884876981">"PIN von Peer-Gerät"</item>
+    <item msgid="9033470670389392191">"PIN von diesem Gerät"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Verbunden"</item>
+    <item msgid="3189211552661432651">"Eingeladen"</item>
+    <item msgid="7455862395128183796">"Fehlgeschlagen"</item>
+    <item msgid="7785896708926971207">"Verfügbar"</item>
+    <item msgid="829499112585677508">"Außerhalb des Bereichs"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="1106621950288502195">"2 Minuten"</item>
     <item msgid="5780349442819375570">"5 Minuten"</item>
@@ -209,9 +215,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP oder CHAP"</item>
   </string-array>
-    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
-    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
-    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
+  <string-array name="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Interner Gerätespeicher"</item>
     <item msgid="3738430123799803530">"Austauschbare SD-Karte"</item>
@@ -258,7 +266,7 @@
   </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardlimit"</item>
-    <item msgid="4071574792028999443">"Kein Hintergrundprozess"</item>
+    <item msgid="4071574792028999443">"Keine Hintergrundprozesse"</item>
     <item msgid="4810006996171705398">"Höchstens ein Prozess"</item>
     <item msgid="8586370216857360863">"Höchstens zwei Prozesse"</item>
     <item msgid="836593137872605381">"Höchstens drei Prozesse"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1776b10..f09dbbc 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -94,15 +94,12 @@
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Kalt"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Sichtbar"</string>
-    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
-    <skip />
-    <!-- outdated translation 8573385118329733931 -->     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Sichtbar"</string>
-    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
-    <skip />
-    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
-    <skip />
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Sichtbar für alle Bluetooth-Geräte in der Nähe (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Sichtbar für alle Bluetooth-Geräte in der Nähe"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nicht sichtbar für andere Bluetooth-Geräte"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Nur sichtbar für Partnergeräte"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gerät sichtbar machen"</string>
-    <!-- outdated translation 6634508002347847278 -->     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timeout für Sichtbarkeit"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timeout für Sichtbarkeit"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Festlegen, wie lange das Gerät sichtbar sein soll"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Sprachwahl sperren"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Verwendung des Bluetooth-Dialers bei gesperrtem Bildschirm verhindern"</string>
@@ -110,16 +107,11 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Gerätename"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Kein Name festgelegt, Kontoname wird verwendet"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Scannen nach Geräten"</string>
-    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
-    <skip />
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Tablet umbenennen"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Telefon umbenennen"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Umbenennen"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Verbindung trennen?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Hierdurch wird die Verbindung mit&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; getrennt."</string>
     <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"Verbindung mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird getrennt."</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Verbunden"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Nicht verbunden"</string>
@@ -129,15 +121,14 @@
     <string name="bluetooth_not_connected" msgid="3389882907500605937">"Pairing mit diesem Gerät"</string>
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Pairing…"</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Pairing aktiv, aber nicht verbunden"</string>
-    <!-- outdated translation 6873461446424952003 -->     <string name="bluetooth_device" msgid="5291950341750186887">"Freisprechfunktion/Headset"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Unbenanntes Bluetooth-Gerät"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Suchvorgang läuft"</string>
     <string name="progress_tap_to_pair" msgid="4192342336107106334">"Für Pairing tippen"</string>
     <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Keine Bluetooth-Geräte gefunden"</string>
     <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="618099089987569242">"Zum Pairing auswählen: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
-    <skip />
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Erhaltene Dateien anzeigen"</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="8211158472876087588">"Eine Anwendung beantragt eine Berechtigung zum Aktivieren von Bluetooth. Möchten Sie dies tun?"</string>
@@ -157,8 +148,7 @@
     <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Zum Herstellen einer Verbindung mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" berühren"</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Möchten Sie eine Verbindung mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" herstellen?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Telefonbuchanfrage"</string>
-    <!-- no translation found for bluetooth_pb_acceptance_dialog_text (5203107624986011263) -->
-    <skip />
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s möchte auf Ihre Kontakte und Ihr Anrufprotokoll zugreifen. Möchten Sie %2$s den Zugriff gestatten?"</string>
     <string name="bluetooth_pb_alwaysallowed" msgid="3953839482721299910">"Immer erlaubt?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Einstellungen für Datum &amp; Uhrzeit"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00"</string>
@@ -405,26 +395,17 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Verbindungen, Gerätenamen und Erkennbarkeit verwalten"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth-Pairing-Anfrage"</string>
-    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
-    <skip />
-    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
-    <skip />
-    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
-    <skip />
-    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
-    <skip />
-    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
-    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Zum Pairing mit:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Geben Sie die erforderliche PIN des Geräts ein:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Zum Pairing mit:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Geben Sie den erforderlichen Schlüssel des Geräts ein:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"Die PIN enthält Buchstaben oder Symbole."</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Normalerweise 0000 oder 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Möglicherweise müssen Sie diese PIN auch auf dem anderen Gerät eingeben."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Möglicherweise müssen Sie diesen Schlüssel auch auf dem anderen Gerät eingeben."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Zum Pairing mit:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vergewissern Sie sich, dass folgender Schlüssel angezeigt wird:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Von:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pairing mit diesem Gerät durchführen?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Zum Pairing mit:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Tippen Sie darauf:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;. Drücken Sie dann die Eingabetaste."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Kopplung durchführen"</string>
-    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Keine Kopplung durchführen"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Abbrechen"</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="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>
@@ -490,8 +471,7 @@
     <skip />
     <!-- no translation found for zeroclick_off_summary (2896320184904157018) -->
     <skip />
-    <!-- no translation found for zeroclick_label (6908892664706309626) -->
-    <skip />
+    <string name="zeroclick_label" msgid="6908892664706309626">"Teilen ohne einen einzigen Klick"</string>
     <!-- no translation found for zeroclick_explained (3953149564512166049) -->
     <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"WLAN"</string>
@@ -573,24 +553,15 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Länge Netzwerkpräfix"</string>
-    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
-    <skip />
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Einrichtung von Peer-to-Peer-Verbindungen"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Geräteinformationen"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Wi-Fi Protected Setup"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"PIN eingeben"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Diese Verbindung speichern"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Suchen"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Gruppe erstellen"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Erweitert"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Mobiler WLAN-Hotspot"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Mobiler Hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktiv"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fehler beim mobilen WLAN-Hotspot"</string>
@@ -603,8 +574,7 @@
     <string name="ringtone_title" msgid="5379026328015343686">"Klingelton"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <!-- outdated translation 8741571721868253103 -->     <string name="all_volume_title" msgid="4296957391257836961">"Lautstärke"</string>
-    <!-- no translation found for musicfx_title (3853457094486073206) -->
-    <skip />
+    <string name="musicfx_title" msgid="3853457094486073206">"Musikeffekte"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Klingeltonlautstärke"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Im Lautlosmodus vibrieren"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibration"</string>
@@ -1052,10 +1022,8 @@
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Verschieben der Anwendung fehlgeschlagen. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Bevorzugter Installationspfad"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Bevorzugten Installationspfad für neue Anwendungen ändern"</string>
-    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
-    <skip />
-    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
-    <skip />
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Integrierte App deaktivieren"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Durch das Deaktivieren einer integrierten App kommt es möglicherweise zu unerwünschtem Verhalten anderer Apps. Sind Sie sicher?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Speichernutzung"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Von Anwendungen verwendeten Speicher anzeigen"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Aktive Dienste"</string>
@@ -1504,7 +1472,7 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Maßstab Fensteranimation"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Maßstab Übergangsanimation"</string>
     <string name="debug_applications_category" msgid="6221644998451283813">"Apps"</string>
-    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Aktivitäten nicht speichern"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Aktionen nicht speichern"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Aktivität löschen, sobald der Nutzer diese beendet"</string>
     <string name="app_process_limit_title" msgid="4280600650253107163">"Hintergrundprozesslimit"</string>
     <!-- no translation found for show_all_anrs (28462979638729082) -->
@@ -1550,9 +1518,8 @@
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"Warnung"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"-Limit"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Entfernte Apps"</string>
-    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
-    <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> erhalten, <xliff:g id="SENT">%2$s</xliff:g> gesendet"</string>
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Notruf"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Zurück zum Anruf"</string>
@@ -1575,8 +1542,7 @@
     <string name="vpn_username" msgid="1863901629860867849">"Nutzername"</string>
     <string name="vpn_password" msgid="6756043647233596772">"Passwort"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"Kontoinformationen speichern"</string>
-    <!-- no translation found for vpn_not_used (9094191054524660891) -->
-    <skip />
+    <string name="vpn_not_used" msgid="9094191054524660891">"(nicht verwendet)"</string>
     <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(Server nicht überprüfen)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Abbrechen"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Speichern"</string>
@@ -1595,40 +1561,25 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"System-CA-Zertifikat aktivieren?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"System-CA-Zertifikat deaktivieren?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"CA-Zertifikat des Nutzers endgültig entfernen?"</string>
-    <!-- no translation found for accessibility_tutorial_title (7577630829320003070) -->
-    <skip />
+    <string name="accessibility_tutorial_title" msgid="7577630829320003070">"Anleitung zu \"Talk As I Touch\""</string>
     <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Weiter"</string>
     <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Zurück"</string>
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Beenden"</string>
-    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Weiter"</string>
-    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_1 (2465037336858060269) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_4 (5374753806314829405) -->
-    <skip />
-    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
-    <skip />
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Überspringen"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lektion 1: Touchscreen-Erkundung"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="2465037336858060269">"Nach dem Aktivieren von \"Talk As I Touch\" können Sie den Bildschirm berühren, um eine eine Beschreibung des unter Ihrem Finger befindlichen Elements zu hören. Derzeit enthält der Bildschirm beispielsweise Symbole für Apps. Suchen Sie eines davon, indem Sie den Bildschirm berühren und den Finger darüber bewegen."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Gut. Bewegen Sie den Finger weiter über den Bildschirm, um mindestens ein weiteres Symbol zu finden."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Tippen Sie auf ein Element, das Sie berühren, um es zu aktivieren. Bewegen Sie den Finger, bis Sie das Symbol für <xliff:g id="APP_NAME">%s</xliff:g> gefunden haben. Tippen Sie dann darauf, um es zu aktivieren."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Ihr Finger befindet sich auf dem Symbol <xliff:g id="APP_NAME">%s</xliff:g>. Tippen Sie ein Mal, um das Symbol zu aktivieren."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Sie haben den Finger auf dem Symbol <xliff:g id="APP_NAME">%s</xliff:g> platziert und ihn dann wieder wegbewegt. Bewegen Sie den Finger langsam über den Bildschirm, bis Sie das Browsersymbol wieder finden."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Gut. Suchen Sie unten rechts auf dem Bildschirm nach der Schaltfläche <xliff:g id="NEXT">%s</xliff:g> und aktivieren Sie sie, um zur nächsten Lektion zu gelangen."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lektion 2: Scrollen mit zwei Fingern"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Zum Scrollen durch eine Liste können Sie zwei Finger über den Bildschirm bewegen. Derzeit enthält der Bildschirm beispielsweise eine Liste von App-Namen, in der Sie nach oben oder nach unten scrollen können. Versuchen Sie zunächst, einige Elemente in der Liste zu identifizieren, indem Sie einen Finger über den Bildschirm bewegen."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Gut. Bewegen Sie den Finger weiter, um mindestens ein weiteres Element zu finden."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Platzieren Sie jetzt zwei Finger auf ein Listenelement und bewegen Sie sie nach oben. Wenn Sie den oberen Bildschirmrand erreichen, heben Sie die Finger, platzieren Sie sie weiter unten auf der Liste und bewegen Sie sie dann weiter nach oben."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Gut. Bewegen Sie die Finger weiter nach oben, um zu scrollen."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="5374753806314829405">"Sie haben die Anleitung abgeschlossen. Suchen Sie nach der Schaltfläche <xliff:g id="FINISH">%s</xliff:g> und tippen Sie darauf, um zur Einstellung \"Talk As I Touch\" zurückzukehren."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Rechtschreibprüfung"</string>
     <!-- no translation found for current_backup_pw_prompt (8314880813545036591) -->
     <skip />
     <!-- no translation found for new_backup_pw_prompt (3491404828757901644) -->
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7b8a06e..edff3c6 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1519,7 +1519,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"όριο"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Εφαρμογές που καταργήθηκαν"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> ελήφθησαν, <xliff:g id="SENT">%2$s</xliff:g> εστάλησαν"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Κλήση έκτακτης ανάγκης"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Επιστροφή στην κλήση"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index df4ff88..f169b52 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1520,7 +1520,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limit"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Removed apps"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> received, <xliff:g id="SENT">%2$s</xliff:g> sent"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Emergency call"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Return to call"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index a80b825..abd89a9 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1519,7 +1519,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"límite"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicaciones eliminadas"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> recibidos, <xliff:g id="SENT">%2$s</xliff:g> enviados"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Llamada de emergencia"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Regresar a llamada"</string>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index a2116c7..01fcafe 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -134,14 +134,18 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
-    <!-- no translation found for wifi_p2p_wps_setup:0 (5085064298144493867) -->
-    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
-    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
-    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
-    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
-    <!-- no translation found for wifi_p2p_status:2 (7455862395128183796) -->
-    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
-    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Botón push"</item>
+    <item msgid="8084424421884876981">"PIN del otro dispositivo"</item>
+    <item msgid="9033470670389392191">"PIN del dispositivo"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Conectado"</item>
+    <item msgid="3189211552661432651">"Invitado"</item>
+    <item msgid="7455862395128183796">"Con error"</item>
+    <item msgid="7785896708926971207">"Disponible"</item>
+    <item msgid="829499112585677508">"Fuera del alcance"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="1106621950288502195">"2 minutos"</item>
     <item msgid="5780349442819375570">"5 minutos"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 09d6d7c..2dc9f82 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -94,15 +94,12 @@
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Nivel bajo"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Ajustes de Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Visible"</string>
-    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
-    <skip />
-    <!-- outdated translation 8573385118329733931 -->     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible"</string>
-    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
-    <skip />
-    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
-    <skip />
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible para dispositivos Bluetooth cercanos (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible para dispositivos Bluetooth cercanos"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Oculto para otros dispositivos Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Solo visible para dispositivos sincronizados"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Hacer visible el dispositivo"</string>
-    <!-- outdated translation 6634508002347847278 -->     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tiempo de espera de visibilidad del dispositivo"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tiempo de espera de visibilidad"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Definir cuánto tiempo estará visible el dispositivo"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear marcación por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Evitar el uso del marcador a través de Bluetooth cuando la pantalla esté bloqueada"</string>
@@ -110,16 +107,11 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nombre del dispositivo"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"No se ha establecido ningún nombre; se utiliza el nombre de cuenta."</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Buscar dispositivos"</string>
-    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
-    <skip />
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Cambiar nombre del tablet"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Cambiar nombre del teléfono"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Cambiar nombre"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"¿Desconectar?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Finalizará la conexión con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;."</string>
     <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará."</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconectada"</string>
@@ -129,15 +121,14 @@
     <string name="bluetooth_not_connected" msgid="3389882907500605937">"Sincronizar con este dispositivo"</string>
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Sincronizando..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Sincronizado, pero sin conexión"</string>
-    <!-- outdated translation 6873461446424952003 -->     <string name="bluetooth_device" msgid="5291950341750186887">"manos libres/auriculares"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Dispositivo Bluetooth sin nombre"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Buscando"</string>
     <string name="progress_tap_to_pair" msgid="4192342336107106334">"Tocar para sincronizar"</string>
     <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"No hay dispositivos Bluetooth cercanos."</string>
     <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="618099089987569242">"Seleccionar <xliff:g id="DEVICE_NAME">%1$s</xliff:g> para realizar la sincronización"</string>
-    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
-    <skip />
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar archivos recibidos"</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="8211158472876087588">"Una aplicación está solicitando permiso para activar la función Bluetooth. ¿Aceptas?"</string>
@@ -404,26 +395,17 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Administrar conexiones, establecer el nombre del dispositivo y la visibilidad"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Solicitud de sincronización de Bluetooth"</string>
-    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
-    <skip />
-    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
-    <skip />
-    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
-    <skip />
-    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
-    <skip />
-    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
-    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Para sincronizar con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;, introduce el PIN obligatorio del dispositivo:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Para sincronizar con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;, introduce la clave obligatoria del dispositivo:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"El PIN contiene letras o símbolos."</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Normalmente: 0000 o 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Es posible que tengas que introducir este PIN en el otro dispositivo."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Es posible que tengas que introducir esta clave en el otro dispositivo."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Para sincronizar con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;, comprueba que se muestre la clave&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;¿Sincronizar con este dispositivo?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Para sincronizar con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;, escribe&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;y, a continuación, pulsa la tecla volver o Intro."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Sincronizar"</string>
-    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"No sincronizar"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancelar"</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="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>
@@ -489,8 +471,7 @@
     <skip />
     <!-- no translation found for zeroclick_off_summary (2896320184904157018) -->
     <skip />
-    <!-- no translation found for zeroclick_label (6908892664706309626) -->
-    <skip />
+    <string name="zeroclick_label" msgid="6908892664706309626">"Opción para compartir sin hacer clic"</string>
     <!-- no translation found for zeroclick_explained (3953149564512166049) -->
     <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
@@ -572,24 +553,15 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Puerta de enlace"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longitud prefijo de red"</string>
-    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
-    <skip />
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Configurar conectividad punto a punto"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Información sobre el dispositivo"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"WPS"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Introducir PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Recordar esta conexión"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Buscar"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Crear grupo"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avanzados"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Zona Wi-Fi portátil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> de zona Wi-Fi portátil activa"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error de zona Wi-Fi portátil"</string>
@@ -602,8 +574,7 @@
     <string name="ringtone_title" msgid="5379026328015343686">"Tono del teléfono"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <!-- outdated translation 8741571721868253103 -->     <string name="all_volume_title" msgid="4296957391257836961">"Volumen"</string>
-    <!-- no translation found for musicfx_title (3853457094486073206) -->
-    <skip />
+    <string name="musicfx_title" msgid="3853457094486073206">"Efectos de música"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volumen del timbre"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar en modo silencio"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibrar"</string>
@@ -1051,10 +1022,8 @@
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"No se ha podido mover la aplicación. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Ubicación de instalación preferida"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Modificar ubicación de instalación preferida para nuevas aplicaciones"</string>
-    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
-    <skip />
-    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
-    <skip />
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Inhabilitar aplic integrada"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Si se inhabilita una aplicación integrada, es posible que otras aplicaciones no funcionen correctamente. ¿Seguro que quieres continuar?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Uso de almacenamiento"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Ver almacenamiento utilizado por aplicaciones"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicios en ejecución"</string>
@@ -1298,7 +1267,7 @@
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Desde la última vez que se desenchufó para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total de consumo"</string>
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Actualizar"</string>
-    <string name="process_kernel_label" msgid="3916858646836739323">"Sistema operativo de Android"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor multimedia"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Entrada y salida de voz"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configuración entrada y salida de voz"</string>
@@ -1549,9 +1518,8 @@
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"aviso"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"límite"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicaciones eliminadas"</string>
-    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
-    <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> recibido, <xliff:g id="SENT">%2$s</xliff:g> enviado"</string>
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Llamada de emergencia"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Volver a llamada"</string>
@@ -1593,40 +1561,25 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"¿Quieres habilitar el certificado de CA del sistema?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"¿Quieres inhabilitar el certificado de CA del sistema?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"¿Quieres eliminar el certificado de CA de usuario de forma permanente?"</string>
-    <!-- no translation found for accessibility_tutorial_title (7577630829320003070) -->
-    <skip />
+    <string name="accessibility_tutorial_title" msgid="7577630829320003070">"Tutorial de Talk As I Touch"</string>
     <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Siguiente"</string>
     <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Atrás"</string>
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Finalizar"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Omitir"</string>
-    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_1 (2465037336858060269) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_4 (5374753806314829405) -->
-    <skip />
-    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
-    <skip />
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lección 1: Cómo explorar la pantalla"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="2465037336858060269">"Después de activar Talk As I Touch, puedes tocar la pantalla para escuchar una descripción del contenido seleccionado. Por ejemplo, en la pantalla, existe una lista de iconos de aplicaciones. Desplázate por la pantalla con un dedo para encontrar una aplicación."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Sigue deslizando el dedo por la pantalla para encontrar, al menos, otro icono."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Para activar el contenido seleccionado, solo tienes que tocarlo. Desliza el dedo para encontrar el icono de <xliff:g id="APP_NAME">%s</xliff:g>. A continuación, toca el icono una vez para activarlo."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Has seleccionado el icono de <xliff:g id="APP_NAME">%s</xliff:g>. Toca una vez para activar el icono."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Tu dedo ha seleccionado el icono de <xliff:g id="APP_NAME">%s</xliff:g> y, a continuación, se ha movido. Desliza tu dedo lentamente por la pantalla hasta que vuelvas a seleccionar el icono del navegador."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Para pasar a la siguiente lección, activa el botón <xliff:g id="NEXT">%s</xliff:g> situado cerca de la esquina inferior izquierda de la pantalla."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lección 2: Cómo desplazarte por la pantalla con dos dedos"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Para desplazarte por una lista, puedes deslizar dos dedos por la pantalla. Por ejemplo, en la pantalla, existe una lista de iconos de nombres de aplicaciones que puedes desplazar hacia arriba y hacia abajo. En primer lugar, desliza un dedo por la pantalla para intentar identificar algunos elementos de la lista."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Sigue deslizando tu dedo por la pantalla para encontrar, al menos, otro elemento."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Ahora coloca dos dedos sobre un elemento de la lista y deslízalos hacia arriba. Si llegas a la parte superior de la pantalla, levanta los dedos, colócalos en la parte inferior de la lista y vuelve a deslizarlos hacia arriba."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Sigue deslizando tus dedos hacia arriba para desplazarte por la pantalla."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="5374753806314829405">"Has completado el tutorial. Para salir y volver a la configuración de Talk As I Touch, toca el botón <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Corrección ortográfica"</string>
     <!-- no translation found for current_backup_pw_prompt (8314880813545036591) -->
     <skip />
     <!-- no translation found for new_backup_pw_prompt (3491404828757901644) -->
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 726e6b4..7ab9700 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -68,13 +68,15 @@
     <item msgid="490158884605093126">"بسیار بزرگ"</item>
     <item msgid="2123802548987439763">"بی نهایت بزرگ"</item>
   </string-array>
-    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
-    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
-    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
-    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
-    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
-    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
-    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
+  <string-array name="entryvalues_font_size">
+    <item msgid="8122189478379706788">"0.70"</item>
+    <item msgid="186029675505810577">"0.85"</item>
+    <item msgid="5864822191921585498">"0.95"</item>
+    <item msgid="5580820036923893743">"1.0"</item>
+    <item msgid="5106590751949630532">"1.05"</item>
+    <item msgid="1803159594904488544">"1.15"</item>
+    <item msgid="7410681469566563300">"1.30"</item>
+  </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"بسیار آهسته"</item>
     <item msgid="2361722960903353554">"آهسته"</item>
@@ -132,14 +134,18 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
-    <!-- no translation found for wifi_p2p_wps_setup:0 (5085064298144493867) -->
-    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
-    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
-    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
-    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
-    <!-- no translation found for wifi_p2p_status:2 (7455862395128183796) -->
-    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
-    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"دکمه ارسال"</item>
+    <item msgid="8084424421884876981">"پین از دستگاه جفت شده"</item>
+    <item msgid="9033470670389392191">"پین از این دستگاه"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"متصل شد"</item>
+    <item msgid="3189211552661432651">"دعوت شده"</item>
+    <item msgid="7455862395128183796">"انجام نشد"</item>
+    <item msgid="7785896708926971207">"در دسترس"</item>
+    <item msgid="829499112585677508">"خارج از محدوده"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="1106621950288502195">"2 دقیقه"</item>
     <item msgid="5780349442819375570">"5 دقیقه"</item>
@@ -209,9 +215,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP یا CHAP"</item>
   </string-array>
-    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
-    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
-    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
+  <string-array name="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"دستگاه ذخیره سازی داخلی"</item>
     <item msgid="3738430123799803530">"کارت SD جدا شدنی"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 33530a5..e11d84b 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -94,15 +94,12 @@
     <string name="battery_info_health_cold" msgid="3835692786176707318">"سرد"</string>
     <string name="bluetooth" msgid="5549625000628014477">"بلوتوث"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"قابل شناسایی"</string>
-    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
-    <skip />
-    <!-- outdated translation 8573385118329733931 -->     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"قابل شناسایی"</string>
-    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
-    <skip />
-    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
-    <skip />
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"نمایان برای تمام دستگاه های بلوتوث مجاور (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"قابل مشاهده برای تمام دستگاه های بلوتوث مجاور"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"برای دیگر دستگاه های بلوتوث قابل مشاهده نیست"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"فقط برای دستگاه های جفت شده قابل مشاهده است"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"دستگاه قابل شناسایی شود"</string>
-    <!-- outdated translation 6634508002347847278 -->     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"پایان زمان قابلیت شناسایی"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"پایان زمان قابل مشاهده بودن"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"مدت زمان قابل شناسایی بودن دستگاه را تنظیم کنید"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"قفل کردن شماره گیری صوتی"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ممانعت از استفاده شماره گیر بلوتوث هنگام قفل شدن صفحه"</string>
@@ -110,16 +107,11 @@
     <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>
-    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
-    <skip />
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"تغییر نام رایانه لوحی"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"تغییر نام تلفن"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"تغییر نام"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"اتصال قطع شود؟"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"این کار اتصال شما را با:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;قطع می کند."</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>
@@ -129,15 +121,14 @@
     <string name="bluetooth_not_connected" msgid="3389882907500605937">"جفت سازی با این دستگاه"</string>
     <string name="bluetooth_pairing" msgid="1426882272690346242">"در حال جفت سازی..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"جفت شده اما وصل نیست"</string>
-    <!-- outdated translation 6873461446424952003 -->     <string name="bluetooth_device" msgid="5291950341750186887">"هندزفری/گوشی"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"دستگاه بلوتوث بدون نام"</string>
     <string name="progress_scanning" msgid="192587958424295789">"در حال جستجو"</string>
     <string name="progress_tap_to_pair" msgid="4192342336107106334">"ضربه برای مرتبط کردن"</string>
     <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"هیچ دستگاه بلوتوثی در این نزدیکی یافت شد."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"درخواست جفت سازی"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"درخواست جفت سازی"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"انتخاب برای جفت سازی با <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
-    <skip />
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"نمایش فایل های دریافتی"</string>
     <string name="device_picker" msgid="8721012448931226323">"انتخاب کننده دستگاه بلوتوث"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"درخواست مجوز بلوتوث"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"برنامه ای درخواست کرده است که بلوتوث روشن شود. می خواهید این کار را انجام دهید؟"</string>
@@ -157,8 +148,7 @@
     <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"برای اتصال به \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" لمس کنید"</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"آیا می خواهید به \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" وصل شوید؟"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"درخواست دفترچه تلفن"</string>
-    <!-- no translation found for bluetooth_pb_acceptance_dialog_text (5203107624986011263) -->
-    <skip />
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s می خواهد به مخاطبین و سابقه تماس شما دسترسی پیدا کند. اجازه دسترسی به %2$s داده شود؟"</string>
     <string name="bluetooth_pb_alwaysallowed" msgid="3953839482721299910">"همیشه مجاز باشد؟"</string>
     <string name="date_and_time" msgid="4114084177056654663">"تنظیمات تاریخ و ساعت"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 بعدازظهر"</string>
@@ -405,26 +395,17 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"بلوتوث"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"مدیریت اتصال ها، تنظیم نام دستگاه و قابلیت شناسایی"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"درخواست جفت سازی بلوتوث"</string>
-    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
-    <skip />
-    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
-    <skip />
-    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
-    <skip />
-    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
-    <skip />
-    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
-    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"برای جفت شدن با:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;پین مورد نیاز دستگاه را وارد کنید:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"برای جفت شدن با:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;کلید عبور مورد نیاز دستگاه را وارد کنید:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"پین شامل حروف یا نماد است"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"معمولا 0000 یا 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"ممکن است لازم باشد که شما این پین را در دستگاه دیگری وارد کنید."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"ممکن است لازم باشد شما این کلید عبور را در دستگاه دیگری وارد کنید."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"برای جفت شدن با:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;مطمئن شوید که آن دستگاه این کلید عبور را نمایش می دهد:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"از:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;با این دستگاه جفت شود؟"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"برای جفت شدن با:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;این کد را در آن وارد کنید:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, سپس کلید ورود یا تأیید را فشار دهید."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"جفت سازی"</string>
-    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"جفت نشود"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"لغو"</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="6065697229258906937">"مشکلی در جفت سازی با <xliff:g id="DEVICE_NAME">%1$s</xliff:g> وجود داشت زیرا پین یا کلید عبور اشتباه است."</string>
@@ -490,8 +471,7 @@
     <skip />
     <!-- no translation found for zeroclick_off_summary (2896320184904157018) -->
     <skip />
-    <!-- no translation found for zeroclick_label (6908892664706309626) -->
-    <skip />
+    <string name="zeroclick_label" msgid="6908892664706309626">"اشتراک گذاری بدون کلید"</string>
     <!-- no translation found for zeroclick_explained (3953149564512166049) -->
     <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
@@ -573,24 +553,15 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"دروازه"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"طول پیشوند شبکه"</string>
-    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
-    <skip />
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"راه اندازی اتصال peer-to-peer"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"اطلاعات دستگاه"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"راه اندازی Wi-Fi حفاظت شده"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"پین را وارد کنید"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"به یادسپاری این ارتباط"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"جستجو"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"ایجاد گروه"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"پیشرفته"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"نقطه اتصال Wi-Fi قابل حمل"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"نقطه اتصال قابل حمل <xliff:g id="NETWORK_SSID">%1$s</xliff:g> فعال"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"خطای نقطه اتصال Wi-Fi قابل حمل"</string>
@@ -603,8 +574,7 @@
     <string name="ringtone_title" msgid="5379026328015343686">"آهنگ زنگ تلفن"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <!-- outdated translation 8741571721868253103 -->     <string name="all_volume_title" msgid="4296957391257836961">"میزان صدا"</string>
-    <!-- no translation found for musicfx_title (3853457094486073206) -->
-    <skip />
+    <string name="musicfx_title" msgid="3853457094486073206">"جلوه های موسیقی"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"میزان صدای زنگ"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"لرزش در حالت بیصدا"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"لرزش"</string>
@@ -1053,10 +1023,8 @@
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"برنامه حذف نشد. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"مکان نصب برگزیده"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"تغییر مکان نصب مورد نظر برای برنامه های جدید."</string>
-    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
-    <skip />
-    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
-    <skip />
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"غیر فعال کردن برنامه داخلی"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"غیرفعال کردن یک برنامه داخلی ممکن است باعث اختلال در عملکرد دیگر برنامه ها شود. آیا مطمئنید؟"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"استفاده از حافظه"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"مشاهده حافظه استفاده شده توسط برنامه ها"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"سرویس های در حال اجرا"</string>
@@ -1444,8 +1412,7 @@
     <!-- no translation found for accessibility_sync_error (8703299118794272041) -->
     <skip />
     <string name="account_sync_settings_title" msgid="4578227872921044660">"همگام سازی تنظیمات"</string>
-    <!-- no translation found for sync_is_failing (1591561768344128377) -->
-    <skip />
+    <string name="sync_is_failing" msgid="1591561768344128377">"همگام سازی در حال حاضر دارای مشکلی است. در مدت کوتاهی تصحیح می‌شود."</string>
     <string name="add_account_label" msgid="7811707265834013767">"افزودن حساب"</string>
     <string name="header_general_sync_settings" msgid="3487451896424238469">"تنظیمات همگام سازی کلی"</string>
     <string name="background_data" msgid="5779592891375473817">"داده های پس زمینه"</string>
@@ -1506,7 +1473,7 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"مقیاس انیمیشن پنجره"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"مقیاس انیمیشن انتقال"</string>
     <string name="debug_applications_category" msgid="6221644998451283813">"برنامه های کاربردی"</string>
-    <string name="immediately_destroy_activities" msgid="8366775083630234121">"فعالیت ها حفظ نشوند"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"فعالیت ها را ادامه ندهید"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"از بین بردن هر فعالیت به محض خروج کاربر از آن"</string>
     <string name="app_process_limit_title" msgid="4280600650253107163">"محدودیت پردازش در پس زمینه"</string>
     <!-- no translation found for show_all_anrs (28462979638729082) -->
@@ -1552,9 +1519,8 @@
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"هشدار"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"محدودیت"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"برنامه های حذف شده"</string>
-    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
-    <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> دریافت شد، <xliff:g id="SENT">%2$s</xliff:g> فرستاده شد"</string>
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"تماس اضطراری"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"بازگشت به تماس"</string>
@@ -1577,8 +1543,7 @@
     <string name="vpn_username" msgid="1863901629860867849">"نام کاربری"</string>
     <string name="vpn_password" msgid="6756043647233596772">"رمز ورود"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"ذخیره اطلاعات حساب"</string>
-    <!-- no translation found for vpn_not_used (9094191054524660891) -->
-    <skip />
+    <string name="vpn_not_used" msgid="9094191054524660891">"(استفاده نشده)"</string>
     <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(سرور تأیید نشود)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"لغو"</string>
     <string name="vpn_save" msgid="4233484051644764510">"ذخیره"</string>
@@ -1597,40 +1562,25 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"گواهی CA سیستم فعال شود؟"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"گواهی CA سیستم غیرفعال شود؟"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"گواهی CA کاربر به صورت دائمی حذف شود؟"</string>
-    <!-- no translation found for accessibility_tutorial_title (7577630829320003070) -->
-    <skip />
+    <string name="accessibility_tutorial_title" msgid="7577630829320003070">"برنامه آموزشی صحبت در حین لمس"</string>
     <string name="accessibility_tutorial_next" msgid="5079911515520801099">"بعدی"</string>
     <string name="accessibility_tutorial_back" msgid="2583933084111712540">"برگشت"</string>
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"پایان"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"رد شدن از برنامه آموزشی"</string>
-    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_1 (2465037336858060269) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_4 (5374753806314829405) -->
-    <skip />
-    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
-    <skip />
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"درس 1: گشت و گذار در صفحه"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="2465037336858060269">"بعد از فعال کردن \"صحبت در حین لمس\"، بعد از هر لمس شما بر روی صفحه، توضیحی در مورد آنچه در زیر انگشت شما است می شنوید. برای مثال، صفحه کنونی شامل نمادهای برنامه ها است. با لمس صفحه و کشیدن انگشت خود بر روی آن یکی از آنها را پیدا کنید."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"خوب است. برای پیدا کردن حداقل یک نماد بیشتر، همچنان انگشت خود را روی صفحه گذاشته و در اطراف بکشید."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"برای فعال کردن چیزی که در حال لمس آن هستید، بر روی آن ضربه بزنید. برای یافتن نماد <xliff:g id="APP_NAME">%s</xliff:g> انگشت خود را حرکت دهید. سپس بر روی نماد ضربه بزنید تا آن را فعال کنید."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"درحالی که انگشت شما نماد <xliff:g id="APP_NAME">%s</xliff:g> را لمس می کند، یک بار ضربه بزنید تا فعال شود."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"انگشت شما بر روی نماد <xliff:g id="APP_NAME">%s</xliff:g> حرکت کرد و از روی آن رد شد. به آرامی دوباره انگشت خود را بر روی صفحه بکشید تا دوباره نماد مرورگر را بیابید."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"خوب است. برای رفتن به درس بعدی، دکمه <xliff:g id="NEXT">%s</xliff:g> را یافته و فعال کنید، این دکمه نزدیک گوشه پایین سمت راست صفحه قرار دارد."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"درس 2: پیمایش با استفاده از دو انگشت"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"برای پیمایش در یک لیست، می توانید دو انگشت خود را بر روی صفحه به بالا بکشید. برای مثال، صفحه کنونی دارای لیست برنامه هایی است که می توانند به بالا یا پایین پیمایش شوند. ابتدا، سعی کنید که چند مورد در لیست را با کشیدن یک انگشت به اطراف بشناسید."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"خوب است. همچنان انگشت خود را در اطراف بکشید تا حداقل یک مورد دیگر را پیدا کنید."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"حالا دو انگشت را بر روی یک مورد در لیست قرار داده و هردو را به بالا بکشید. اگر به بالای صفحه رسیدید انگشتان خود را بردارید، آنها را در قسمت پایین تری از لیست بگذارید و دوباره به بالا بکشید."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"خوب است. برای پیمایش بیشتر همچنان انگشتان خود را روی صفحه بکشید."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="5374753806314829405">"شما برنامه آموزشی را کامل کردید. برای خروج و بازگشت به تنظیمات \"صحبت در حین لمس\"، دکمه <xliff:g id="FINISH">%s</xliff:g> را یافته و بر روی آن ضربه بزنید."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"تصحیح املایی"</string>
     <!-- no translation found for current_backup_pw_prompt (8314880813545036591) -->
     <skip />
     <!-- no translation found for new_backup_pw_prompt (3491404828757901644) -->
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index ab4de74..daab9fb 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1521,7 +1521,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"rajoitus"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Poistetut sovellukset"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> vastaanotettu, <xliff:g id="SENT">%2$s</xliff:g> lähetetty"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Hätäpuhelu"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Palaa puheluun"</string>
@@ -1577,7 +1577,7 @@
     <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Sormesi kävi kuvakkeen <xliff:g id="APP_NAME">%s</xliff:g> päällä ja siirtyi sitten pois. Liu\'uta sormeasi ruudulla hitaasti, kunnes löydät selainkuvakkeen uudelleen."</string>
     <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Hyvä. Siirry seuraavaan oppituntiin etsimällä ja aktivoimalla <xliff:g id="NEXT">%s</xliff:g>-painike, joka sijaitsee ruudun oikean alakulman lähellä."</string>
     <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Oppitunti 2: Vieritys kahdella sormella"</string>
-    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Voit selata luetteloa liu\'uttamalla kahta sormea ruudulla. Esimerkiksi tällä ruudulla on luettelo sovellusten nimiä, joita voi vierittää ylös- tai alaspäin. Kokeile ensin löytää muutama luettelon kohde liu\'uttamalla yhtä sormea ruudulla."</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Voit selata luetteloa liu\'uttamalla kahta sormea ruudulla. Esimerkiksi tällä ruudulla on luettelo sovellusten nimiä, joita voi vierittää ylös- tai alaspäin. Yritä ensin löytää muutama luettelon kohde liu\'uttamalla yhtä sormea ruudulla."</string>
     <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Hyvä. Jatka sormesi liu\'uttamista, kunnes löydät vielä ainakin yhden kohteen."</string>
     <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Aseta nyt kaksi sormea luettelossa olevan kohteen päälle ja liu\'uta molempia sormia ylöspäin. Jos ruudun ylälaita tulee vastaan, nosta sormet, aseta ne luettelossa alempana olevan kohteen päälle ja jatka liu\'uttamista."</string>
     <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Hyvä. Jatka vierittämistä liu\'uttamalla sormiasi ylöspäin."</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 0ba7b92..6ca91d1b 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -68,13 +68,15 @@
     <item msgid="490158884605093126">"Très grande"</item>
     <item msgid="2123802548987439763">"Très grande"</item>
   </string-array>
-    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
-    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
-    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
-    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
-    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
-    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
-    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
+  <string-array name="entryvalues_font_size">
+    <item msgid="8122189478379706788">"0,70"</item>
+    <item msgid="186029675505810577">"0,85"</item>
+    <item msgid="5864822191921585498">"0,95"</item>
+    <item msgid="5580820036923893743">"1,0"</item>
+    <item msgid="5106590751949630532">"1,05"</item>
+    <item msgid="1803159594904488544">"1,15"</item>
+    <item msgid="7410681469566563300">"1,30"</item>
+  </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Très lente"</item>
     <item msgid="2361722960903353554">"Lente"</item>
@@ -132,14 +134,18 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
-    <!-- no translation found for wifi_p2p_wps_setup:0 (5085064298144493867) -->
-    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
-    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
-    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
-    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
-    <!-- no translation found for wifi_p2p_status:2 (7455862395128183796) -->
-    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
-    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Appuyer sur le bouton"</item>
+    <item msgid="8084424421884876981">"Code PIN de l\'appareil associé"</item>
+    <item msgid="9033470670389392191">"PIN de cet appareil"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Connecté"</item>
+    <item msgid="3189211552661432651">"Invité"</item>
+    <item msgid="7455862395128183796">"Échec."</item>
+    <item msgid="7785896708926971207">"Disponible"</item>
+    <item msgid="829499112585677508">"Hors de portée"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="1106621950288502195">"2 minutes"</item>
     <item msgid="5780349442819375570">"5 minutes"</item>
@@ -209,9 +215,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP ou CHAP"</item>
   </string-array>
-    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
-    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
-    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
+  <string-array name="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Mémoire interne du mobile"</item>
     <item msgid="3738430123799803530">"Carte SD amovible"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 581ee95..21460f5 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -94,15 +94,12 @@
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Peu populaire"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Identifiable"</string>
-    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
-    <skip />
-    <!-- outdated translation 8573385118329733931 -->     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Identifiable"</string>
-    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
-    <skip />
-    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
-    <skip />
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Identifiable par appareils Bluetooth à proximité (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Identifiable par appareils Bluetooth à proximité"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Non identifiable par autres appareils Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Identifiable uniquement par les appareils associés"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Permettre l\'identification de l\'appareil"</string>
-    <!-- outdated translation 6634508002347847278 -->     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Délai au-delà duquel l\'appareil n\'est plus identifiable"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Délai de visibilité"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Définir la durée pendant laquelle l\'appareil est identifiable"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquer les appels par reconnaissance vocale"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Désactiver les appels via le Bluetooth lorsque l\'écran est verrouillé"</string>
@@ -110,16 +107,11 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nom de l\'appareil"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Aucun nom n\'a été défini. Utilisation du nom du compte..."</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Recherche d\'appareils"</string>
-    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
-    <skip />
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Renommer la tablette"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Renommer le téléphone"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Renommer"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Déconnecter ?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Cela va mettre fin à votre connexion avec :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va être déconnecté."</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Connecté"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Déconnecté"</string>
@@ -129,15 +121,14 @@
     <string name="bluetooth_not_connected" msgid="3389882907500605937">"Associer à cet appareil"</string>
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Association…"</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Relié, mais pas connecté"</string>
-    <!-- outdated translation 6873461446424952003 -->     <string name="bluetooth_device" msgid="5291950341750186887">"mains libres/casque"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Périphérique Bluetooth sans nom"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Recherche en cours"</string>
     <string name="progress_tap_to_pair" msgid="4192342336107106334">"Appuyer pour associer"</string>
     <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Aucun appareil Bluetooth détecté."</string>
     <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="618099089987569242">"Sélectionner pour associer à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
-    <skip />
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Afficher les fichiers reçus"</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="8211158472876087588">"Une application demande l\'autorisation d\'activer Bluetooth. Voulez-vous l\'activer ?"</string>
@@ -157,8 +148,7 @@
     <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Appuyez ici pour vous connecter à \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Voulez-vous vous connecter à \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Demande de répertoire"</string>
-    <!-- no translation found for bluetooth_pb_acceptance_dialog_text (5203107624986011263) -->
-    <skip />
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s souhaite accéder à vos contacts et à l\'historique de vos appels. Autoriser l\'accès à %2$s ?"</string>
     <string name="bluetooth_pb_alwaysallowed" msgid="3953839482721299910">"Toujours autorisé ?"</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">"1:00 pm"</string>
@@ -405,26 +395,17 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"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_pairing_request" msgid="6385750334766370310">"Demande d\'association Bluetooth"</string>
-    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
-    <skip />
-    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
-    <skip />
-    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
-    <skip />
-    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
-    <skip />
-    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
-    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Pour associer votre appareil à :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Saisissez le code PIN exigé par l\'appareil :"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Pour associer votre appareil à :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Saisissez le mot de passe exigé par l\'appareil :"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"Le code PIN contient des lettres ou des symboles"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Généralement 0000 ou 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Vous devrez peut-être également saisir ce code PIN sur l\'autre appareil."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Vous devrez peut-être également saisir ce mot de passe sur l\'autre appareil."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Pour associer votre appareil à :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Assurez-vous que le mot de passe &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; s\'affiche."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"De :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Associer à cet appareil ?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Pour associer votre appareil à :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Saisissez :&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, puis appuyez sur \"Entrée\"."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Se connecter"</string>
-    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Ne pas se connecter"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Annuler"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Avertissement"</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="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>
@@ -490,8 +471,7 @@
     <skip />
     <!-- no translation found for zeroclick_off_summary (2896320184904157018) -->
     <skip />
-    <!-- no translation found for zeroclick_label (6908892664706309626) -->
-    <skip />
+    <string name="zeroclick_label" msgid="6908892664706309626">"Partage sans cliquer"</string>
     <!-- no translation found for zeroclick_explained (3953149564512166049) -->
     <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
@@ -573,24 +553,15 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Passerelle"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longueur du préfixe réseau"</string>
-    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
-    <skip />
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi en commande directe"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Configurer la connectivité peer-to-peer"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Informations sur l\'appareil"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Configuration Wi-Fi protégée"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Saisir le code PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Mémoriser cette connexion"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Rechercher"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Créer un groupe"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avancés"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Point d\'accès Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Point d\'accès Wi-Fi mobile <xliff:g id="NETWORK_SSID">%1$s</xliff:g> actif"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Erreur liée au point d\'accès Wi-Fi mobile"</string>
@@ -603,8 +574,7 @@
     <string name="ringtone_title" msgid="5379026328015343686">"Sonnerie du téléphone"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <!-- outdated translation 8741571721868253103 -->     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
-    <!-- no translation found for musicfx_title (3853457094486073206) -->
-    <skip />
+    <string name="musicfx_title" msgid="3853457094486073206">"Effet musicaux"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume de la sonnerie"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer en mode silencieux"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibreur"</string>
@@ -1052,10 +1022,8 @@
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Échec du déplacement de l\'application. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Emplacement d\'installation souhaité"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Modifier l\'emplacement d\'installation par défaut pour les nouvelles applications"</string>
-    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
-    <skip />
-    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
-    <skip />
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Désactiver application intégrée"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"La désactivation d\'une application intégrée peut affecter le comportement d\'autres applications. Voulez-vous vraiment désactiver cette application ?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilisation du stockage"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Afficher l\'espace de stockage utilisé par les applications"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Services en cours d\'exécution"</string>
@@ -1550,9 +1518,8 @@
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"avertissement"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limite"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Applications supprimées"</string>
-    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
-    <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> reçus, <xliff:g id="SENT">%2$s</xliff:g> envoyés"</string>
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Appel d\'urgence"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Retour à l\'appel"</string>
@@ -1575,8 +1542,7 @@
     <string name="vpn_username" msgid="1863901629860867849">"Nom d\'utilisateur"</string>
     <string name="vpn_password" msgid="6756043647233596772">"Mot de passe"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"Enregistrer les informations de compte"</string>
-    <!-- no translation found for vpn_not_used (9094191054524660891) -->
-    <skip />
+    <string name="vpn_not_used" msgid="9094191054524660891">"(non utilisé)"</string>
     <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(Ne pas valider le serveur)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Annuler"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Enregistrer"</string>
@@ -1595,40 +1561,25 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Activer le certificat d\'autorité du système ?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Désactiver le certificat d\'autorité du système ?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Supprimer définitivement le certificat d\'autorité utilisateur ?"</string>
-    <!-- no translation found for accessibility_tutorial_title (7577630829320003070) -->
-    <skip />
+    <string name="accessibility_tutorial_title" msgid="7577630829320003070">"Didacticiel \"Description vocale\""</string>
     <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Suivant"</string>
     <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Retour"</string>
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Terminer"</string>
-    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Ignorer"</string>
-    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_1 (2465037336858060269) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_4 (5374753806314829405) -->
-    <skip />
-    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
-    <skip />
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Passer"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Leçon 1 : Découverte de l\'écran"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="2465037336858060269">"Une fois la fonctionnalité \"Description vocale\" activée, vous pouvez toucher l\'écran pour écouter une description de l\'élément sélectionné. Par exemple, l\'écran actuel présente des icônes d\'applications. Écoutez l\'une d\'entre elles en faisant glisser votre doigt sur l\'écran."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Très bien. Continuez à faire glisser votre doigt sur l\'écran pour trouver au moins une autre icône."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Pour activer un élément sélectionné, appuyez dessus. Faites glisser votre doigt jusqu\'à ce que vous trouviez l\'icône <xliff:g id="APP_NAME">%s</xliff:g>, puis appuyez dessus une fois pour l\'activer."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Vous touchez l\'icône <xliff:g id="APP_NAME">%s</xliff:g>. Appuyez une fois pour l\'activer."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Vous avez placé votre doigt sur l\'icône <xliff:g id="APP_NAME">%s</xliff:g>, puis l\'en avez éloigné. Faites glisser lentement votre doigt sur l\'écran jusqu\'à ce que vous retrouviez l\'icône \"Navigateur\"."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Très bien. Pour passer à la leçon suivante, recherchez le ​​bouton <xliff:g id="NEXT">%s</xliff:g> situé dans l\'angle inférieur droit de l\'écran, puis activez-le."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Leçon 2 : le défilement à deux doigts"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Pour faire défiler une liste, vous pouvez faire glisser deux doigts le long de l\'écran. Par exemple, l\'écran actuel présente une liste de noms d\'applications pouvant défiler vers le haut ou vers le bas. Essayez tout d\'abord d\'identifier quelques éléments de la liste en faisant glisser votre doigt sur l\'écran."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Très bien. Continuez à faire glisser votre doigt pour trouver au moins un autre élément."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Placez maintenant deux doigts sur un élément de la liste et faites-les glisser vers le haut. Si vous atteignez le haut de l\'écran, retirez vos doigts, placez-les plus bas sur la liste, puis faites-les glisser de nouveau vers le haut."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Très bien. Continuez à faire glisser vos doigts vers le haut pour faire défiler plus d\'éléments."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="5374753806314829405">"Vous avez terminé le didacticiel. Pour quitter et revenir au paramètre \"Description vocale\", recherchez le bouton <xliff:g id="FINISH">%s</xliff:g>, puis appuyez dessus."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Correction orthographique"</string>
     <!-- no translation found for current_backup_pw_prompt (8314880813545036591) -->
     <skip />
     <!-- no translation found for new_backup_pw_prompt (3491404828757901644) -->
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 6fb3116..75a5eff 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -134,14 +134,18 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
-    <!-- no translation found for wifi_p2p_wps_setup:0 (5085064298144493867) -->
-    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
-    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
-    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
-    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
-    <!-- no translation found for wifi_p2p_status:2 (7455862395128183796) -->
-    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
-    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Taster"</item>
+    <item msgid="8084424421884876981">"Pin iz paralelnog uređaja"</item>
+    <item msgid="9033470670389392191">"Pin iz ovog uređaja"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Povezano"</item>
+    <item msgid="3189211552661432651">"Pozvan"</item>
+    <item msgid="7455862395128183796">"Neuspješno"</item>
+    <item msgid="7785896708926971207">"Dostupan"</item>
+    <item msgid="829499112585677508">"Izvan raspona"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="1106621950288502195">"2 minute"</item>
     <item msgid="5780349442819375570">"5 minuta"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 1715a8a..5a4082c 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -94,15 +94,12 @@
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Hladno"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Moguće prepoznavanje"</string>
-    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
-    <skip />
-    <!-- outdated translation 8573385118329733931 -->     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Moguće prepoznavanje"</string>
-    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
-    <skip />
-    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
-    <skip />
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Vidljivo svim Bluetooth uređajima u blizini (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Vidljivo svim Bluetooth uređajima u blizini"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nije vidljiv drugim Bluetooth uređajima"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Vidljivo samo uparenim uređajima"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Omogući prepoznavanje uređaja"</string>
-    <!-- outdated translation 6634508002347847278 -->     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Privremeni prekid mogućeg prepoznavanja"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Vidljivost je istekla"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Odredite koliko će dugo biti moguće otkriti uređaj"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Zaključaj biranje glasom"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Spriječite upotrebu Bluetooth birača ako je zaslon zaključan"</string>
@@ -110,16 +107,11 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Naziv uređaja"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Bez postavke imena, koristi naziv računa"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Skeniranjem traži uređaje"</string>
-    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
-    <skip />
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Preimenuj tabletno računalo"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Preimenuj telefon"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Preimenuj"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Isključiti?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"To će završiti vašu vezu s uređajem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"Stavka <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bit će isključena."</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Povezan"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Niste povezani"</string>
@@ -129,15 +121,14 @@
     <string name="bluetooth_not_connected" msgid="3389882907500605937">"Upari s ovim uređajem"</string>
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Uparivanje…"</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Upareno, ali nije povezano"</string>
-    <!-- outdated translation 6873461446424952003 -->     <string name="bluetooth_device" msgid="5291950341750186887">"bez upotrebe ruku/slušalica"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Neimenovani Bluetooth uređaj"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Pretraživanje"</string>
     <string name="progress_tap_to_pair" msgid="4192342336107106334">"Dodirnite za uparivanje"</string>
     <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"U blizini nema Bluetooth uređaja."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Zahtjev za Bluetooth uparivanje"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Zahtjev za uparivanje"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Odaberi uparivanje s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
-    <skip />
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Prikaži primljene datoteke"</string>
     <string name="device_picker" msgid="8721012448931226323">"Alat za odabir Bluetooth uređaja"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Zatraženo je Bluetooth dopuštenje"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Aplikacija traži dozvolu za uključenje Bluetootha. Želite li to učiniti?"</string>
@@ -404,26 +395,17 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Upravljajte vezama, postavite uređaj i mogućnost otkrivanja"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Zahtjev za Bluetooth uparivanje"</string>
-    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
-    <skip />
-    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
-    <skip />
-    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
-    <skip />
-    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
-    <skip />
-    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
-    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Za uparivanje s uređajem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;unesite traženi PIN uređaja:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Za uparivanje s uređajem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;unesite traženi pristupni kôd uređaja:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN sadrži slova ili simbole"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Obično 0000 ili 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Možda biste također trebali unijeti ovaj PIN na drugi uređaj."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Možda biste također trebali unijeti ovaj pristupni kôd na drugi uređaj."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Za uparivanje s:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;uvjerite se da prikazuje ovaj pristupni kôd:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Od:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Upariti se s tim uređajem?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Za uparivanje s:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Na njemu upišite:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, a zatim pritisnite tipku za povratak ili unos."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Upari"</string>
-    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Nemoj upariti"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Odustani"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Pažnja"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Pojavio se problem s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Došlo je do problema s uparivanjem uređaja <xliff:g id="DEVICE_NAME">%1$s</xliff:g> jer su PIN ili zaporka netočni."</string>
@@ -489,8 +471,7 @@
     <skip />
     <!-- no translation found for zeroclick_off_summary (2896320184904157018) -->
     <skip />
-    <!-- no translation found for zeroclick_label (6908892664706309626) -->
-    <skip />
+    <string name="zeroclick_label" msgid="6908892664706309626">"Dijeljenje bez klika"</string>
     <!-- no translation found for zeroclick_explained (3953149564512166049) -->
     <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
@@ -572,24 +553,15 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Pristupnik"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Duljina mrežnog prefiksa"</string>
-    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
-    <skip />
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Izravni Wi-Fi"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Postavljanje veze paralelnih uređaja"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Informacije o uređaju"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Zaštićeno postavljanje Wi-Fi mreže"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Unesi PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Zapamti tu vezu"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Pretraživanje"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Izradi skupinu"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Napredno"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prijenosni Wi-Fi hotspot"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Aktivan je prijenosni hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Pogreška prijenosnog Wi-Fi hotspota"</string>
@@ -602,8 +574,7 @@
     <string name="ringtone_title" msgid="5379026328015343686">"Melodija zvona telefona"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <!-- outdated translation 8741571721868253103 -->     <string name="all_volume_title" msgid="4296957391257836961">"Glasnoća"</string>
-    <!-- no translation found for musicfx_title (3853457094486073206) -->
-    <skip />
+    <string name="musicfx_title" msgid="3853457094486073206">"Glazbeni efekti"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Glasnoća zvona"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibracija ako je bešumno"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibracija"</string>
@@ -1052,10 +1023,8 @@
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Nije uspjelo premještanje aplikacije. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Željena lokacije instalacije"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Promijenite željenu lokaciju instalacije za nove aplikacije."</string>
-    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
-    <skip />
-    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
-    <skip />
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Onemogući ugrađenu aplikaciju"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Onemogućavanje ugrađenih aplikacija može uzrokovati nepravilan rad drugih aplikacija. Jeste li sigurni?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Upotreba pohrane"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Prikaz pohrane koju upotrebljavaju aplikacije"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Pokrenute usluge"</string>
@@ -1550,9 +1519,8 @@
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"Upozorenja: <xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12"></font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ograničenje"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Uklonjene aplikacije"</string>
-    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
-    <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"Primljeno: <xliff:g id="RECEIVED">%1$s</xliff:g>, poslano: <xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Hitan poziv"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Vrati se na poziv"</string>
@@ -1594,40 +1562,25 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Želite li omogućiti sistemski CA certifikat?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Želite li onemogućiti sistemski CA certifikat?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Želite li trajno ukloniti korisnički CA certifikat?"</string>
-    <!-- no translation found for accessibility_tutorial_title (7577630829320003070) -->
-    <skip />
+    <string name="accessibility_tutorial_title" msgid="7577630829320003070">"Vodič \"Talk As I Touch\""</string>
     <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Sljedeća"</string>
     <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Natrag"</string>
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Završi"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Preskoči vodič"</string>
-    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_1 (2465037336858060269) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_4 (5374753806314829405) -->
-    <skip />
-    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
-    <skip />
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lekcija 1: istraživanje zaslona"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="2465037336858060269">"Nakon što uključite opciju \"Talk As I Touch\", možete dodirnuti zaslon da čujete opis onoga što vam je pod prstom. Na primjer, trenutni zaslon sadrži ikone aplikacija. Nađite jednu od njih dodirivanjem zaslona i povlačenjem prsta po njemu."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Dobro, nastavite kliziti prstom po zaslonu kako biste pronašli još barem jednu ikonu."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Da biste aktivirali ono što dodirujete, lagano lupnite po tome. Povlačite prstom dok ne pronađete ikonu za <xliff:g id="APP_NAME">%s</xliff:g>. Zatim dodirnite ikonu jedanput da biste je aktivirali."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Vaš prst dodiruje ikonu aplikacije <xliff:g id="APP_NAME">%s</xliff:g>. Dodirnite jedanput da biste aktivirali tu ikonu."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Vaš je prst prešao preko ikone aplikacije <xliff:g id="APP_NAME">%s</xliff:g> i otišao dalje. Polako povlačite prstom po zaslonu dok opet ne pronađete ikonu preglednika."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Dobro. Za pomicanje na sljedeću lekciju pronađite i aktivirajte gumb <xliff:g id="NEXT">%s</xliff:g> koji se nalazi u donjem desnom kutu zaslona."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lekcija 2: pomicanje pomoću dva prsta"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Za pomicanje kroz popis možete vući dva prsta po zaslonu. Na primjer, trenutni zaslon sadrži popis imena aplikacija koji se može pomaknuti prema gore ili dolje. Prvo, pokušajte identificirati nekoliko stavki na popisu pomicanjem jednog prsta po zaslonu."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Dobro, nastavite kliziti prstom kako biste pronašli još barem jednu stavku."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Sada stavite dva prsta na stavku na popisu i povucite oba prsta gore. Ako dođete do vrha zaslona, ​​podignite prste, smjestite ih niže na popisu i nastavite vući prema gore."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Dobro, nastavite kliziti prstima prema gore da biste se još pomaknuli."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="5374753806314829405">"Došli ste do kraja vodiča. Za izlaz i povratak na postavku \"Talk As I Touch\" pronađite i dotaknite gumb <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Ispravljanje pravopisnih pogrešaka"</string>
     <!-- no translation found for current_backup_pw_prompt (8314880813545036591) -->
     <skip />
     <!-- no translation found for new_backup_pw_prompt (3491404828757901644) -->
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 98b3199..212ba0b 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1520,7 +1520,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"korlát"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Eltávolított alkalmazások"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> érkezett, <xliff:g id="SENT">%2$s</xliff:g> elküldve"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Segélyhívás"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Hívás folytatása"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 594078c..e08cdbc 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1522,7 +1522,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="12">"batas"</font>\n<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Apl dihapus"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> diterima, <xliff:g id="SENT">%2$s</xliff:g> dikirim"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Panggilan darurat"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Kembali ke panggilan"</string>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 513f20a..722f577 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -140,9 +140,9 @@
     <item msgid="9033470670389392191">"PIN da dispositivo"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
-    <item msgid="1701505390737218306">"Collegato"</item>
+    <item msgid="1701505390737218306">"Connesso"</item>
     <item msgid="3189211552661432651">"Invitato"</item>
-    <item msgid="7455862395128183796">"Errore"</item>
+    <item msgid="7455862395128183796">"Operazione non riuscita"</item>
     <item msgid="7785896708926971207">"Disponibile"</item>
     <item msgid="829499112585677508">"Fuori dal raggio d\'azione"</item>
   </string-array>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ff8f168..f3e4503 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -94,8 +94,8 @@
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Minimo"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Rilevabile"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visibile a tutti dispositivi Bluetooth in vicinanze (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visibile a tutti dispositivi Bluetooth in vicinanze"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visibile a tutti dispositivi Bluetooth vicini (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visibile a tutti dispositivi Bluetooth vicini"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Non visibile ad altri dispositivi Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Visibile solo ai dispositivi accoppiati"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Rendi rilevabile il dispositivo"</string>
@@ -141,8 +141,7 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Un\'applicazione sul tuo tablet chiede l\'autorizzazione per attivare Bluetooth e rendere il tuo tablet rilevabile da altri dispositivi. Procedere?"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Un\'applicazione sul tuo telefono chiede l\'autorizzazione per attivare Bluetooth e rendere il tuo telefono rilevabile da altri dispositivi. Procedere?"</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Attivazione Bluetooth???"</string>
-    <!-- no translation found for bluetooth_turning_off (2337747302892025192) -->
-    <skip />
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Disattivazione Bluetooth???"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Connessione automatica"</string>
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Richiesta di connessione Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Tocca per connetterti a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
@@ -398,7 +397,7 @@
     <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Per l\'accoppiamento con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Inserisci il PIN richiesto del dispositivo:"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Per l\'accoppiamento con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Inserisci la passkey richiesta del dispositivo:"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"Il PIN contiene lettere o simboli"</string>
-    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Generalmente 0000 o 1234"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Di solito 0000 o 1234"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Potrebbe inoltre essere necessario inserire questo PIN sull\'altro dispositivo."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Potrebbe inoltre essere necessario inserire questa passkey sull\'altro dispositivo."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Per l\'accoppiamento con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Assicurati che sia visualizzata questa passkey:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
@@ -464,16 +463,12 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per musica e audio media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ricorda impostazioni"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <!-- no translation found for zeroclick_settings_title (3105038392089982549) -->
-    <skip />
+    <string name="zeroclick_settings_title" msgid="3105038392089982549">"Tocca per condividere"</string>
     <string name="zeroclick_settings_summary" msgid="1552171461663258522"></string>
-    <!-- no translation found for zeroclick_on_summary (3157018760403281266) -->
-    <skip />
-    <!-- no translation found for zeroclick_off_summary (2896320184904157018) -->
-    <skip />
+    <string name="zeroclick_on_summary" msgid="3157018760403281266">"Attivo"</string>
+    <string name="zeroclick_off_summary" msgid="2896320184904157018">"Disattivato"</string>
     <string name="zeroclick_label" msgid="6908892664706309626">"Condivisione con zero clic"</string>
-    <!-- no translation found for zeroclick_explained (3953149564512166049) -->
-    <skip />
+    <string name="zeroclick_explained" msgid="3953149564512166049">"Tocca per condividere consente di condividere contenuti delle applicazioni semplicemente collegando il dispositivo NFC a un altro dispositivo."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Attiva Wi-Fi"</string>
     <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
@@ -632,8 +627,7 @@
     <string name="screen_timeout" msgid="6962654593018319466">"Timeout"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Lo schermo si spegne automaticamente dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Sfondo"</string>
-    <!-- no translation found for wallpaper_settings_fragment_title (443941273453987627) -->
-    <skip />
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Seleziona sfondo da"</string>
     <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
     <string name="dream_settings_summary" msgid="6809871648071408259">"Screen saver e altri diversivi inattività"</string>
     <string name="dream_component_title" msgid="505229894674572578">"Sogno selezionato"</string>
@@ -743,20 +737,14 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"La scheda SD condiviso verrà smontata."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Smontaggio in corso"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Smontaggio in corso"</string>
-    <!-- no translation found for storage_menu_usb (5708207885333243384) -->
-    <skip />
-    <!-- no translation found for storage_title_usb (679612779321689418) -->
-    <skip />
-    <!-- no translation found for usb_connection_category (7805945595165422882) -->
-    <skip />
-    <!-- no translation found for usb_mtp_title (3399663424394065964) -->
-    <skip />
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Connessione computer USB"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Connessione computer USB"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Connetti come"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Dispositivo multimediale (MTP)"</string>
     <!-- no translation found for usb_mtp_summary (4617321473211391236) -->
     <skip />
-    <!-- no translation found for usb_ptp_title (3852760810622389620) -->
-    <skip />
-    <!-- no translation found for usb_ptp_summary (7673397474756664929) -->
-    <skip />
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Fotocamera (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Consente di trasferire foto utilizzando il software della fotocamera e di trasferire i file su computer che non supportano MTP"</string>
     <!-- no translation found for usb_label_installer_cd (4331173824920630215) -->
     <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Stato batteria"</string>
@@ -1023,7 +1011,7 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"Percorso di installazione"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Cambia il percorso preferito per l\'installazione di nuove applicazioni."</string>
     <string name="app_disable_dlg_title" msgid="6662184657838747395">"Disattiva applicazione integrata"</string>
-    <string name="app_disable_dlg_text" msgid="1328080928456579599">"La disattivazione di un\'applicazione integrata potrebbe causare il funzionamento anomalo di altre applicazioni. Confermi?"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"La disattivazione di un\'applicazione integrata potrebbe causare il funzionamento anomalo di altre applicazioni. Procedere?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilizzo memoria"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Visualizza la memoria utilizzata dalle applicazioni"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servizi in esecuzione"</string>
@@ -1113,8 +1101,7 @@
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Nascondi sempre"</string>
     <string name="configure_input_method" msgid="7773992829158322455">"Configura metodi di input"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Impostazioni"</string>
-    <!-- no translation found for input_method_settings_button (6778344383871619368) -->
-    <skip />
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Impostazioni"</string>
     <string name="active_input_method_subtypes" msgid="3596398805424733238">"Metodi di immissione attivi"</string>
     <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Usa lingua di sistema"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Impostazioni di <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
@@ -1146,60 +1133,35 @@
     <string name="usage_time_label" msgid="295954901452833058">"Tempo di utilizzo"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Accessibilità"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Impostazioni di accessibilità"</string>
-    <!-- no translation found for accessibility_services_title (2592221829284342237) -->
-    <skip />
-    <!-- no translation found for accessibility_system_title (7187919089874130484) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_large_text_title (6618674985313017711) -->
-    <skip />
-    <!-- no translation found for accessibility_power_button_ends_call_title (5468375366375940894) -->
-    <skip />
-    <!-- no translation found for accessibility_touch_exploration_title (4171477646863806078) -->
-    <skip />
-    <!-- no translation found for accessibility_touch_exploration_summary (1163951209315238103) -->
-    <skip />
-    <!-- no translation found for accessibility_long_press_timeout_title (2373216941395035306) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_title (7661286619870144136) -->
-    <skip />
-    <!-- no translation found for accessibility_menu_item_settings (3344942964710773365) -->
-    <skip />
-    <!-- no translation found for accessibility_menu_item_tutorial (567989492004682307) -->
-    <skip />
-    <!-- no translation found for accessibility_service_state_on (8791337599927106344) -->
-    <skip />
-    <!-- no translation found for accessibility_service_state_off (2458594460762620776) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_allowed (7624804397748427621) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_disallowed (5156785826922460983) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_button_allow (2201503285877102870) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_button_disallow (1846740874310014190) -->
-    <skip />
-    <!-- no translation found for accessibility_service_security_warning (8318281678500467596) -->
-    <skip />
-    <!-- no translation found for accessibility_disable_warning_title (6094507649988366153) -->
-    <skip />
-    <!-- no translation found for accessibility_disable_warning_summary (3421051138834637486) -->
-    <skip />
-    <!-- outdated translation 898893674114288531 -->     <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Nessuna applicazione di accessibilità trovata"</string>
-    <!-- unknown placeholder BREAK_0 in accessibility_service_no_apps_message -->
-    <skip />
-    <!-- no translation found for accessibility_service_no_apps_message (3019731308902198093) -->
-    <skip />
-    <!-- outdated translation 1113600871264359828 -->     <string name="accessibility_script_injection_security_warning" msgid="3222458225014522516">"Alcune applicazioni possono chiedere a Google di scaricare sul tablet script che rendono i contenuti più accessibili. Consentire a Google di installare script di accessibilità sul tablet?"</string>
-    <!-- no translation found for accessibility_touch_exploration_warning (3545647203361863891) -->
-    <skip />
-    <!-- no translation found for accessibility_service_default_description (7913667934411055972) -->
-    <skip />
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Servizi"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Testo grande"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Il pulsante di accensione termina la chiamata"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Esplora al tocco"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Quando la funzione Esplora al tocco è attiva, puoi ascoltare o visualizzare le descrizioni di ciò che si trova sotto il tuo dito."\n\n"Questa funzione è destinata a utenti ipovedenti."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Ritardo tocco e pressione prolungata"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Installa script accessibilità"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Impostazioni"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Esercitazione"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Attivo"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Disattivato"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Ammesso"</string>
+    <string name="accessibility_script_injection_disallowed" msgid="5156785826922460983">"Non ammesso"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Consenti"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Non consentire"</string>
+    <string name="accessibility_service_security_warning" msgid="8318281678500467596">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> è in grado di raccogliere tutto il testo digitato, tranne le password. Ciò include i dati personali come i numeri di carte di credito. Può anche raccogliere dati sulle tue interazioni con il dispositivo."</string>
+    <string name="accessibility_disable_warning_title" msgid="6094507649988366153">"Disattivare l\'accessibilità?"</string>
+    <string name="accessibility_disable_warning_summary" msgid="3421051138834637486">"Tocca OK per bloccare l\'enunciazione delle descrizioni e tutte le altre funzioni di accessibilità in uso."</string>
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Nessuna applicazione di accessibilità"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Non sono presenti applicazioni di accessibilità installate. Scaricare uno screen reader da Android Market?"</string>
+    <string name="accessibility_script_injection_security_warning" msgid="3222458225014522516">"Vuoi che le applicazioni installino script di Google per rendere più accessibili i relativi contenuti?"</string>
+    <string name="accessibility_touch_exploration_warning" msgid="3545647203361863891">"L\'attivazione dell\'esplorazione al tocco cambia le modalità di risposta dei dispositivi al tocco. Abilitare l\'esplorazione al tocco?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Questo servizio di accessibilità non ha alcuna descrizione."\n\n"I servizi di accessibilità forniscono vari tipi di feedback quando interagisci con il dispositivo."</string>
     <string name="settings_button" msgid="3006713718908152930">"Impostazioni"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Consumo batteria"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Dati uso batteria non dispon."</string>
-    <!-- no translation found for power_usage_level_and_status (1457675765137705432) -->
-    <skip />
+    <string name="power_usage_level_and_status" msgid="1457675765137705432">"Livello della batteria <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilizzo batteria dallo scollegamento"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Utilizzo batteria dal ripristino"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> con la batteria"</string>
@@ -1352,12 +1314,9 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Al momento nessun account memorizza i dati di backup"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Ripristino automatico"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Se reinstallo un\'applicazione, ripristina le impostazioni o altri dati di backup"</string>
-    <!-- no translation found for local_backup_password_title (8654157395556264248) -->
-    <skip />
-    <!-- no translation found for local_backup_password_summary_none (6957183071243950438) -->
-    <skip />
-    <!-- no translation found for local_backup_password_summary_change (2838158406324091370) -->
-    <skip />
+    <string name="local_backup_password_title" msgid="8654157395556264248">"Password di backup locale"</string>
+    <string name="local_backup_password_summary_none" msgid="6957183071243950438">"I backup locali completi non sono attualmente protetti."</string>
+    <string name="local_backup_password_summary_change" msgid="2838158406324091370">"Seleziona per modificare o rimuovere la password per i backup locali completi"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Copia di backup"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Interrompere il backup delle password Wi-Fi, dei segnalibri, di altre impostazioni e dei dati delle applicazioni e cancellare tutte le copie sui server di Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Impostazioni di amministrazione dispositivo"</string>
@@ -1404,12 +1363,9 @@
     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Non è possibile impostare una connessione Wi-Fi EAP durante la configurazione. Potrai farlo al termine della configurazione in Impostazioni, sotto "<b>"Wireless e reti"</b>"."</string>
     <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"La connessione può richiedere qualche minuto..."</string>
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Tocca "<b>"Avanti"</b>" per continuare con la configurazione."\n\n"Tocca "<b>"Indietro"</b>" per connetterti a un\'altra rete Wi-Fi."</string>
-    <!-- no translation found for accessibility_sync_enabled (558480439730263116) -->
-    <skip />
-    <!-- no translation found for accessibility_sync_disabled (1741194106479011384) -->
-    <skip />
-    <!-- no translation found for accessibility_sync_error (8703299118794272041) -->
-    <skip />
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronizzazione abilitata"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronizzazione disabilata"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Errore di sincronizzazione."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Impostazioni sincronizzazione"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"La sincronizzazione presenta dei problemi. L\'operazione verrà presto ripristinata."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Aggiungi account"</string>
@@ -1519,7 +1475,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limite"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Applicazioni rimosse"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> ricevuti, <xliff:g id="SENT">%2$s</xliff:g> inviati"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chiamata di emergenza"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Torna a chiamata"</string>
@@ -1532,13 +1488,10 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Chiave pre-condivisa IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certificato IPSec dell\'utente"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certificato CA per IPSec"</string>
-    <!-- no translation found for vpn_show_options (7182688955890457003) -->
-    <skip />
+    <string name="vpn_show_options" msgid="7182688955890457003">"Mostra opzioni avanzate"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Domini di ricerca DNS"</string>
-    <!-- no translation found for vpn_dns_servers (5570715561245741829) -->
-    <skip />
-    <!-- no translation found for vpn_routes (3818655448226312232) -->
-    <skip />
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"Server DNS (ad es. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Indirizzi di inoltro (ad es. 10.0.0.0/8)"</string>
     <string name="vpn_username" msgid="1863901629860867849">"Nome utente"</string>
     <string name="vpn_password" msgid="6756043647233596772">"Password"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"Salva informazioni account"</string>
@@ -1580,14 +1533,9 @@
     <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Bene, continua a far scorrere le dita verso l\'alto per avanzare con lo scorrimento."</string>
     <string name="accessibility_tutorial_lesson_2_text_4" msgid="5374753806314829405">"Hai terminato l\'esercitazione. Per uscire e tornare all\'impostazione Pronuncia al tocco, cerca e tocca il pulsante <xliff:g id="FINISH">%s</xliff:g>."</string>
     <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Correzione ortografica"</string>
-    <!-- no translation found for current_backup_pw_prompt (8314880813545036591) -->
-    <skip />
-    <!-- no translation found for new_backup_pw_prompt (3491404828757901644) -->
-    <skip />
-    <!-- no translation found for confirm_new_backup_pw_prompt (7087168267741332184) -->
-    <skip />
-    <!-- no translation found for backup_pw_set_button_text (2387480910044648795) -->
-    <skip />
-    <!-- no translation found for backup_pw_cancel_button_text (8845630125391744615) -->
-    <skip />
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Inserisci la password corrente di backup completo qui"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Inserisci una nuova password per i backup completi qui"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Inserisci nuovamente la nuova password di backup completo qui"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Imposta password di backup"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Annulla"</string>
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index df2b76e..5994ff6 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -132,14 +132,18 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
-    <!-- no translation found for wifi_p2p_wps_setup:0 (5085064298144493867) -->
-    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
-    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
-    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
-    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
-    <!-- no translation found for wifi_p2p_status:2 (7455862395128183796) -->
-    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
-    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"לחץ על לחצן"</item>
+    <item msgid="8084424421884876981">"PIN ממכשיר עמית"</item>
+    <item msgid="9033470670389392191">"PIN מהמכשיר הזה"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"מחובר"</item>
+    <item msgid="3189211552661432651">"הוזמן"</item>
+    <item msgid="7455862395128183796">"נכשל"</item>
+    <item msgid="7785896708926971207">"זמין"</item>
+    <item msgid="829499112585677508">"מחוץ לטווח"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="1106621950288502195">"2 דקות"</item>
     <item msgid="5780349442819375570">"5 דקות"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2c63044..67447bd 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -94,15 +94,12 @@
     <string name="battery_info_health_cold" msgid="3835692786176707318">"קר"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"בר-גילוי"</string>
-    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
-    <skip />
-    <!-- outdated translation 8573385118329733931 -->     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"גלוי"</string>
-    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
-    <skip />
-    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
-    <skip />
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"גלוי לכל מכשירי Bluetooth הסמוכים (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"גלוי לכל מכשירי Bluetooth הסמוכים"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"לא גלוי עבור מכשירי Bluetooth אחרים"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"גלוי רק למכשירים מותאמים"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"הפוך את ההתקן לבר-גילוי"</string>
-    <!-- outdated translation 6634508002347847278 -->     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"זמן קצוב לתפוגה של מצב גלוי"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"זמן קצוב לחשיפה"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"הגדר במשך כמה זמן ההתקן יהיה גלוי"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"נעל חיוג קולי"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"מנע את השימוש בחייגן Bluetooth כאשר הצג נעול"</string>
@@ -110,16 +107,11 @@
     <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>
-    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
-    <skip />
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"שנה את שם הטבלט"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"שינוי שם טלפון"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"שנה שם"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"להתנתק?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"פעולה זו תסיים את החיבור עם:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</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>
@@ -129,15 +121,14 @@
     <string name="bluetooth_not_connected" msgid="3389882907500605937">"התאם עם התקן זה"</string>
     <string name="bluetooth_pairing" msgid="1426882272690346242">"מתאים..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"מותאם אך לא מחובר"</string>
-    <!-- outdated translation 6873461446424952003 -->     <string name="bluetooth_device" msgid="5291950341750186887">"דיבורית/אוזניות"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"מכשיר Bluetooth ללא שם"</string>
     <string name="progress_scanning" msgid="192587958424295789">"מחפש"</string>
     <string name="progress_tap_to_pair" msgid="4192342336107106334">"הקש כדי להתאים"</string>
     <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"לא נמצאו מכשירי Bluetooth בקרבת מקום."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"בקשת התאמה של Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"בקשת התאמה"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"בחר כדי להתאים עם<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
-    <skip />
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"הצג קבצים שהתקבלו"</string>
     <string name="device_picker" msgid="8721012448931226323">"בוחר התקני Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"בקשת הרשאה של Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"יישום מבקש הרשאה להפעיל Bluetooth. האם ברצונך לעשות זאת?"</string>
@@ -405,26 +396,17 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"ניהול חיבורים, הגדרת שם התקן ויכולת גילוי"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"בקשת התאמה של Bluetooth"</string>
-    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
-    <skip />
-    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
-    <skip />
-    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
-    <skip />
-    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
-    <skip />
-    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
-    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"כדי להתאים עם:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;הזן את ה-PIN הנדרש של המכשיר:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"כדי להתאים עם:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;הזן את הסיסמה הנדרשת של המכשיר:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN מכיל אותיות או סמלים"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"בדרך כלל 0000 או 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"ייתכן שתידרש להזין PIN זה גם במכשיר השני."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"ייתכן שתידרש להזין סיסמה זו גם במכשיר השני."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"כדי להתאים עם:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ודא שהמכשיר מציג סיסמה זו:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"מאת:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;לבצע התאמה עם מכשיר זה?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"כדי להתאים ל:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;הקלד במכשיר:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, לאחר מכן הקש על Return או על Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"התאם"</string>
-    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"אל תתאם"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"ביטול"</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="6065697229258906937">"אירעה בעיה בהתאמה עם <xliff:g id="DEVICE_NAME">%1$s</xliff:g> כיוון שה-PIN או הסיסמה שגויים."</string>
@@ -490,8 +472,7 @@
     <skip />
     <!-- no translation found for zeroclick_off_summary (2896320184904157018) -->
     <skip />
-    <!-- no translation found for zeroclick_label (6908892664706309626) -->
-    <skip />
+    <string name="zeroclick_label" msgid="6908892664706309626">"שיתוף עם אפס לחיצות"</string>
     <!-- no translation found for zeroclick_explained (3953149564512166049) -->
     <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
@@ -573,24 +554,15 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"שער"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"אורך קידומת של רשת"</string>
-    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
-    <skip />
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi ישיר"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"הגדרת קישוריות עמית-לעמית"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"פרטי מכשיר"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"התקנה מוגנת של Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"הזן PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"זכור חיבור זה"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"חיפוש"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"צור קבוצה"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"מתקדם"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">" נקודה חמה ניידת של Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> פעיל של נקודה חמה ניידת"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"שגיאת נקודה חמה ניידת של Wi-Fi"</string>
@@ -603,8 +575,7 @@
     <string name="ringtone_title" msgid="5379026328015343686">"צלצול הטלפון"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <!-- outdated translation 8741571721868253103 -->     <string name="all_volume_title" msgid="4296957391257836961">"עוצמת קול"</string>
-    <!-- no translation found for musicfx_title (3853457094486073206) -->
-    <skip />
+    <string name="musicfx_title" msgid="3853457094486073206">"אפקטים מוסיקליים"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"עוצמת הקול של הצלצול"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"רטט במצב שקט"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"רטט"</string>
@@ -1054,10 +1025,8 @@
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"נכשל בהעברת היישום. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"מיקום התקנה מועדף"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"שנה את מיקום ההתקנה המועדף עבור יישומים חדשים."</string>
-    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
-    <skip />
-    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
-    <skip />
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"השבת יישום מובנה"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"השבתת יישום מובנה עלולה לגרום ליישומים אחרים לפעול באופן לא תקין. האם אתה בטוח?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"שימוש בשטח אחסון"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"הצג את שטח אחסון המשמש יישומים"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"שירותים פועלים"</string>
@@ -1556,9 +1525,8 @@
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"אזהרה"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"מגבלה"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"יישומים שהוסרו"</string>
-    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
-    <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> התקבלו, <xliff:g id="SENT">%2$s</xliff:g> נשלחו"</string>
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"שיחת חירום"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"חזור לשיחה"</string>
@@ -1601,41 +1569,26 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"להפוך את אישור ה-CA של המערכת לפעיל?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"להשבית את אישור ה-CA של המערכת?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"להסיר לצמיתות את אישור ה-CA של המשתמש?"</string>
-    <!-- no translation found for accessibility_tutorial_title (7577630829320003070) -->
-    <skip />
+    <string name="accessibility_tutorial_title" msgid="7577630829320003070">"מערך שיעור עבור \'דיבור בזמן נגיעה\'"</string>
     <string name="accessibility_tutorial_next" msgid="5079911515520801099">"הבא"</string>
     <string name="accessibility_tutorial_back" msgid="2583933084111712540">"הקודם"</string>
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"סיום"</string>
     <!-- no translation found for accessibility_tutorial_skip (3635250542851027317) -->
     <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_1 (2465037336858060269) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_4 (5374753806314829405) -->
-    <skip />
-    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
-    <skip />
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"שיעור 1: היכרות עם המסך"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="2465037336858060269">"לאחר שתפעיל את \'דיבור בזמן נגיעה\', תוכל לגעת במסך כדי לשמוע תיאור של מה שנמצא מתחת לאצבע שלך. לדוגמה, המסך הנוכחי מכיל סמלי יישומים. תוכל למצוא אחד מהם על ידי נגיעה במסך והחלקת האצבע שלך סביב."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"יפה מאוד, המשך להחליק את האצבע סביב עד שתמצא לפחות סמל אחד נוסף."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"כדי להפעיל משהו שאתה נוגע בו, הקש עליו. החלק את האצבע שלך עד שתמצא את הסמל עבור <xliff:g id="APP_NAME">%s</xliff:g>. לאחר מכן, הקש פעם אחת על הסמל כדי להפעיל אותו."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"האצבע שלך נוגעת בסמל של <xliff:g id="APP_NAME">%s</xliff:g>. הקש פעם אחת כדי להפעיל את הסמל."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"האצבע שלך עברה מעל הסמל של <xliff:g id="APP_NAME">%s</xliff:g> ולאחר מכן התרחקה. החלק את האצבע באיטיות סביב המסך עד שתמצא שוב את סמל הדפדפן."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"יפה מאוד. כדי לעבור לשיעור הבא, מצא והפעל את הלחצן <xliff:g id="NEXT">%s</xliff:g>, הממוקם קרוב לפינה השמאלית התחתונה של המסך."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"שיעור 2: גלילה בעזרת שתי אצבעות"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"כדי לגלול ברשימה, תוכל להחליק שתי אצבעות לאורך המסך. לדוגמה, המסך הנוכחי מכיל רשימה של שמות יישומים שניתן לגלול בהם כלפי מעלה או מטה. תחילה, נסה לזהות כמה מהפריטים ברשימה על ידי החלקת אצבע אחת סביב."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"יפה מאוד, המשך להחליק את האצבע שלך סביב כדי לגלות עוד פריט אחד לפחות."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"עכשיו, מקם שתי אצבעות על פריט ברשימה והחלק את שתי האצבעות כלפי מעלה. אם תגיע לראש המסך, הרם את אצבעותיך, מקם אותן במקום נמוך יותר ברשימה והמשך להחליק כלפי מעלה."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"יפה מאוד, המשך להחליק את אצבעותיך כלפי מעלה כדי לגלול הלאה."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="5374753806314829405">"השלמת את מערך השיעור. כדי לצאת ולחזור להגדרת \'דיבור בזמן נגיעה\', מצא את הלחצן <xliff:g id="FINISH">%s</xliff:g> והקש עליו."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"תיקון שגיאות איות"</string>
     <!-- no translation found for current_backup_pw_prompt (8314880813545036591) -->
     <skip />
     <!-- no translation found for new_backup_pw_prompt (3491404828757901644) -->
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index f64d1a2..3368ea2 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1519,7 +1519,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"に制限"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"削除したアプリケーション"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g>受信、<xliff:g id="SENT">%2$s</xliff:g>送信"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"緊急通報"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"通話に戻る"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 4258559..ecdaeeb 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1520,7 +1520,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"한도"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"삭제된 앱"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> 수신, <xliff:g id="SENT">%2$s</xliff:g> 전송"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"긴급 전화"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"통화로 돌아가기"</string>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 48d88e0..1b07de4 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -134,14 +134,18 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
-    <!-- no translation found for wifi_p2p_wps_setup:0 (5085064298144493867) -->
-    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
-    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
-    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
-    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
-    <!-- no translation found for wifi_p2p_status:2 (7455862395128183796) -->
-    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
-    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Mygtuko paspaudimas"</item>
+    <item msgid="8084424421884876981">"PIN kodas iš lygiaverčio įrenginio"</item>
+    <item msgid="9033470670389392191">"Šio įrenginio PIN kodas"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Prijungta"</item>
+    <item msgid="3189211552661432651">"Pakviestas"</item>
+    <item msgid="7455862395128183796">"Nepavyko"</item>
+    <item msgid="7785896708926971207">"Pasiekiama"</item>
+    <item msgid="829499112585677508">"Nepasiekiama"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="1106621950288502195">"2 minutės"</item>
     <item msgid="5780349442819375570">"5 minutės"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index d2c2233..f97298f 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -94,15 +94,12 @@
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Neveikiantis"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Randamas"</string>
-    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
-    <skip />
-    <!-- outdated translation 8573385118329733931 -->     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Randamas"</string>
-    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
-    <skip />
-    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
-    <skip />
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Matoma visiems netoliese esantiems „Bluetooth“ įrenginiams (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Matoma visiems netoliese esan. „Bluetooth“ įreng."</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nematoma kitiems „Bluetooth“ įrenginiams"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Matoma tik suporuotiems įrenginiams."</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Padaryti įrenginį atrandamą"</string>
-    <!-- outdated translation 6634508002347847278 -->     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Aptinkamumo skirtasis laikas"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Baigėsi skirtasis matymo laikas"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Nustatyti, kiek laiko įrenginys bus aptinkamas"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Užrakinti numerio rinkimą balsu"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Neleisti naudoti „Bluetooth“ numerio rinkiklio, kai ekranas užrakintas"</string>
@@ -110,16 +107,11 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Įrenginio pavadinimas"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Nenustatytas pavadinimas, naudojamas paskyros pavadinimas"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Nuskaityti ieškant įrenginių"</string>
-    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
-    <skip />
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Pervardyti planšetinį kompiuterį"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Pervardyti telefoną"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Pervardyti"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Atsijungti?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tai nutrauks ryšį su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> bus atjungtas."</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Prisijungta"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Atsijungęs (-usi)"</string>
@@ -129,15 +121,14 @@
     <string name="bluetooth_not_connected" msgid="3389882907500605937">"Susieti su šiuo įrenginiu"</string>
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Susiejama..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Susieta, bet nesujungta"</string>
-    <!-- outdated translation 6873461446424952003 -->     <string name="bluetooth_device" msgid="5291950341750186887">"laisvų rankų / ausinės"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"„Bluetooth“ įrenginys be pavadinimo"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Ieškoma"</string>
     <string name="progress_tap_to_pair" msgid="4192342336107106334">"Palieskite, kad suj."</string>
     <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Nerasta netol. esančių „Bluetooth“ įr."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"„Bluetooth“ susiejimo užklausa"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Susiejimo užklausa"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Pasirinkti susieti su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
-    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
-    <skip />
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Rodyti gautus failus"</string>
     <string name="device_picker" msgid="8721012448931226323">"„Bluetooth“ įrenginio išrinkimo priemonė"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"„Bluetooth“ leidimo užklausa"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Pateikta programos užklausa dėl leidimo įjungti „Bluetooth“. Ar norite tai atlikti?"</string>
@@ -404,26 +395,17 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Valdyti ryšius, nustatyti įrenginio pavadinimą ir atrandamumą"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"„Bluetooth“ susiejimo užklausa"</string>
-    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
-    <skip />
-    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
-    <skip />
-    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
-    <skip />
-    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
-    <skip />
-    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
-    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Jei norite suporuoti su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Įveskite reikiamą įrenginio PIN kodą:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Jei norite suporuoti su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Įveskite įrenginio prieigos raktą:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN kodą sudaro raidės arba simboliai"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Dažniausiai 0000 ar 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Galbūt reikės šį slaptažodį įvesti kitame įrenginyje."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Galbūt reikės šį prieigos raktą įvesti  kitame įrenginyje."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Jei norite suporuoti su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Įsitikinkite, kad jame rodomas šis prieigos raktas:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Iš:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Poruoti su šiuo įrenginiu?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Jei norite suporuoti su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Jame įveskite:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; ir paspauskite „Grįžti“ arba „Įvesti“."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Susieti"</string>
-    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Nesusieti"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Atšaukti"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Dėmesio"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Iškilo problema susiejant su <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Susiejant su <xliff:g id="DEVICE_NAME">%1$s</xliff:g> iškilo problema, nes PIN kodas ar prieigos raktas neteisingas."</string>
@@ -489,8 +471,7 @@
     <skip />
     <!-- no translation found for zeroclick_off_summary (2896320184904157018) -->
     <skip />
-    <!-- no translation found for zeroclick_label (6908892664706309626) -->
-    <skip />
+    <string name="zeroclick_label" msgid="6908892664706309626">"Bendrinimas be paspaudimo"</string>
     <!-- no translation found for zeroclick_explained (3953149564512166049) -->
     <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
@@ -572,24 +553,15 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Tinklų sietuvas"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Tinklo kodo ilgis"</string>
-    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
-    <skip />
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Tiesioginis „Wi-Fi“ ryšys"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Nustatyti ryšį tarp lygiaverčių įrenginių"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Įrenginio informacija"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Apsaugota „Wi-Fi“ sąranka"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Įveskite PIN kodą"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Atsiminti šį ryšį"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Ieškoti"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Kurti grupę"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Išplėstinės"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Perkeliama „Wi-Fi“ aktyvioji sritis"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Perkeliama aktyvioji sritis <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktyvi"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Perkeliamos „Wi-Fi“ aktyviosios srities klaida"</string>
@@ -602,8 +574,7 @@
     <string name="ringtone_title" msgid="5379026328015343686">"Telefono skambėjimo tonas"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <!-- outdated translation 8741571721868253103 -->     <string name="all_volume_title" msgid="4296957391257836961">"Garsumas"</string>
-    <!-- no translation found for musicfx_title (3853457094486073206) -->
-    <skip />
+    <string name="musicfx_title" msgid="3853457094486073206">"Muzikos efektai"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Skambučio garsumas"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibruoti, kai veikia tyliuoju režimu"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibruoti"</string>
@@ -1052,10 +1023,8 @@
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Nepavyko perkelti programos: <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Pageidaujama diegimo vieta"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Pakeisti pageidaujamą naujų programų diegimo vietą."</string>
-    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
-    <skip />
-    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
-    <skip />
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Neleisti įdiegtos programos"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Jei neleisite įdiegtos programos, kitos programos gali neveikti. Ar tikrai norite tai padaryti?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Atmintinės naudojimas"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Žiūrėti programų naudojamą atmintinę"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Vykdomos paslaugos"</string>
@@ -1550,9 +1519,8 @@
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"įspėjimas"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"apribojimas"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Pašalintos programos"</string>
-    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
-    <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"Gauta: <xliff:g id="RECEIVED">%1$s</xliff:g>, išsiųsta: <xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Skambutis pagalbos numeriu"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Grįžti prie skambučio"</string>
@@ -1594,40 +1562,25 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Įgalinti sistemos CA sertifikatą?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Neleisti sistemos CA sertifikato?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Visam laikui pašalinti naudotojo CA sertifikatą?"</string>
-    <!-- no translation found for accessibility_tutorial_title (7577630829320003070) -->
-    <skip />
+    <string name="accessibility_tutorial_title" msgid="7577630829320003070">"„Talk As I Touch“ mokymo programa"</string>
     <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Kitas"</string>
     <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Atgal"</string>
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Užbaigti"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Pral. mok. pr."</string>
-    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_1 (2465037336858060269) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_4 (5374753806314829405) -->
-    <skip />
-    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
-    <skip />
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"1 pamoka: ekrano tyrinėjimas"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="2465037336858060269">"Įjungę „Talk As I Touch“, galėsite paliesti ekraną, kad girdėtumėte elemento, ant kurio yra jūsų pirštas, aprašą. Pavyzdžiui, dabartiniame ekrane yra programos piktogramų. Raskite vieną jų liesdami ekraną ir slinkdami pirštą."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Gerai. Palieskite pirštu ekraną ir slinkite juo, kad surastumėte bent dar vieną piktogramą."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Jei norite suaktyvinti kažką, palieskite tai. Slinkite pirštą, kol rasite piktogramą <xliff:g id="APP_NAME">%s</xliff:g>. Paskui vieną kartą palieskite piktogramą, kad ją suaktyvintumėte."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Pirštu lieskite piktogramą <xliff:g id="APP_NAME">%s</xliff:g>. Palieskite vieną kartą, kad suaktyvintumėte piktogramą."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Judinote pirštą virš piktogramos <xliff:g id="APP_NAME">%s</xliff:g>, o paskui jį patraukėte. Lėtai slinkite pirštą ekrane, kol vėl rasite naršyklės piktogramą."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Gerai. Jei norite pereiti prie kitos pamokos, raskite mygtuką <xliff:g id="NEXT">%s</xliff:g>, kuris yra apatiniame dešiniajame ekrano kampe, ir jį suaktyvinkite."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"2 pamoka: slinkimas naudojant du pirštus"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Jei norite slinkti sąrašu, galite du pirštus slinkti ekranu. Pavyzdžiui, dabartiniame ekrane yra programų, kuriomis galima slinkti į viršų ir į apačią, sąrašas. Pirmiausia raskite kelis elementus sąraše slinkdami vieną pirštą."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Gerai. Toliau slinkite pirštą, kad surastumėte bent dar vieną elementą."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Dabar ant sąrašo elemento uždėkite du pirštus ir slinkite pirštus aukštyn. Jei pasieksite ekrano viršų, pakelkite pirštus, padėkite juos žemiau sąraše ir toliau slinkite aukštyn."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Gerai. Toliau slinkite pirštus aukštyn, kad dar paslinktumėte."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="5374753806314829405">"Užbaigėte mokymo programą. Jei norite išeiti ir grįžti į „Talk As I Touch“ nustatymą, raskite mygtuką <xliff:g id="FINISH">%s</xliff:g> ir jį palieskite."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Rašybos klaidų taisymas"</string>
     <!-- no translation found for current_backup_pw_prompt (8314880813545036591) -->
     <skip />
     <!-- no translation found for new_backup_pw_prompt (3491404828757901644) -->
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 0896b86..11178aa 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1520,7 +1520,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ierobežojums"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Noņemtās lietotnes"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"Saņemts: <xliff:g id="RECEIVED">%1$s</xliff:g>; nosūtīts: <xliff:g id="SENT">%2$s</xliff:g>"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Ārkārtas zvans"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Atgriezties pie zvana"</string>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index b8de22d..80c0e1f 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -68,13 +68,15 @@
     <item msgid="490158884605093126">"Sangat Besar"</item>
     <item msgid="2123802548987439763">"Terlalu Besar"</item>
   </string-array>
-    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
-    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
-    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
-    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
-    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
-    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
-    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
+  <string-array name="entryvalues_font_size">
+    <item msgid="8122189478379706788">"0.70"</item>
+    <item msgid="186029675505810577">"0.85"</item>
+    <item msgid="5864822191921585498">"0.95"</item>
+    <item msgid="5580820036923893743">"1.0"</item>
+    <item msgid="5106590751949630532">"1.05"</item>
+    <item msgid="1803159594904488544">"1.15"</item>
+    <item msgid="7410681469566563300">"1.30"</item>
+  </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Sangat perlahan"</item>
     <item msgid="2361722960903353554">"Perlahan"</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 3ce1282..d9b16f5 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -148,8 +148,7 @@
     <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Sentuh untuk menyambung kepada \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Adakah anda mahu menyambung kepada \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Permintaan buku telefon"</string>
-    <!-- no translation found for bluetooth_pb_acceptance_dialog_text (5203107624986011263) -->
-    <skip />
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s mahu mengakses kenalan dan sejarah panggilan anda. Beri akses kepada %2$s?"</string>
     <string name="bluetooth_pb_alwaysallowed" msgid="3953839482721299910">"Sentiasa benarkan?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Tetapan tarikh &amp; masa"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 tengah hari"</string>
@@ -956,13 +955,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Henti paksa"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Jumlah"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Aplikasi"</string>
-    <!-- no translation found for external_code_size_label (3459343140355961335) -->
-    <skip />
+    <string name="external_code_size_label" msgid="3459343140355961335">"Apl storan USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Data"</string>
-    <!-- no translation found for external_data_size_label (7533821466482000453) -->
-    <skip />
-    <!-- no translation found for external_data_size_label (626414192825329708) -->
-    <skip />
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Data storan USB"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"Kad SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Nyahpasang"</string>
     <string name="disable_text" msgid="6544054052049395202">"Lumpuhkan"</string>
     <string name="enable_text" msgid="9217362512327828987">"Dayakan"</string>
@@ -1487,7 +1483,7 @@
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Penggunaan data"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Kitaran penggunaan data"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Perayauan data"</string>
-    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Sekat data latar belakang"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Hadkan data latar belakang"</string>
     <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Asingkan penggunaan 4G"</string>
     <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Tunjukkan penggunaan Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Tunjukkan penggunaan Ethernet"</string>
@@ -1524,7 +1520,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"had"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Apl dialih keluar"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> diterima, <xliff:g id="SENT">%2$s</xliff:g> dihantar"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Panggilan kecemasan"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Kembali ke panggilan"</string>
@@ -1547,8 +1543,7 @@
     <string name="vpn_username" msgid="1863901629860867849">"Nama pengguna"</string>
     <string name="vpn_password" msgid="6756043647233596772">"Kata laluan"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"Simpan maklumat akaun"</string>
-    <!-- no translation found for vpn_not_used (9094191054524660891) -->
-    <skip />
+    <string name="vpn_not_used" msgid="9094191054524660891">"(tidak digunakan)"</string>
     <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(jangan sahkan pelayan)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Batal"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Simpan"</string>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 648aba4..d365fd9 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -68,13 +68,15 @@
     <item msgid="490158884605093126">"Ekstra stor"</item>
     <item msgid="2123802548987439763">"Ekstremt stor"</item>
   </string-array>
-    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
-    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
-    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
-    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
-    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
-    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
-    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
+  <string-array name="entryvalues_font_size">
+    <item msgid="8122189478379706788">"0,70"</item>
+    <item msgid="186029675505810577">"0,85"</item>
+    <item msgid="5864822191921585498">"0,95"</item>
+    <item msgid="5580820036923893743">"1,0"</item>
+    <item msgid="5106590751949630532">"1,05"</item>
+    <item msgid="1803159594904488544">"1,15"</item>
+    <item msgid="7410681469566563300">"1,30"</item>
+  </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Svært langsom"</item>
     <item msgid="2361722960903353554">"Langsom"</item>
@@ -213,9 +215,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP eller CHAP"</item>
   </string-array>
-    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
-    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
-    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
+  <string-array name="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Intern lagringsenhet"</item>
     <item msgid="3738430123799803530">"Flyttbart minnekort"</item>
@@ -261,7 +265,7 @@
     <item msgid="6660750935954853365">"Animasjonsskala 10 x"</item>
   </string-array>
   <string-array name="app_process_limit_entries">
-    <item msgid="3401625457385943795">"Standardgrense"</item>
+    <item msgid="3401625457385943795">"Standard grense"</item>
     <item msgid="4071574792028999443">"Ingen bakgrunnsprosesser"</item>
     <item msgid="4810006996171705398">"Maksimalt én prosess"</item>
     <item msgid="8586370216857360863">"Maksimalt to prosesser"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 1c19566..468e445 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -148,8 +148,7 @@
     <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Trykk for å koble til «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>»"</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Ønsker du å koble til «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>»?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Forespørsel for telefonbok"</string>
-    <!-- no translation found for bluetooth_pb_acceptance_dialog_text (5203107624986011263) -->
-    <skip />
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s ber om å få tilgang til kontaktene og ringeloggen. Vil du gi %2$s tilgang?"</string>
     <string name="bluetooth_pb_alwaysallowed" msgid="3953839482721299910">"Alltid tillatt?"</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 ettermiddag"</string>
@@ -1475,7 +1474,7 @@
     <string name="debug_applications_category" msgid="6221644998451283813">"Applikasjoner"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ikke behold aktiviteter"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Fjern hver aktivitet så fort brukeren forlater den"</string>
-    <string name="app_process_limit_title" msgid="4280600650253107163">"Grense for bakgr.prosess"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Bakgrunnsprosessgrense"</string>
     <!-- no translation found for show_all_anrs (28462979638729082) -->
     <skip />
     <!-- no translation found for show_all_anrs_summary (92558681104207054) -->
@@ -1520,7 +1519,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"grense"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Fjernede apper"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> mottatt, <xliff:g id="SENT">%2$s</xliff:g> sendt"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Nødanrop"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tilbake til anrop"</string>
@@ -1543,8 +1542,7 @@
     <string name="vpn_username" msgid="1863901629860867849">"Brukernavn"</string>
     <string name="vpn_password" msgid="6756043647233596772">"Passord"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"Lagre kontoinformasjon"</string>
-    <!-- no translation found for vpn_not_used (9094191054524660891) -->
-    <skip />
+    <string name="vpn_not_used" msgid="9094191054524660891">"(ikke brukt)"</string>
     <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(ikke bekreft tjener)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Avbryt"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Lagre"</string>
@@ -1567,7 +1565,7 @@
     <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Neste"</string>
     <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Tilbake"</string>
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Fullfør"</string>
-    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Hopp over"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Stopp veiled."</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Leksjon 1: Utforsking av skjermen"</string>
     <string name="accessibility_tutorial_lesson_1_text_1" msgid="2465037336858060269">"Når du slår på funksjonen for å uttale ved berøring, kan du berøre skjermen for å høre en beskrivelse av det fingeren din berører. For eksempel inneholder den gjeldende skjermen applikasjonsikoner. Finn ett av dem ved å berøre skjermen og skyve fingeren rundt."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Bra. Fortsett å skyve fingeren rundt på skjermen til du finner minst ett ikon til."</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f10fb50..e0a3af0 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1519,7 +1519,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limiet"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Verwijderde apps"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> ontvangen, <xliff:g id="SENT">%2$s</xliff:g> verzonden"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Noodoproep"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Terug naar gesprek"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 9fd7455..02d2fb9 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1519,7 +1519,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limit"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Usunięte aplikacje"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"Odebrano: <xliff:g id="RECEIVED">%1$s</xliff:g>, wysłano: <xliff:g id="SENT">%2$s</xliff:g>"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Połączenie alarmowe"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Powrót do połączenia"</string>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 4449ff2..118f417 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -134,14 +134,18 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
-    <!-- no translation found for wifi_p2p_wps_setup:0 (5085064298144493867) -->
-    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
-    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
-    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
-    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
-    <!-- no translation found for wifi_p2p_status:2 (7455862395128183796) -->
-    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
-    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Prima o botão"</item>
+    <item msgid="8084424421884876981">"Pin do aparelho de mesmo nível"</item>
+    <item msgid="9033470670389392191">"PIN deste aparelho"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Ligado"</item>
+    <item msgid="3189211552661432651">"Convidado"</item>
+    <item msgid="7455862395128183796">"Falhou"</item>
+    <item msgid="7785896708926971207">"Disponível"</item>
+    <item msgid="829499112585677508">"Fora de alcance"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="1106621950288502195">"2 minutos"</item>
     <item msgid="5780349442819375570">"5 minutos"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9d4cc1d..9b8dcbc 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -94,15 +94,12 @@
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Frio"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Detectável"</string>
-    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
-    <skip />
-    <!-- outdated translation 8573385118329733931 -->     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Detectável"</string>
-    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
-    <skip />
-    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
-    <skip />
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visível p/ tds aparelhos Bluetooth próximos (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visível para todos os aparelhos Bluetooth nas proximidades"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Não visível a outros aparelhos Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Visível apenas para aparelhos sincronizados"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Tornar o dispositivo detectável"</string>
-    <!-- outdated translation 6634508002347847278 -->     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tempo limite em que é detectável"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tempo limite de visibilidade"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Definir durante quanto tempo ficará o dispositivo detectável"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear marcação por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Evitar a utilização do telefone Bluetooth quando o ecrã está bloqueado"</string>
@@ -110,16 +107,11 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nome do dispositivo"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Nenhum nome definido. A utilizar o nome da conta"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Procurar dispositivos"</string>
-    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
-    <skip />
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Mudar o nome do tablet"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Mudar o nome do telefone"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Mudar o nome"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Desligar?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Isto terminará a sua ligação com: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"O <xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado."</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Ligado"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desligado"</string>
@@ -129,15 +121,14 @@
     <string name="bluetooth_not_connected" msgid="3389882907500605937">"Emparelhar com este dispositivo"</string>
     <string name="bluetooth_pairing" msgid="1426882272690346242">"A emparelhar..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Emparelhado mas não ligado"</string>
-    <!-- outdated translation 6873461446424952003 -->     <string name="bluetooth_device" msgid="5291950341750186887">"mãos-livres/auricular"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Aparelho Bluetooth sem nome"</string>
     <string name="progress_scanning" msgid="192587958424295789">"A pesquisar"</string>
     <string name="progress_tap_to_pair" msgid="4192342336107106334">"Toque para sincronizar"</string>
     <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Nenhum aparelho Bluetooth nas proximid."</string>
     <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="618099089987569242">"Seleccionar emparelhamento com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
-    <skip />
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar ficheiros recebidos"</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="8211158472876087588">"Uma aplicação está a pedir autorização para activar o Bluetooth. Pretende fazê-lo?"</string>
@@ -404,26 +395,17 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Gerir ligações, definir nome e detectabilidade do dispositivo"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Pedido de emparelhamento de Bluetooth"</string>
-    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
-    <skip />
-    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
-    <skip />
-    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
-    <skip />
-    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
-    <skip />
-    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
-    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Para sincronizar com: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Introduza o PIN exigido do aparelho:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Para sincronizar com: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Introduza a chave de acesso exigida do aparelho:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"O PIN contém letras ou símbolos"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Geralmente 0000 ou 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Pode também ter de introduzir este PIN no outro aparelho."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Pode também ter de introduzir esta chave de acesso no outro aparelho."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Para sincronizar com: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Verifique se apresenta esta chave de acesso: &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"De: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; Sincronizar com este aparelho?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Para sincronizar com: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; Introduza no mesmo: &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; e em seguida prima Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Par"</string>
-    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Não emparelhar"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancelar"</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="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>
@@ -489,8 +471,7 @@
     <skip />
     <!-- no translation found for zeroclick_off_summary (2896320184904157018) -->
     <skip />
-    <!-- no translation found for zeroclick_label (6908892664706309626) -->
-    <skip />
+    <string name="zeroclick_label" msgid="6908892664706309626">"Partilha de zero cliques"</string>
     <!-- no translation found for zeroclick_explained (3953149564512166049) -->
     <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
@@ -572,24 +553,15 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Compr. do prefixo de rede"</string>
-    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
-    <skip />
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Configuração da conetividade ponto a ponto"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Informações do Aparelho"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Configuração Wi-Fi protegida"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Introduzir PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Memorizar esta ligação"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Pesquisar"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Criar grupo"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avançadas"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portátil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activo"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Erro do hotspot Wi-Fi portátil"</string>
@@ -602,8 +574,7 @@
     <string name="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <!-- outdated translation 8741571721868253103 -->     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
-    <!-- no translation found for musicfx_title (3853457094486073206) -->
-    <skip />
+    <string name="musicfx_title" msgid="3853457094486073206">"Efeitos Musicais"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume da campainha"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar quando estiver em silêncio"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibrar"</string>
@@ -1051,10 +1022,8 @@
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Falha ao mover a aplicação. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Localização de instalação preferida"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Alterar a localização de instalação preferida para novas aplicações."</string>
-    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
-    <skip />
-    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
-    <skip />
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Desativar aplicação incorporada"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Desativar uma aplicação incorporada pode levar outras aplicações a funcionar incorretamente. Tem a certeza?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilização do armazenam."</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Ver o armazenamento utilizado pelas aplicações"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Serviços em execução"</string>
@@ -1549,9 +1518,8 @@
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"aviso"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limite"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicações removidas"</string>
-    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
-    <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> recebidos, <xliff:g id="SENT">%2$s</xliff:g> enviados"</string>
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de emergência"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Regressar à chamada"</string>
@@ -1593,40 +1561,25 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Ativar o certificado da AC do sistema?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Desativar o certificado da AC do sistema?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Remover permanentemente o certificado de utilizador da AC?"</string>
-    <!-- no translation found for accessibility_tutorial_title (7577630829320003070) -->
-    <skip />
+    <string name="accessibility_tutorial_title" msgid="7577630829320003070">"Tutorial Falar Enquanto Toco"</string>
     <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Seguinte"</string>
     <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Anterior"</string>
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Concluir"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Ign. tutorial"</string>
-    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_1 (2465037336858060269) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_4 (5374753806314829405) -->
-    <skip />
-    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
-    <skip />
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lição 1: Explorar o ecrã"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="2465037336858060269">"Depois de ativar Falar Enquanto Toco, poderá tocar no ecrã para ouvir uma descrição do que está sob o dedo. Por exemplo, o ecrã atual contém ícones de aplicações. Localize uma delas tocando no ecrã e deslizando o dedo a toda a volta."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Bom. Continue a deslizar o dedo pelo ecrã até localizar pelo menos mais um ícone."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Para ativar algo em que está a tocar, toque nisso. Deslize o dedo até localizar o ícone do <xliff:g id="APP_NAME">%s</xliff:g>. Toque depois uma vez no ícone para o ativar."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"O seu dedo está a tocar no ícone <xliff:g id="APP_NAME">%s</xliff:g>. Toque uma vez para ativar o ícone."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"O seu dedo moveu-se sobre o ícone <xliff:g id="APP_NAME">%s</xliff:g> e depois afastou-se. Lentamente, deslize o dedo em torno do ecrã até encontrar novamente o ícone do Navegador."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Bom. Para passar à próxima lição, localize e ative o botão <xliff:g id="NEXT">%s</xliff:g>, situado junto ao canto inferior direito do ecrã."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lição 2: Percorrer com dois dedos"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Para percorrer uma lista, pode deslizar dois dedos ao longo do ecrã. Por exemplo, o ecrã atual contém uma lista de nomes de aplicações que pode percorrer para cima ou para baixo. Primeiro, tente identificar alguns itens na lista deslizando um dedo por ali."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Ótimo. Continue a deslizar o dedo para encontrar pelo menos mais um item."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Agora, coloque dois dedos sobre um item da lista e deslize os dedos para cima. Se chegar ao topo do ecrã, levante os dedos, coloque-os mais abaixo na lista e continue a deslizar para cima."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Ótimo. Continue a deslizar os dedos para percorrer mais itens."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="5374753806314829405">"Concluiu o tutorial. Para sair e regressar à definição Falar Enquanto Toco, localize e toque no botão <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Correção ortográfica"</string>
     <!-- no translation found for current_backup_pw_prompt (8314880813545036591) -->
     <skip />
     <!-- no translation found for new_backup_pw_prompt (3491404828757901644) -->
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 3d279f5a..e96a525 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1519,7 +1519,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limite"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicativos removidos"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> recebido, <xliff:g id="SENT">%2$s</xliff:g> enviado"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de emergência"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Retornar à chamada"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index f12547c..8b174c8 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -1906,7 +1906,7 @@
     <skip />
     <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
     <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <!-- no translation found for cryptkeeper_emergency_call (198578731586097145) -->
     <skip />
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 50b4f7a..8d4543d 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -134,14 +134,18 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
-    <!-- no translation found for wifi_p2p_wps_setup:0 (5085064298144493867) -->
-    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
-    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
-    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
-    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
-    <!-- no translation found for wifi_p2p_status:2 (7455862395128183796) -->
-    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
-    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Buton WPS"</item>
+    <item msgid="8084424421884876981">"Codul PIN de la disp. pereche"</item>
+    <item msgid="9033470670389392191">"PIN de la ac. disp."</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Conectat"</item>
+    <item msgid="3189211552661432651">"Invitat(ă)"</item>
+    <item msgid="7455862395128183796">"Eroare"</item>
+    <item msgid="7785896708926971207">"Disponibilă"</item>
+    <item msgid="829499112585677508">"Fără acoperire"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="1106621950288502195">"2 minute"</item>
     <item msgid="5780349442819375570">"5 minute"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 573072c..2e95727 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -94,15 +94,12 @@
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Golită"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Detectabil"</string>
-    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
-    <skip />
-    <!-- outdated translation 8573385118329733931 -->     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Detectabil"</string>
-    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
-    <skip />
-    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
-    <skip />
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Vizibil pt. dispoz. Bluetooth din aprop. (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Vizibil pt. toate disp. Bluetooth din apropiere"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nu este vizibil pentru alte dispozitive Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Vizibil numai pe dispozitivele asociate"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Setaţi dispozitivul ca detectabil"</string>
-    <!-- outdated translation 6634508002347847278 -->     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timp limită pentru detectare"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timp limită pentru vizibilitate"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Setaţi cât timp va fi detectabil dispozitivul"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Blocaţi apelarea vocală"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Împiedicaţi apelarea prin Bluetooth când este blocat ecranul"</string>
@@ -110,16 +107,11 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nume dispozitiv"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Nu s-a setat niciun nume, se utilizează numele contului"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Scanaţi pentru a detecta dispozitive"</string>
-    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
-    <skip />
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Redenumiţi tableta"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Redenumiţi telefonul"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Redenumiţi"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Deconectaţi?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Astfel se va încheia conexiunea cu:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat."</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Conectat"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Deconectat"</string>
@@ -129,15 +121,14 @@
     <string name="bluetooth_not_connected" msgid="3389882907500605937">"Asociaţi cu acest dispozitiv"</string>
     <string name="bluetooth_pairing" msgid="1426882272690346242">"În curs de împerechere..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Asociat, dar neconectat"</string>
-    <!-- outdated translation 6873461446424952003 -->     <string name="bluetooth_device" msgid="5291950341750186887">"handsfree/cască"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Dispozitiv Bluetooth nedenumit"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Se caută dispozitive"</string>
     <string name="progress_tap_to_pair" msgid="4192342336107106334">"Apăsaţi pt. asociere"</string>
     <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Nu există disp. Bluetooth în apropiere."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Solicitare de împerechere prin Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitare de împerechere"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Selectaţi împerecherea cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
-    <skip />
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Afişaţi fişierele primite"</string>
     <string name="device_picker" msgid="8721012448931226323">"Selector de dispozitive Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitare de permisiune Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"O aplicaţie solicită permisiunea de a activa Bluetooth. Acordaţi permisiunea?"</string>
@@ -404,26 +395,17 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Gestionaţi conexiunile, setaţi numele dispozitivului şi detectabilitatea acestuia"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Solicitare de împerechere prin Bluetooth"</string>
-    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
-    <skip />
-    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
-    <skip />
-    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
-    <skip />
-    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
-    <skip />
-    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
-    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Pentru asocierea cu:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Introduceţi codul PIN al dispozitivului necesar:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Pentru asocierea cu:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Introduceţi cheia de acces necesară a dispozitivului:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"Codul PIN conţine litere sau simboluri"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"În mod obişnuit 0000 sau 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Ar putea fi necesar, de asemenea, să introduceţi acest cod PIN pe celălalt dispozitiv."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Ar putea fi necesar, de asemenea, să introduceţi această parolă pe celălalt dispozitiv."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Pentru asocierea cu:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Asiguraţi-vă că se afişează această cheie de acces:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"De la:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Asociaţi cu acest dispozitiv?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Pentru asocierea cu:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Introduceţi pe acesta:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, apoi apăsaţi tasta Return sau Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Asociaţi"</string>
-    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Nu asociaţi"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Anulaţi"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Atenţie"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"A apărut o problemă la împerecherea cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"A apărut o problemă la împerecherea cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> deoarece codul PIN sau cheia de acces este incorectă."</string>
@@ -489,8 +471,7 @@
     <skip />
     <!-- no translation found for zeroclick_off_summary (2896320184904157018) -->
     <skip />
-    <!-- no translation found for zeroclick_label (6908892664706309626) -->
-    <skip />
+    <string name="zeroclick_label" msgid="6908892664706309626">"Distribuire fără clic"</string>
     <!-- no translation found for zeroclick_explained (3953149564512166049) -->
     <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
@@ -572,24 +553,15 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Lungime prefix reţea"</string>
-    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
-    <skip />
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Configuraţi conectivitatea peer-to-peer"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Informaţii despre dispozitiv"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Configurare protejată Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Introduceţi codul PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Reţineţi această conexiune"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Căutaţi"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Creaţi un grup"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avansate"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portabil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot portabil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activ"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Eroare de hotspot Wi-Fi portabil"</string>
@@ -602,8 +574,7 @@
     <string name="ringtone_title" msgid="5379026328015343686">"Ton de apel al telefonului"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <!-- outdated translation 8741571721868253103 -->     <string name="all_volume_title" msgid="4296957391257836961">"Volum"</string>
-    <!-- no translation found for musicfx_title (3853457094486073206) -->
-    <skip />
+    <string name="musicfx_title" msgid="3853457094486073206">"Efecte muzicale"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volum sonerie"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrează la profilul Silenţios"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibrare"</string>
@@ -1052,10 +1023,8 @@
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Mutarea aplicaţiei nu a reuşit. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Locaţie preferată de instalare"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Schimbaţi locaţia preferată de instalare pentru noile aplicaţii."</string>
-    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
-    <skip />
-    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
-    <skip />
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Dezactivaţi aplic. încorporată"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Dezactivarea unei aplicaţii încorporate poate provoca funcţionarea incorectă a altor aplicaţii. Sunteţi sigur(ă)?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilizare stocare"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Afişaţi spaţiul de stocare utilizat de aplicaţii"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicii în curs de funcţionare"</string>
@@ -1550,9 +1519,8 @@
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"avertisment"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limită"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicaţii eliminate"</string>
-    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
-    <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> primiţi, <xliff:g id="SENT">%2$s</xliff:g> trimişi"</string>
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Apel de urgenţă"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Reveniţi la apel"</string>
@@ -1594,40 +1562,25 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Activaţi certificatul CA de sistem?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Dezactivaţi certificatul CA de sistem?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Eliminaţi definitiv certificatul de utilizator CA?"</string>
-    <!-- no translation found for accessibility_tutorial_title (7577630829320003070) -->
-    <skip />
+    <string name="accessibility_tutorial_title" msgid="7577630829320003070">"Prog. de instr. pt. Vorb. după atingere"</string>
     <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Înainte"</string>
     <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Înapoi"</string>
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Finalizaţi"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Ign. inst."</string>
-    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_1 (2465037336858060269) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_4 (5374753806314829405) -->
-    <skip />
-    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
-    <skip />
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lecţia 1: explorarea ecranului"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="2465037336858060269">"După ce activaţi funcţia Vorbiţi după atingere, puteţi să atingeţi ecranul pentru a auzi o descriere a ceea ce se află sub degetul dvs. De exemplu, ecranul curent conţine pictograme de aplicaţii. Găsiţi una dintre acestea atingând ecranul şi glisând degetul pe listă."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Perfect. Continuaţi să glisaţi uşor degetul pe ecran până când veţi găsi cel puţin încă o pictogramă."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Pentru a activa o aplicaţie, apăsaţi pe pictograma corespunzătoare. Glisaţi degetul până când găsiţi pictograma pentru <xliff:g id="APP_NAME">%s</xliff:g>. Apoi, apăsaţi pictograma o dată pentru a activa aplicaţia."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Degetul atinge pictograma <xliff:g id="APP_NAME">%s</xliff:g>. Apăsaţi o dată pentru a activa pictograma."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Aţi pus degetul pe pictograma <xliff:g id="APP_NAME">%s</xliff:g>, apoi l-aţi îndepărtat. Glisaţi degetul încet pe ecran până când găsiţi din nou pictograma Browser."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Perfect. Pentru a trece la lecţia următoare, găsiţi şi activaţi butonul <xliff:g id="NEXT">%s</xliff:g>, situat în colţul din dreapta jos al ecranului."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lecţia 2: derularea utilizând două degete"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Pentru a parcurge o listă, puteţi să glisaţi două degete de-a lungul ecranului. De exemplu, ecranul curent conţine o listă cu nume de aplicaţii care se poate derula în sus sau în jos. Mai întâi, încercaţi să identificaţi câteva elemente din listă glisând cu degetul pe ecran."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Perfect. Glisaţi în continuare degetul pe listă pentru a găsi cel puţin încă un element."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Acum plasaţi două degete pe un element din listă şi glisaţi degetele în sus. Dacă ajungeţi în partea superioară a ecranului, ridicaţi degetele, puneţi-le mai jos pe listă şi continuaţi să le glisaţi în sus."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Perfect. Glisaţi degetele în sus, pentru a derula lista ceva mai mult."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="5374753806314829405">"Aţi terminat programul de instruire. Pentru a ieşi şi a reveni la setarea Vorbiţi după atingere, găsiţi şi apăsaţi butonul <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Ortografiere"</string>
     <!-- no translation found for current_backup_pw_prompt (8314880813545036591) -->
     <skip />
     <!-- no translation found for new_backup_pw_prompt (3491404828757901644) -->
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 17b92c7..121048a 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -134,14 +134,18 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
-    <!-- no translation found for wifi_p2p_wps_setup:0 (5085064298144493867) -->
-    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
-    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
-    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
-    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
-    <!-- no translation found for wifi_p2p_status:2 (7455862395128183796) -->
-    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
-    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Push-кнопка"</item>
+    <item msgid="8084424421884876981">"PIN-код устройства"</item>
+    <item msgid="9033470670389392191">"PIN-код устройства"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Подключено"</item>
+    <item msgid="3189211552661432651">"Приглашено"</item>
+    <item msgid="7455862395128183796">"Сбой"</item>
+    <item msgid="7785896708926971207">"Доступно"</item>
+    <item msgid="829499112585677508">"Вне допустимого диапазона"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="1106621950288502195">"2 минуты"</item>
     <item msgid="5780349442819375570">"5 минут"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 7cdf766..02b96f9 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -94,15 +94,12 @@
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Холодная"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Видимость"</string>
-    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
-    <skip />
-    <!-- outdated translation 8573385118329733931 -->     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Видимый"</string>
-    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
-    <skip />
-    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
-    <skip />
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Время отображения для устройств Bluetooth: <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Отображать для ближайших устройств Bluetooth"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Не отображать для других Bluetooth-устройств"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Отображать только для сопряженных устройств"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Сделать устройство видимым"</string>
-    <!-- outdated translation 6634508002347847278 -->     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Тайм-аут видимости"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Период доступности"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Укажите, в течение какого времени устройство будет видимым"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Заблокировать голосовой набор"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Предотвратить использование телефона Bluetooth, когда экран заблокирован"</string>
@@ -110,16 +107,11 @@
     <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>
-    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
-    <skip />
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Переименовать планшетный ПК"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Переименовать телефон"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Переименовать"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Разъединить?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Произойдет разъединение с&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</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>
@@ -129,15 +121,14 @@
     <string name="bluetooth_not_connected" msgid="3389882907500605937">"Подключиться к этому устройству"</string>
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Сопряжение..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Сопряжено, но не подключено"</string>
-    <!-- outdated translation 6873461446424952003 -->     <string name="bluetooth_device" msgid="5291950341750186887">"гарнитура/наушники"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Bluetooth-устройство без названия"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Поиск"</string>
     <string name="progress_tap_to_pair" msgid="4192342336107106334">"Нажмите для сопряж."</string>
     <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Устройства Bluetooth не найдены."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Запрос сопряжения Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Запрос на сопряжение"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Выберите для сопряжения с <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
-    <skip />
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Показать полученные файлы"</string>
     <string name="device_picker" msgid="8721012448931226323">"Выбор устройства Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Запрос разрешения на включение Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Приложение на вашем планшетном ПК запрашивает разрешение на включение Bluetooth. Разрешить?"</string>
@@ -404,26 +395,17 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Настройка подключений, видимости и имени устройства"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Запрос сопряжения Bluetooth"</string>
-    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
-    <skip />
-    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
-    <skip />
-    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
-    <skip />
-    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
-    <skip />
-    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
-    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Чтобы выполнить сопряжение с&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;, введите PIN-код устройства"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Чтобы выполнить сопряжение с&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;, введите код доступа устройства"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN-код из букв или символов"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Это может быть 0000 или 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Может потребоваться ввести PIN-код на другом устройстве."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Может потребоваться ввести ключ доступа на другом устройстве."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Для сопряжения с&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;подтвердите, что отображается ключ доступа&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Запрос от&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Выполнить сопряжение с этим устройством?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Чтобы выполнить сопряжение с устройством&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;, введите код доступа&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, а затем нажмите клавишу Return или \"Ввод\"."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Сопряжение"</string>
-    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Не устанавливать сопряжение"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Отмена"</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="6065697229258906937">"Неполадка при сопряжении с <xliff:g id="DEVICE_NAME">%1$s</xliff:g> из-за неверно введенного PIN-кода или ключа доступа."</string>
@@ -489,8 +471,7 @@
     <skip />
     <!-- no translation found for zeroclick_off_summary (2896320184904157018) -->
     <skip />
-    <!-- no translation found for zeroclick_label (6908892664706309626) -->
-    <skip />
+    <string name="zeroclick_label" msgid="6908892664706309626">"Автоматический обмен контентом"</string>
     <!-- no translation found for zeroclick_explained (3953149564512166049) -->
     <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
@@ -572,24 +553,15 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Шлюз"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Длина префикса сети"</string>
-    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
-    <skip />
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Настроить пиринговую совместимость"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Информация об устройстве"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Wi-Fi Protected Setup"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Введите PIN-код"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Запомнить это соединение"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Поиск"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Создать группу"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Расширенные"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Точка доступа Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Точка доступа <xliff:g id="NETWORK_SSID">%1$s</xliff:g> активна"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Ошибка подключения"</string>
@@ -602,8 +574,7 @@
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодия телефона"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <!-- outdated translation 8741571721868253103 -->     <string name="all_volume_title" msgid="4296957391257836961">"Громкость"</string>
-    <!-- no translation found for musicfx_title (3853457094486073206) -->
-    <skip />
+    <string name="musicfx_title" msgid="3853457094486073206">"Звуковые эффекты"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Громкость звонка"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Виброзвонок без звука"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Виброзвонок"</string>
@@ -1051,10 +1022,8 @@
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Не удалось переместить приложение. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Место установки"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Изменить установочную папку для новых приложений."</string>
-    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
-    <skip />
-    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
-    <skip />
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Отключение приложений"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Отключение встроенных приложений может привести к сбоям в работе других программ. Продолжить?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Использование памяти"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Объем памяти, занимаемый различными приложениями"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Работающие приложения"</string>
@@ -1549,9 +1518,8 @@
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="12">"Внимание!"</font>\n<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="12">"Лимит:"</font>\n<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Удаленные приложения"</string>
-    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
-    <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"Получено: <xliff:g id="RECEIVED">%1$s</xliff:g>; отправлено: <xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Вызов службы экстренной помощи"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Вернуться к вызову"</string>
@@ -1593,40 +1561,25 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Включить сертификат ЦС системы?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Отключить сертификат ЦС системы?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Полностью удалить сертификат ЦС пользователя?"</string>
-    <!-- no translation found for accessibility_tutorial_title (7577630829320003070) -->
-    <skip />
+    <string name="accessibility_tutorial_title" msgid="7577630829320003070">"Функция \"Воспроизводить при нажатии\""</string>
     <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Далее"</string>
     <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Назад"</string>
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Завершить"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Пропустить руководство"</string>
-    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_1 (2465037336858060269) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_4 (5374753806314829405) -->
-    <skip />
-    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
-    <skip />
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Урок 1. Навигация по экрану"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="2465037336858060269">"При включенной функции \"Воспроизводить при нажатии\" можно прослушать описание выделенного фрагмента. Например, сейчас на экране отображаются значки приложений. Найдите любой из них, проведя пальцем по экрану."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Хорошо. Проведите пальцем по экрану, пока не найдете по крайней мере еще один значок."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Чтобы активировать элемент, нажмите на него. Проведите пальцем по экрану, пока не найдете значок <xliff:g id="APP_NAME">%s</xliff:g>. Затем нажмите на него один раз для активации."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Ваш палец находится на значке <xliff:g id="APP_NAME">%s</xliff:g>. Для активации коснитесь его один раз."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Ваш палец находился на значке <xliff:g id="APP_NAME">%s</xliff:g>, а затем вышел за его пределы. Медленно проведите пальцем по экрану, пока снова не найдете значок браузера."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Хорошо. Чтобы перейти к следующему уроку, найдите и активируйте кнопку <xliff:g id="NEXT">%s</xliff:g>. Она расположена в правом нижнем углу экрана."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Урок 2. Прокрутка списка двумя пальцами"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Чтобы прокрутить список, проведите двумя пальцами по экрану. Сейчас на экране отображен список названий приложений. Для начала найдите несколько элементов списка, проведя по экрану одним пальцем."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Хорошо. Проведите пальцем по экрану, пока не появится по крайней мере еще один элемент списка."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Приложите два пальца к элементу списка и проведите ими вверх. Когда достигните верхней части экрана, снова приложите пальцы к списку и продолжите прокручивание."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Хорошо. Продолжайте проводить пальцами вверх для дальнейшей прокрутки списка."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="5374753806314829405">"Обучение завершено. Чтобы выйти и вернуться к настройкам функции \"Воспроизводить при нажатии\", нажмите кнопку <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Проверка правописания"</string>
     <!-- no translation found for current_backup_pw_prompt (8314880813545036591) -->
     <skip />
     <!-- no translation found for new_backup_pw_prompt (3491404828757901644) -->
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 1712d4e..07c51cb 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -134,14 +134,18 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
-    <!-- no translation found for wifi_p2p_wps_setup:0 (5085064298144493867) -->
-    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
-    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
-    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
-    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
-    <!-- no translation found for wifi_p2p_status:2 (7455862395128183796) -->
-    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
-    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Stlačenie tlačidla"</item>
+    <item msgid="8084424421884876981">"Kód PIN zo zdieľ. zariadenia"</item>
+    <item msgid="9033470670389392191">"Kód PIN zo zariad."</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Pripojené"</item>
+    <item msgid="3189211552661432651">"Pozvané"</item>
+    <item msgid="7455862395128183796">"Zlyhanie"</item>
+    <item msgid="7785896708926971207">"K dispozícii"</item>
+    <item msgid="829499112585677508">"Mimo rozsah"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="1106621950288502195">"2 minúty"</item>
     <item msgid="5780349442819375570">"5 minút"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index f8ff86f..8bf8f22 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -94,15 +94,12 @@
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Studené"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Viditeľné"</string>
-    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
-    <skip />
-    <!-- outdated translation 8573385118329733931 -->     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Viditeľné"</string>
-    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
-    <skip />
-    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
-    <skip />
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Viditeľné pre všetky okolité zariadenia Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Viditeľné pre všetky okolité zariadenia Bluetooth"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Neviditeľné pre ostatné zariadenia Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Viditeľné len pre párované zariadenia"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Prepne zariadenie do viditeľného režimu"</string>
-    <!-- outdated translation 6634508002347847278 -->     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Časový limit viditeľného režimu vypršal"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Časový limit viditeľnosti"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Nastavte dobu, počas ktorej bude zariadenie vo viditeľnom režime"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Uzamknúť hlasové vytáčanie"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zabrániť použitiu vytáčania Bluetooth pri uzamknutej obrazovke"</string>
@@ -110,16 +107,11 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Názov zariadenia"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Názov nie je nastavený, použije sa názov účtu"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Vyhľadať zariadenia"</string>
-    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
-    <skip />
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Premenovať tablet"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Premenovať telefón"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Premenovať"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Odpojiť?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Táto akcia ukončí vaše pripojenie so zariadením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojené."</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Pripojené"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Odpojený"</string>
@@ -129,15 +121,14 @@
     <string name="bluetooth_not_connected" msgid="3389882907500605937">"Párovať s týmto zariadením"</string>
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Párovanie..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Spárované, ale nepripojené"</string>
-    <!-- outdated translation 6873461446424952003 -->     <string name="bluetooth_device" msgid="5291950341750186887">"Náhlavná súprava alebo handsfree"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Nepomenované zariadenie s rozhraním Bluetooth"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Vyhľadávanie"</string>
     <string name="progress_tap_to_pair" msgid="4192342336107106334">"Klepnutím spárujte"</string>
     <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"V blízk. nie sú žiad. zariad. Bluetooth."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Žiadosť o párovanie zariadenia Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Žiadosť na párovanie"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Povoliť párovanie so zariadením<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
-    <skip />
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Zobraziť prijaté súbory"</string>
     <string name="device_picker" msgid="8721012448931226323">"Výber zariadenia Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Žiadosť o povolenie zariadenia Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Aplikácia vyžaduje povolenie na zapnutie pripojenia Bluetooth. Chcete udeliť toto povolenie?"</string>
@@ -404,26 +395,17 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Správa pripojenia, nastavenie názvu zariadenia a viditeľnosti"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Žiadosť o párovanie zariadenia Bluetooth"</string>
-    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
-    <skip />
-    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
-    <skip />
-    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
-    <skip />
-    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
-    <skip />
-    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
-    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Párovanie so zariadením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zadajte požadovaný kód PIN zariadenia:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Párovanie so zariadením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zadajte požadovaný prístupový kľúč zariadenia:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"Kód PIN obsahuje písmená alebo symboly"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Obvykle 0000 alebo 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Tento kód PIN možno bude potrebné zadať aj na druhom zariadení."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Tento prístupový kľúč možno bude potrebné zadať aj v druhom zariadení."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Párovanie so zariadením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Uistite sa, že zobrazuje tento prístupový kľúč:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Zo zariadenia:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Párovať s týmto zariadením?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Párovanie so zariadením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zadajte v ňom kód:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; a následne potvrďte tlačidlom Return alebo Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Párovať"</string>
-    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Nepárovať"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Zrušiť"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Pozor"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Vyskytol sa problém s párovaním so zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Pri párovaní so zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g> došlo k problémom. Kód PIN alebo prístupový kľúč je nesprávny."</string>
@@ -489,8 +471,7 @@
     <skip />
     <!-- no translation found for zeroclick_off_summary (2896320184904157018) -->
     <skip />
-    <!-- no translation found for zeroclick_label (6908892664706309626) -->
-    <skip />
+    <string name="zeroclick_label" msgid="6908892664706309626">"Zdieľanie bez kliknutí"</string>
     <!-- no translation found for zeroclick_explained (3953149564512166049) -->
     <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
@@ -572,24 +553,15 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"Server DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Brána"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Dĺžka sieťovej predpony"</string>
-    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
-    <skip />
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Priame pripojenie Wi-Fi"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Nastaviť pripojenie typu peer-to-peer"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Informácie o zariadení"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Zabezpečené nastavenie siete Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Zadajte PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Zapamätať si toto pripojenie"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Hľadať"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Vytvoriť skupinu"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Rozšírené"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prenosný prístupový bod Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Prenosný prístupový bod <xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktívny"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Chyba prenosného prístupového bodu Wi-Fi"</string>
@@ -602,8 +574,7 @@
     <string name="ringtone_title" msgid="5379026328015343686">"Vyzváňací tón telefónu"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <!-- outdated translation 8741571721868253103 -->     <string name="all_volume_title" msgid="4296957391257836961">"Hlasitosť"</string>
-    <!-- no translation found for musicfx_title (3853457094486073206) -->
-    <skip />
+    <string name="musicfx_title" msgid="3853457094486073206">"Hudobné efekty"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Hlasitosť vyzváňania"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrovať v tichom režime"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibrovať"</string>
@@ -1052,10 +1023,8 @@
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Presunutie aplikácie zlyhalo. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Preferované umiestnenie pre inštaláciu"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Zmena preferovaného umiestnenia pre inštaláciu nových aplikácií"</string>
-    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
-    <skip />
-    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
-    <skip />
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Zakázať vstavanú aplikáciu"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Zakázanie vstavanej aplikácie môže spôsobiť nesprávne fungovanie ďalších aplikácií. Chcete pokračovať?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Využitie ukl. priestoru"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Zobraziť aplikáciami používaný ukl. priestor"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Spustené služby"</string>
@@ -1550,9 +1519,8 @@
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"upozornenie"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="12">"limit:"</font>\n<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Odstránené aplikácie"</string>
-    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
-    <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"Prijaté: <xliff:g id="RECEIVED">%1$s</xliff:g> Odoslané: <xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Tiesňové volanie"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Späť na hovor"</string>
@@ -1594,40 +1562,25 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Povoliť systémový certifikát CA?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Zakázať systémový certifikát CA?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Natrvalo odstrániť používateľský certifikát CA?"</string>
-    <!-- no translation found for accessibility_tutorial_title (7577630829320003070) -->
-    <skip />
+    <string name="accessibility_tutorial_title" msgid="7577630829320003070">"Kurz funkcie Talk As I Touch (Hovoriť pri dotyku)"</string>
     <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Ďalej"</string>
     <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Späť"</string>
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Dokončiť"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Preskočiť kurz"</string>
-    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_1 (2465037336858060269) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_4 (5374753806314829405) -->
-    <skip />
-    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
-    <skip />
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lekcia 1: Prieskum obrazovky"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="2465037336858060269">"Po zapnutí režimu Talk As I Touch (Hovoriť pri dotykoch) si môžete po dotknutí sa obrazovky vypočuť popis položiek, ktoré sa nachádzajú pod vaším prstom. Príklad: Aktuálna obrazovka obsahuje ikony aplikácií. Dotykom na obrazovku a posúvaním prsta dookola nájdite jednu z nich."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Dobre. Posúvajte prstom po obrazovke, kým nenájdete aspoň jednu ďalšiu ikonu."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Ak chcete aktivovať položku, ktorej sa dotýkate, klepnite na ňu. Posúvajte prstom, kým nenájdete ikonu aplikácie <xliff:g id="APP_NAME">%s</xliff:g>. Následne ju aktivujte jedným klepnutím."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Váš prst sa dotýka ikony <xliff:g id="APP_NAME">%s</xliff:g>. Aktivujete ju jedným klepnutím."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Váš prst ste presunuli na ikonu <xliff:g id="APP_NAME">%s</xliff:g> a následne ste ho z nej odtiahli. Pomaly posúvajte prstom po obrazovke, kým znova nenájdete ikonu prehliadača."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Dobre. Ak chcete prejsť na ďalšiu lekciu, nájdite a aktivujte tlačidlo <xliff:g id="NEXT">%s</xliff:g>, ktoré sa nachádza pri pravom dolnom rohu obrazovky."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lekcia 2: Posúvanie dvoma prstami"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Ak chcete prehliadať zoznam, môžete posúvať dvoma prstami po obrazovke. Príklad: Aktuálna obrazovka obsahuje zoznam názvov aplikácií, ktorý je možné posúvať nahor alebo nadol. Najprv sa pokúste určiť niekoľko položiek v zozname posúvaním jedného prsta dookola."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Dobre, pokračujte v posúvaní prstom dookola a nájdite aspoň jednu ďalšiu položku."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Teraz umiestnite dva prsty na položku v zozname a posúvajte prstami smerom nahor. Ak dosiahnete vrchnú časť obrazovku, nadvihnite prsty, umiestnite ich na nižšiu časť zoznamu a pokračujte v posúvaní smerom nahor."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Dobre, posúvajte prstami smerom nahor, aby sa zobrazenie posunulo ešte ďalej."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="5374753806314829405">"Dokončili ste kurz. Ak ho chcete ukončiť a vrátiť sa na nastavenie funkcie Talk As I Touch (Hovoriť pri dotyku), nájdite a klepnite na tlačidlo <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Oprava pravopisu"</string>
     <!-- no translation found for current_backup_pw_prompt (8314880813545036591) -->
     <skip />
     <!-- no translation found for new_backup_pw_prompt (3491404828757901644) -->
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index dc8d515..a087855 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1520,7 +1520,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"omejitev"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Odstranjeni programi"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"prejeto: <xliff:g id="RECEIVED">%1$s</xliff:g>, poslano: <xliff:g id="SENT">%2$s</xliff:g>"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Klic v sili"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Nazaj na klic"</string>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 963967e..59a6ebc 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -134,14 +134,18 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
-    <!-- no translation found for wifi_p2p_wps_setup:0 (5085064298144493867) -->
-    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
-    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
-    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
-    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
-    <!-- no translation found for wifi_p2p_status:2 (7455862395128183796) -->
-    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
-    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Притискање дугмета"</item>
+    <item msgid="8084424421884876981">"PIN са равноправног уређаја"</item>
+    <item msgid="9033470670389392191">"PIN са овог уређаја"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Повезано"</item>
+    <item msgid="3189211552661432651">"Позван"</item>
+    <item msgid="7455862395128183796">"Није успело"</item>
+    <item msgid="7785896708926971207">"Доступно"</item>
+    <item msgid="829499112585677508">"Изван опсега"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="1106621950288502195">"2 минута"</item>
     <item msgid="5780349442819375570">"5 минута"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index f8b58d2..a247b73 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -94,15 +94,12 @@
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Незанимљиво"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Видљив"</string>
-    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
-    <skip />
-    <!-- outdated translation 8573385118329733931 -->     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Видљив"</string>
-    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
-    <skip />
-    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
-    <skip />
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Видљиво за све оближње Bluetooth уређаје (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Видљиво за све оближње Bluetooth уређаје"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Није видљиво за друге Bluetooth уређаје"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Видљиво само за упарене уређаје"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Нека уређај буде видљив"</string>
-    <!-- outdated translation 6634508002347847278 -->     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Време до прекида видљивости"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Време чекања за видљивост"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Подешавање периода у коме ће уређај бити видљив"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Закључај говорно бирање"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Спречи коришћење bluetooth програма за бирање бројева када је екран закључан"</string>
@@ -110,16 +107,11 @@
     <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>
-    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
-    <skip />
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Преименуј таблет"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Преименуј телефон"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Преименуј"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Желите ли да прекинете везу?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Овим ћете прекинути везу са уређајем:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</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>
@@ -129,15 +121,14 @@
     <string name="bluetooth_not_connected" msgid="3389882907500605937">"Упаривање са овим уређајем"</string>
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Упаривање..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Упаривање, али веза је прекинута"</string>
-    <!-- outdated translation 6873461446424952003 -->     <string name="bluetooth_device" msgid="5291950341750186887">"хандсфри/слушалице"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Неименовани Bluetooth уређај"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Претраживање"</string>
     <string name="progress_tap_to_pair" msgid="4192342336107106334">"Додирните да упарите"</string>
     <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Нема Bluetooth уређаја у близини."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Захтев за Bluetooth упаривање"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Захтев за упаривање"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Изаберите за упаривање са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
-    <skip />
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Приказ примљених датотека"</string>
     <string name="device_picker" msgid="8721012448931226323">"Bluetooth бирач уређаја"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Захтев за Bluetooth дозволу"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Апликација захтева дозволу да укључи Bluetooth. Желите ли то да учините?"</string>
@@ -404,26 +395,17 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Управљање везама, подешавање назива и видљивости уређаја"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Захтев за Bluetooth упаривање"</string>
-    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
-    <skip />
-    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
-    <skip />
-    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
-    <skip />
-    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
-    <skip />
-    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
-    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Да бисте се упарили са уређајем:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Унесите захтевани PIN уређаја:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Да бисте се упарили са уређајем:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Унесите захтевани приступни кôд уређаја:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN садржи слова или симболе"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Обично 0000 или 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Можда ће бити потребно да унесете овај PIN и на другом уређају."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Можда ће бити потребно да унесете овај приступни кôд и на другом уређају."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Да бисте се упарили са уређајем:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Уверите се да приказује овај приступни кôд:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Са уређаја:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Желите ли да се упарите са тим уређајем?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Да бисте се упарили са уређајем:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Унесите:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; на њему, а затим притисните Return или Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Упари"</string>
-    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Не упаруј"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Откажи"</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="6065697229258906937">"Дошло је до проблема приликом упаривања са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g> зато што су PIN или приступни кôд нетачни."</string>
@@ -489,8 +471,7 @@
     <skip />
     <!-- no translation found for zeroclick_off_summary (2896320184904157018) -->
     <skip />
-    <!-- no translation found for zeroclick_label (6908892664706309626) -->
-    <skip />
+    <string name="zeroclick_label" msgid="6908892664706309626">"Дељење без клика"</string>
     <!-- no translation found for zeroclick_explained (3953149564512166049) -->
     <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
@@ -572,24 +553,15 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Мрежни пролаз"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Дужина префикса мреже"</string>
-    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
-    <skip />
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Подешавање везе између равноправних уређаја"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Информације о уређају"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Wi-Fi заштићено подешавање"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Унесите PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Запамти ову везу"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Претражи"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Направи групу"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Напредна подешавања"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Преносна Wi-Fi приступна тачка"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Преносна приступна тачка <xliff:g id="NETWORK_SSID">%1$s</xliff:g> је активна"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Грешка у преносној Wi-Fi приступној тачки"</string>
@@ -602,8 +574,7 @@
     <string name="ringtone_title" msgid="5379026328015343686">"Звук звона телефона"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <!-- outdated translation 8741571721868253103 -->     <string name="all_volume_title" msgid="4296957391257836961">"Јачина звука"</string>
-    <!-- no translation found for musicfx_title (3853457094486073206) -->
-    <skip />
+    <string name="musicfx_title" msgid="3853457094486073206">"Музички ефекти"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Јачина звука звона"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вибрација у нечујном режиму"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Вибрација"</string>
@@ -1052,10 +1023,8 @@
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Премештање апликације није успело. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Жељена локација инсталације"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Мењање жељене локације за инсталацију нових апликација."</string>
-    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
-    <skip />
-    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
-    <skip />
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Онем. уграђене апликације"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Онемогућавање уграђене апликације може да изазове неочекивано понашање других апликација. Да ли сте сигурни да то желите?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Коришћење меморије"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Преглед искоришћене меморије по апликацијама"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Покренуте услуге"</string>
@@ -1550,9 +1519,8 @@
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"упозорење"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"Ограничење"\n"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font><font size="12"></font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Уклоњене апликације"</string>
-    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
-    <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"Примљених: <xliff:g id="RECEIVED">%1$s</xliff:g>, послатих: <xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Хитни позив"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Назад на позив"</string>
@@ -1594,40 +1562,25 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Желите ли да омогућите систем CA сертификата?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Желите ли да онемогућите систем CA сертификата?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Желите да трајно уклоните CA сертификат корисника?"</string>
-    <!-- no translation found for accessibility_tutorial_title (7577630829320003070) -->
-    <skip />
+    <string name="accessibility_tutorial_title" msgid="7577630829320003070">"Водич за Причај док додирујем"</string>
     <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Следеће"</string>
     <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Назад"</string>
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Заврши"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Прескочи водич"</string>
-    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_1 (2465037336858060269) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_4 (5374753806314829405) -->
-    <skip />
-    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
-    <skip />
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"1. лекција: Истраживање екрана"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="2465037336858060269">"Након што укључите Причај док додирујем, можете да додирујете екран како бисте чули опис ставке која се налази под вашим прстом. На пример, тренутни екран садржи иконе апликација. Пронађите неку од њих тако што ћете додирнути екран и превлачити прстом наоколо."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Одлично. Наставите да превлачите прстом по екрану док не нађете још најмање једну икону."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Да бисте активирали нешто преко чега прелазите прстима, додирните га. Превлачите прстом док не пронађете икону за <xliff:g id="APP_NAME">%s</xliff:g>. Затим додирните икону једанпут да бисте активирали апликацију."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Прст додирује икону апликације <xliff:g id="APP_NAME">%s</xliff:g>. Додирните једанпут икону да бисте је активирали."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Прешли сте прстом преко иконе апликације <xliff:g id="APP_NAME">%s</xliff:g>, а затим сте га склонили. Превлачите полако прстом по екрану док поново не пронађете икону прегледача."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Одлично. Да бисте прешли на следећу лекцију, пронађите и активирајте дугме <xliff:g id="NEXT">%s</xliff:g>, које се налази у близини доњег десног угла екрана."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"2. лекција: Померање помоћу два прста"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Да бисте се померали кроз листу, можете да вучете два прста дуж екрана. На пример, тренутни екран садржи листу назива апликација коју можете да померате нагоре или надоле. Као прво, покушајте да идентификујете неколико ставки на листи тако што ћете превлачити једним прстом наоколо."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Одлично. Наставите да превлачите прстом около да бисте пронашли најмање још једну ставку."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Затим поставите два прста на ставку са листе и вуците их нагоре. Уколико дођете до врха екрана, подигните прсте, поставите их ниже на листи и наставите да вучете нагоре."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Одлично. Наставите да превлачите прстима нагоре да бисте се још мало померали."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="5374753806314829405">"Прошли сте кроз водич. Да бисте изашли и вратили се на подешавање Причај док додирујем, пронађите и додирните дугме <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Провера правописа"</string>
     <!-- no translation found for current_backup_pw_prompt (8314880813545036591) -->
     <skip />
     <!-- no translation found for new_backup_pw_prompt (3491404828757901644) -->
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index e30abab..c55eacf 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -134,14 +134,18 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
-    <!-- no translation found for wifi_p2p_wps_setup:0 (5085064298144493867) -->
-    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
-    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
-    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
-    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
-    <!-- no translation found for wifi_p2p_status:2 (7455862395128183796) -->
-    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
-    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Tryckknapp"</item>
+    <item msgid="8084424421884876981">"PIN-kod från den andra enheten"</item>
+    <item msgid="9033470670389392191">"PIN från enheten"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Anslutet"</item>
+    <item msgid="3189211552661432651">"Inbjuden"</item>
+    <item msgid="7455862395128183796">"Misslyckades"</item>
+    <item msgid="7785896708926971207">"Tillgänglig"</item>
+    <item msgid="829499112585677508">"Utanför intervallet"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="1106621950288502195">"2 minuter"</item>
     <item msgid="5780349442819375570">"5 minuter"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index d3371fc..69a8bf3 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -94,15 +94,12 @@
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Sval"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Synlighet"</string>
-    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
-    <skip />
-    <!-- outdated translation 8573385118329733931 -->     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Synlig"</string>
-    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
-    <skip />
-    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
-    <skip />
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Synlig för alla Bluetooth-enheter i närheten (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visas för alla närliggande Bluetooth-enheter"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Inte synlig för andra Bluetooth-enheter"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Bara synlig för parkopplade enheter"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gör enheten synlig"</string>
-    <!-- outdated translation 6634508002347847278 -->     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tidsgräns för synlighet"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tidsgräns för synlighet"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Ange hur länge enheten ska vara synlig"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Röstuppringning med låsskärm"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Förhindra att bluetooth-uppringningsfunktionen används när skärmen är låst"</string>
@@ -110,16 +107,11 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Enhetens namn"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Inget namn har angetts, använder kontonamn"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Sök efter enheter"</string>
-    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
-    <skip />
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Byt namn på pekdator"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Byt namn på telefon"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Byt namn"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vill du koppla från?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Detta avslutar din anslutning till:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån."</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Ansluten"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Kopplas ifrån"</string>
@@ -129,15 +121,14 @@
     <string name="bluetooth_not_connected" msgid="3389882907500605937">"Parkoppla med den här enheten"</string>
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Parkoppling…"</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Parkopplad men inte ansluten"</string>
-    <!-- outdated translation 6873461446424952003 -->     <string name="bluetooth_device" msgid="5291950341750186887">"handsfree/headset"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Namnlös Bluetooth-enhet"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Söker"</string>
     <string name="progress_tap_to_pair" msgid="4192342336107106334">"Tryck för att koppla"</string>
     <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Inga Bluetooth-enheter fanns i närheten."</string>
     <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="618099089987569242">"Välj att parkoppla med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
-    <skip />
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Visa mottagna filer"</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="8211158472876087588">"En app begär tillåtelse att aktivera Bluetooth. Vill du tillåta det?"</string>
@@ -404,26 +395,17 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Hantera anslutningar, ange inställningar för enhetens namn och synlighet"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Begäran om Bluetooth-parkoppling"</string>
-    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
-    <skip />
-    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
-    <skip />
-    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
-    <skip />
-    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
-    <skip />
-    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
-    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Om du vill parkoppla med&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;anger du PIN-koden som krävs:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Om du vill parkoppla med&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;anger du enhetens lösenord:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN-koden innehåller bokstäver eller symboler"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Oftast 0000 eller 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Du kan också behöva ange PIN-koden på den andra enheten."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Du kan också behöva ange lösenordet på den andra enheten."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Om du vill parkoppla med&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;måste lösenordet&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; visas i den"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Från:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vill du parkoppla med enheten?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Om du vill parkoppla med:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Skriv:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; på den och tryck på Retur."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Parkoppling"</string>
-    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Parkoppla inte"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Avbryt"</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="6065697229258906937">"Det gick inte att parkoppla <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eftersom PIN-koden eller nyckeln inte stämmer."</string>
@@ -489,8 +471,7 @@
     <skip />
     <!-- no translation found for zeroclick_off_summary (2896320184904157018) -->
     <skip />
-    <!-- no translation found for zeroclick_label (6908892664706309626) -->
-    <skip />
+    <string name="zeroclick_label" msgid="6908892664706309626">"Dela utan klick"</string>
     <!-- no translation found for zeroclick_explained (3953149564512166049) -->
     <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
@@ -572,24 +553,15 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Nätverksprefixets längd"</string>
-    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
-    <skip />
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi direkt"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"peer-till-peer-anslutning"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Enhetsinformation"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Skyddad Wi-Fi-konfiguration"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Ange PIN-kod"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Kom ihåg anslutningen"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Sök"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Skapa grupp"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avancerat"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Mobil Wi-Fi-surfpunkt"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Mobil surfpunkt <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktiv"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fel på mobil Wi-Fi-surfpunkt"</string>
@@ -602,8 +574,7 @@
     <string name="ringtone_title" msgid="5379026328015343686">"Telefonens ringsignal"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <!-- outdated translation 8741571721868253103 -->     <string name="all_volume_title" msgid="4296957391257836961">"Volym"</string>
-    <!-- no translation found for musicfx_title (3853457094486073206) -->
-    <skip />
+    <string name="musicfx_title" msgid="3853457094486073206">"Musikeffekter"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ringvolym"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrera vid tyst"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibrera"</string>
@@ -1051,10 +1022,8 @@
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Det gick inte att flytta appar. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Önskad installationsplats"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Ändra önskad installationsplats för nya appar."</string>
-    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
-    <skip />
-    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
-    <skip />
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Inaktivera inbyggd app"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Om du inaktiverar ett inbyggt program kanske andra program inte fungerar korrekt. Vill du göra detta?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Använt utrymme"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Visa lagring som används av appar"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Aktiva tjänster"</string>
@@ -1549,9 +1518,8 @@
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"varning"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"gräns"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Borttagna appar"</string>
-    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
-    <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> mottagna, <xliff:g id="SENT">%2$s</xliff:g> skickade"</string>
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Nödsamtal"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tillbaka till samtal"</string>
@@ -1593,40 +1561,25 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Vill du att systemets CA-certifikat ska aktiveras?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Vill du att systemets CA-certifikat ska inaktiveras?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Vill du att användarens CA-certifikat ska tas bort permanent?"</string>
-    <!-- no translation found for accessibility_tutorial_title (7577630829320003070) -->
-    <skip />
+    <string name="accessibility_tutorial_title" msgid="7577630829320003070">"Självstudier för Tala när jag pekar"</string>
     <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Nästa"</string>
     <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Tillbaka"</string>
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Klar"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Hoppa över"</string>
-    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_1 (2465037336858060269) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_4 (5374753806314829405) -->
-    <skip />
-    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
-    <skip />
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lektion 1: Utforska skärmen"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="2465037336858060269">"När du har aktiverat Tala när jag pekar kan du vidröra skärmen om du vill höra en beskrivning av det som finns under fingret. Om skärmen som visas innehåller ikoner för appar kan du hitta dem genom att sätta fingret på skärmen och dra runt."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Bra. Fortsätt dra runt fingret på skärmen tills du hittar minst en ikon till."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Om du vill aktivera något som du har fingret på knackar du lätt på det. Dra fingret tills du hittar ikonen för <xliff:g id="APP_NAME">%s</xliff:g>. Knacka sedan lätt på ikonen för att aktivera den."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Fingret vilar på ikonen <xliff:g id="APP_NAME">%s</xliff:g>. Knacka lätt en gång om du vill aktivera ikonen."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Du förde fingret över ikonen <xliff:g id="APP_NAME">%s</xliff:g> och sedan bort igen. Dra långsamt runt fingret på skärmen tills du hittar ikonen för webbläsaren igen."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Bra. Fortsätt till nästa lektion genom att hitta och aktivera knappen <xliff:g id="NEXT">%s</xliff:g> nära skärmens nedre högra hörn."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lektion 2: Rulla med två fingrar"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Om du vill rulla i en lista kan du dra två fingrar längs skärmen. Om skärmen till exempel innehåller en lista med appnamn kan du rulla uppåt och nedåt i den. Försök först identifiera några objekt i listan genom att dra runt ett finger."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Bra! Fortsätt att dra fingret på skärmen tills du hittar minst ett objekt till i listan."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Placera nu två fingrar på ett objekt i listan och dra båda fingrarna uppåt. Om du når toppen av skärmen lyfter du fingrarna, placerar dem längre ner i listan och fortsätter dra uppåt."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Bra! Fortsätt att dra fingrarna över skärmen om du vill bläddra mer."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="5374753806314829405">"Du har slutfört självstudierna. Klicka på knappen <xliff:g id="FINISH">%s</xliff:g> om du vill avsluta och återgå till inställningen Tala när jag pekar."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Stavningskorrigering"</string>
     <!-- no translation found for current_backup_pw_prompt (8314880813545036591) -->
     <skip />
     <!-- no translation found for new_backup_pw_prompt (3491404828757901644) -->
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index e7e746a..18f8bb9 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -2073,7 +2073,7 @@
     <skip />
     <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
     <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <!-- no translation found for cryptkeeper_emergency_call (198578731586097145) -->
     <skip />
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 1bf6575..025c75e 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -1520,7 +1520,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ขีดจำกัด"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"แอปพลิเคชันที่นำออก"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"รับ <xliff:g id="RECEIVED">%1$s</xliff:g>, ส่ง <xliff:g id="SENT">%2$s</xliff:g>"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"หมายเลขฉุกเฉิน"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"กลับสู่การโทร"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index b84984c..5a4414f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1520,7 +1520,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limitasyon"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Mga inalis na app"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> ang natanggap, <xliff:g id="SENT">%2$s</xliff:g> ang naipadala"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Emergency na tawag"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Balikan ang tawag"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index cfff860..5b4ebd6 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1519,7 +1519,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"sınır"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Kaldırılan uygulamalar"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> alındı, <xliff:g id="SENT">%2$s</xliff:g> gönderildi"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Acil durum çağrısı"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Çağrıya dön"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 24ee0cd..3e812ab 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1520,7 +1520,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"максимум"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Видалені програми"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> отримано, <xliff:g id="SENT">%2$s</xliff:g> надіслано"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Аварійний виклик"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Повернутися до дзвінка"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 1c1bbad..13ce02a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1520,7 +1520,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"giới hạn"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Ứng dụng đã xóa"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"Đã nhận <xliff:g id="RECEIVED">%1$s</xliff:g>, đã gửi <xliff:g id="SENT">%2$s</xliff:g>"</string>
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Cuộc gọi khẩn cấp"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Quay lại cuộc gọi"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index cfdae9c..a64ce61 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -68,13 +68,15 @@
     <item msgid="490158884605093126">"较大"</item>
     <item msgid="2123802548987439763">"极大"</item>
   </string-array>
-    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
-    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
-    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
-    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
-    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
-    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
-    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
+  <string-array name="entryvalues_font_size">
+    <item msgid="8122189478379706788">"0.70"</item>
+    <item msgid="186029675505810577">"0.85"</item>
+    <item msgid="5864822191921585498">"0.95"</item>
+    <item msgid="5580820036923893743">"1.0"</item>
+    <item msgid="5106590751949630532">"1.05"</item>
+    <item msgid="1803159594904488544">"1.15"</item>
+    <item msgid="7410681469566563300">"1.30"</item>
+  </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"很慢"</item>
     <item msgid="2361722960903353554">"慢"</item>
@@ -132,14 +134,18 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
-    <!-- no translation found for wifi_p2p_wps_setup:0 (5085064298144493867) -->
-    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
-    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
-    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
-    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
-    <!-- no translation found for wifi_p2p_status:2 (7455862395128183796) -->
-    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
-    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"按钮"</item>
+    <item msgid="8084424421884876981">"从对等设备获取的 PIN"</item>
+    <item msgid="9033470670389392191">"从此设备生成的 PIN"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"已连接"</item>
+    <item msgid="3189211552661432651">"已邀请"</item>
+    <item msgid="7455862395128183796">"失败"</item>
+    <item msgid="7785896708926971207">"可用"</item>
+    <item msgid="829499112585677508">"超出范围"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="1106621950288502195">"2 分钟"</item>
     <item msgid="5780349442819375570">"5 分钟"</item>
@@ -209,9 +215,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP 或 CHAP"</item>
   </string-array>
-    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
-    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
-    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
+  <string-array name="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"设备内部存储"</item>
     <item msgid="3738430123799803530">"可卸载的 SD 卡"</item>
@@ -259,10 +267,10 @@
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"标准限制"</item>
     <item msgid="4071574792028999443">"终止后台进程"</item>
-    <item msgid="4810006996171705398">"最多 1 个进程"</item>
-    <item msgid="8586370216857360863">"最多 2 个进程"</item>
-    <item msgid="836593137872605381">"最多 3 个进程"</item>
-    <item msgid="7899496259191969307">"最多 4 个进程"</item>
+    <item msgid="4810006996171705398">"不得超过 1 个进程"</item>
+    <item msgid="8586370216857360863">"不得超过 2 个进程"</item>
+    <item msgid="836593137872605381">"不得超过 3 个进程"</item>
+    <item msgid="7899496259191969307">"不得超过 4 个进程"</item>
   </string-array>
   <string-array name="vpn_types_long">
     <item msgid="2732002039459078847">"PPTP VPN"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 4e29c37..3882596 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -94,15 +94,12 @@
     <string name="battery_info_health_cold" msgid="3835692786176707318">"电量低"</string>
     <string name="bluetooth" msgid="5549625000628014477">"蓝牙"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"可检测性"</string>
-    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
-    <skip />
-    <!-- outdated translation 8573385118329733931 -->     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"可检测到"</string>
-    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
-    <skip />
-    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
-    <skip />
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"让附近所有的蓝牙设备均可检测到（<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>）"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"让附近所有的蓝牙设备均可检测到"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"不让其他蓝牙设备检测到"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"仅让已配对的设备检测到"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"可以检测到设备"</string>
-    <!-- outdated translation 6634508002347847278 -->     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"可检测到设备的时间超时"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"可检测性超时"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"设置可检测到设备的时间"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"锁定语音拨号"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"屏幕锁定时停止使用蓝牙拨号器"</string>
@@ -110,16 +107,11 @@
     <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>
-    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
-    <skip />
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"重命名平板电脑"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"重命名手机"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"重命名"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"断开连接？"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"此操作将会断开您与以下设备的连接：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</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>
@@ -129,15 +121,14 @@
     <string name="bluetooth_not_connected" msgid="3389882907500605937">"与此设备配对"</string>
     <string name="bluetooth_pairing" msgid="1426882272690346242">"正在配对..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"已配对但未连接"</string>
-    <!-- outdated translation 6873461446424952003 -->     <string name="bluetooth_device" msgid="5291950341750186887">"免提/耳机"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"未命名的蓝牙设备"</string>
     <string name="progress_scanning" msgid="192587958424295789">"正在搜索"</string>
     <string name="progress_tap_to_pair" msgid="4192342336107106334">"点按即可配对"</string>
     <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"未在附近发现蓝牙设备。"</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"蓝牙配对请求"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"配对请求"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"选择与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对"</string>
-    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
-    <skip />
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"显示已接收的文件"</string>
     <string name="device_picker" msgid="8721012448931226323">"蓝牙设备选择器"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"蓝牙权限请求"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"某一应用程序正在请求相应权限，以便打开蓝牙。要授予该权限吗？"</string>
@@ -157,8 +148,7 @@
     <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"触摸以连接到“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”"</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"要连接到“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”吗？"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"电话簿请求"</string>
-    <!-- no translation found for bluetooth_pb_acceptance_dialog_text (5203107624986011263) -->
-    <skip />
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s想访问您的联系人和通话记录。要向%2$s授予访问权吗？"</string>
     <string name="bluetooth_pb_alwaysallowed" msgid="3953839482721299910">"始终允许？"</string>
     <string name="date_and_time" msgid="4114084177056654663">"日期和时间设置"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"下午 1:00"</string>
@@ -405,26 +395,17 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"蓝牙"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"管理连接、设置设备名称和可检测性"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"蓝牙配对请求"</string>
-    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
-    <skip />
-    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
-    <skip />
-    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
-    <skip />
-    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
-    <skip />
-    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
-    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"要与以下设备配对：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;请输入该设备所需的 PIN："</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"要与以下设备配对：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;请输入该设备所需的配对密钥："</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN 由字母或符号组成"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"通常是 0000 或 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"您可能还需要在其他设备上输入此 PIN。"</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"您可能还需要在另一台设备上输入此匹配密钥。"</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"要与以下设备配对：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;请确保其显示的配对密钥为：&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"来自：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;要与此设备配对吗？"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"要与以下设备配对：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;请在该设备上输入：&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;，然后按“返回”或“Enter”。"</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"配对"</string>
-    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"不要配对"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"取消"</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="6065697229258906937">"与 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 配对时出现问题，因为 PIN 或匹配密钥不正确。"</string>
@@ -490,8 +471,7 @@
     <skip />
     <!-- no translation found for zeroclick_off_summary (2896320184904157018) -->
     <skip />
-    <!-- no translation found for zeroclick_label (6908892664706309626) -->
-    <skip />
+    <string name="zeroclick_label" msgid="6908892664706309626">"免点击共享 (Zero-click sharing)"</string>
     <!-- no translation found for zeroclick_explained (3953149564512166049) -->
     <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
@@ -573,24 +553,15 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"域名 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"网关"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"网络前缀长度"</string>
-    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
-    <skip />
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"设置对等连接"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"设备信息"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Wi-Fi 保护设置"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"输入 PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"记住该连接"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"搜索"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"创建群组"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"高级"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"便携式 Wi-Fi 热点"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"便携式热点 <xliff:g id="NETWORK_SSID">%1$s</xliff:g> 已启用"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"便携式 Wi-Fi 热点错误"</string>
@@ -603,8 +574,7 @@
     <string name="ringtone_title" msgid="5379026328015343686">"手机铃声"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <!-- outdated translation 8741571721868253103 -->     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
-    <!-- no translation found for musicfx_title (3853457094486073206) -->
-    <skip />
+    <string name="musicfx_title" msgid="3853457094486073206">"音乐效果"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"铃声音量"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"静音时振动"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"振动"</string>
@@ -1052,10 +1022,8 @@
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"无法移动应用程序。<xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"首选安装位置"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"更改安装新应用程序时使用的首选安装位置"</string>
-    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
-    <skip />
-    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
-    <skip />
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"停用内置应用程序"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"停用内置应用程序可能会导致其他应用程序出现异常。确定要停用吗？"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"存储空间使用情况"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"查看应用程序所用的存储空间"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"正在运行的服务"</string>
@@ -1550,9 +1518,8 @@
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"警告"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"限制"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"已删除的应用程序"</string>
-    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
-    <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"已接收：<xliff:g id="RECEIVED">%1$s</xliff:g>，已发送：<xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"紧急呼救"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"返回通话"</string>
@@ -1575,8 +1542,7 @@
     <string name="vpn_username" msgid="1863901629860867849">"用户名"</string>
     <string name="vpn_password" msgid="6756043647233596772">"密码"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"保存帐户信息"</string>
-    <!-- no translation found for vpn_not_used (9094191054524660891) -->
-    <skip />
+    <string name="vpn_not_used" msgid="9094191054524660891">"（未使用）"</string>
     <string name="vpn_no_ca_cert" msgid="7820884983947090538">"（不验证服务器）"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"取消"</string>
     <string name="vpn_save" msgid="4233484051644764510">"保存"</string>
@@ -1595,40 +1561,25 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"要启用该系统 CA 证书吗？"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"要停用该系统 CA 证书吗？"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"要永久删除该用户 CA 证书吗？"</string>
-    <!-- no translation found for accessibility_tutorial_title (7577630829320003070) -->
-    <skip />
+    <string name="accessibility_tutorial_title" msgid="7577630829320003070">"“触摸通话”(Talk As I Touch) 教程"</string>
     <string name="accessibility_tutorial_next" msgid="5079911515520801099">"下一课"</string>
     <string name="accessibility_tutorial_back" msgid="2583933084111712540">"返回"</string>
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"完成"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"跳过教程"</string>
-    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_1 (2465037336858060269) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_4 (5374753806314829405) -->
-    <skip />
-    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
-    <skip />
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"第 1 课：浏览屏幕"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="2465037336858060269">"打开“触摸通话”(Talk As I Touch) 功能后，您可以触摸屏幕聆听手指触摸处的组件说明。例如，当前屏幕中包含应用程序图标，您可以触摸屏幕，然后随意滑动手指，找出其中某个应用程序。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"做得不错！请继续在屏幕上随意滑动您的手指，至少再找一个图标。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"要激活您正触摸的应用程序，只需点按一下即可。滑动您的手指，直到找到“<xliff:g id="APP_NAME">%s</xliff:g>”的图标，然后点按一下该图标即可将其激活。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"您的手指正在触摸“<xliff:g id="APP_NAME">%s</xliff:g>”图标。点按一下即可激活该图标。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"您的手指移到了“<xliff:g id="APP_NAME">%s</xliff:g>”图标上，但是又移开了。请在屏幕四周缓缓滑动您的手指，直到再次找到“浏览器”图标为止。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"做得不错！要开始学习下一课，请找到并激活“<xliff:g id="NEXT">%s</xliff:g>”按钮（位于屏幕右下角附近）。"</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"第 2 课：使用两根手指执行滚动操作"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"要滚动浏览列表，您可以沿着屏幕滑动两根手指。例如，当前屏幕包含了一个应用程序名称列表，可供您上下滚动浏览。请先使用一根手指四处滑动，尝试找出列表中的几个项目。"</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"做得不错！请继续在屏幕上随意滑动您的手指，至少再查找一个列表项。"</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"现在请将两根手指放到某个列表项上，并向上滑动手指。如果到达屏幕顶端，请移开手指，并将手指放在列表中的下方位置，然后继续向上滑动。"</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"做得不错！请继续向上滑动您的手指，以滚动浏览更多内容。"</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="5374753806314829405">"您已学完了本教程。要退出并返回到“触摸通话”(Talk As I Touch) 设置，请找到“<xliff:g id="FINISH">%s</xliff:g>”按钮并点按一下。"</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"拼写更正"</string>
     <!-- no translation found for current_backup_pw_prompt (8314880813545036591) -->
     <skip />
     <!-- no translation found for new_backup_pw_prompt (3491404828757901644) -->
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 81948a5..3cbd1bf 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -134,14 +134,18 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
-    <!-- no translation found for wifi_p2p_wps_setup:0 (5085064298144493867) -->
-    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
-    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
-    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
-    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
-    <!-- no translation found for wifi_p2p_status:2 (7455862395128183796) -->
-    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
-    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"按鈕"</item>
+    <item msgid="8084424421884876981">"來自對端裝置的 PIN"</item>
+    <item msgid="9033470670389392191">"來自這個裝置的 PIN"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"已連線"</item>
+    <item msgid="3189211552661432651">"已邀請"</item>
+    <item msgid="7455862395128183796">"失敗"</item>
+    <item msgid="7785896708926971207">"可用的"</item>
+    <item msgid="829499112585677508">"超出範圍"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="1106621950288502195">"2 分鐘"</item>
     <item msgid="5780349442819375570">"5 分鐘"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e1c0ca6..af74d79 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -94,15 +94,12 @@
     <string name="battery_info_health_cold" msgid="3835692786176707318">"冷"</string>
     <string name="bluetooth" msgid="5549625000628014477">"藍牙"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"可偵測性"</string>
-    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
-    <skip />
-    <!-- outdated translation 8573385118329733931 -->     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"可供偵測"</string>
-    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
-    <skip />
-    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
-    <skip />
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"向附近所有藍牙裝置顯示 (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"向附近所有藍牙裝置顯示"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"不向其他藍牙裝置顯示"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"只向配對的裝置顯示"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"設定裝置為可偵測"</string>
-    <!-- outdated translation 6634508002347847278 -->     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"可供偵測逾時時間"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"顯示時限"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"設定裝置可供偵測的開放時間"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"鎖定語音撥號"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"螢幕鎖定時不要使用藍芽撥號"</string>
@@ -110,16 +107,11 @@
     <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>
-    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
-    <skip />
-    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
-    <skip />
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"為平板電腦重新命名"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"為手機重新命名"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"重新命名"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"中斷連線？"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"這樣會結束您與下列裝置的連線：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</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>
@@ -129,15 +121,14 @@
     <string name="bluetooth_not_connected" msgid="3389882907500605937">"與此裝置配對"</string>
     <string name="bluetooth_pairing" msgid="1426882272690346242">"配對中..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"已配對，但尚未連接"</string>
-    <!-- outdated translation 6873461446424952003 -->     <string name="bluetooth_device" msgid="5291950341750186887">"免持/頭戴式"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"未命名的藍牙裝置"</string>
     <string name="progress_scanning" msgid="192587958424295789">"搜尋中"</string>
     <string name="progress_tap_to_pair" msgid="4192342336107106334">"輕按即可配對"</string>
     <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"附近找不到藍牙裝置。"</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"藍牙配對要求"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"配對要求"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"選取即可與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 進行配對"</string>
-    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
-    <skip />
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"顯示已接收的檔案"</string>
     <string name="device_picker" msgid="8721012448931226323">"藍牙裝置選取器"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"藍牙權限要求"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"某個應用程式要求開啟藍牙功能，您想要允許要求嗎？"</string>
@@ -404,26 +395,17 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"藍牙"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"管理連線、設定裝置名稱與可偵測性"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"藍牙配對要求"</string>
-    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
-    <skip />
-    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
-    <skip />
-    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
-    <skip />
-    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
-    <skip />
-    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
-    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"如要與下列裝置配對：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;請輸入裝置要求的 PIN："</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"如要與下列裝置配對：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;請輸入裝置要求的密碼金鑰："</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN 中含有字母或符號"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"通常是 0000 或 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"您可能也必須在另一個裝置上輸入這個 PIN。"</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"您可能也必須在另一個裝置上輸入這個密碼金鑰。"</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"如要與下列裝置配對：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;請確認該裝置是否顯示下列密碼金鑰：&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"來自：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;要與這個裝置配對嗎？"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"如要與下列裝置配對：:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;請在該裝置上輸入：&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;，然後按 Return 或 Enter。"</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"配對"</string>
-    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"不要配對"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"取消"</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="6065697229258906937">"無法與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 進行配對，因為輸入的 PIN 或密碼金鑰有誤。"</string>
@@ -489,8 +471,7 @@
     <skip />
     <!-- no translation found for zeroclick_off_summary (2896320184904157018) -->
     <skip />
-    <!-- no translation found for zeroclick_label (6908892664706309626) -->
-    <skip />
+    <string name="zeroclick_label" msgid="6908892664706309626">"免點擊分享"</string>
     <!-- no translation found for zeroclick_explained (3953149564512166049) -->
     <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
@@ -572,24 +553,15 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"閘道"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"網路首碼長度"</string>
-    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
-    <skip />
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"設定點對點連線"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"裝置資訊"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Wi-Fi 保護設定"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"輸入 PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"記住這個連線"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"搜尋"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"建立群組"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"進階"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"可攜式 Wi-Fi 無線基地台"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"可攜式無線基地台 <xliff:g id="NETWORK_SSID">%1$s</xliff:g> 已啟用"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"可攜式 Wi-Fi 無線基地台發生錯誤"</string>
@@ -602,8 +574,7 @@
     <string name="ringtone_title" msgid="5379026328015343686">"電話鈴聲"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <!-- outdated translation 8741571721868253103 -->     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
-    <!-- no translation found for musicfx_title (3853457094486073206) -->
-    <skip />
+    <string name="musicfx_title" msgid="3853457094486073206">"音樂效果"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"鈴聲音量"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"靜音時震動"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"震動"</string>
@@ -1051,10 +1022,8 @@
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"因為 <xliff:g id="REASON">%1$s</xliff:g>，無法移動應用程式。"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"偏好的安裝位置"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"變更新應用程式在安裝時的偏好位置。"</string>
-    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
-    <skip />
-    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
-    <skip />
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"停用內建應用程式"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"停用內建的應用程式可能會造成其他應用程式運作不正常。您確定要這麼做嗎？"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"儲存空間使用量"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"查看應用程式所使用的儲存空間"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"正在運作的服務"</string>
@@ -1549,9 +1518,8 @@
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"警告"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"限制"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"移除的應用程式"</string>
-    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
-    <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"已接收 <xliff:g id="RECEIVED">%1$s</xliff:g>，已傳送 <xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"緊急電話"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"返回通話"</string>
@@ -1593,40 +1561,25 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"啟用系統 CA 憑證嗎？"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"停用系統 CA 憑證嗎？"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"永久移除使用者 CA 憑證嗎？"</string>
-    <!-- no translation found for accessibility_tutorial_title (7577630829320003070) -->
-    <skip />
+    <string name="accessibility_tutorial_title" msgid="7577630829320003070">"隨觸即唸教學課程"</string>
     <string name="accessibility_tutorial_next" msgid="5079911515520801099">"繼續"</string>
     <string name="accessibility_tutorial_back" msgid="2583933084111712540">"返回"</string>
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"完成"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"略過教學課程"</string>
-    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_1 (2465037336858060269) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_2_text_4 (5374753806314829405) -->
-    <skip />
-    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
-    <skip />
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"第 1 課：探索畫面"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="2465037336858060269">"開啟「隨觸即唸」功能後，您可以輕觸螢幕聆聽手指觸碰處的元件說明。例如，目前的畫面中含有應用程式的圖示，您可輕觸螢幕並四處滑動，找出其中一個應用程式。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"很好！請繼續用手指在螢幕上四處滑動，至少再找到一個圖示為止。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"如要啟用您觸碰的某個項目，請輕按即可。請滑動您的手指，直到找到 <xliff:g id="APP_NAME">%s</xliff:g> 的圖示為止，然後輕按該圖示一次，以啟用該項目。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"您的手指正輕觸 <xliff:g id="APP_NAME">%s</xliff:g> 圖示。輕按一下即可啟用圖示。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"您的手指移到了 <xliff:g id="APP_NAME">%s</xliff:g> 圖示上方，但馬上又移開。請在螢幕四處緩緩滑動您的手指，直到再次找到「瀏覽器」圖示為止。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"很好！如要前往下一課，請找到位於畫面右下角的 [<xliff:g id="NEXT">%s</xliff:g>] 按鈕並啟用該按鈕。"</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"第 2 課：使用兩隻手指捲動"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"如要捲動清單，您可使用兩指沿螢幕滑動。例如，目前畫面中的應用程式名稱清單可供上下捲動，因此首先請您將一隻手指四處滑動，嘗試找出清單中的幾個項目。"</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"很好！請繼續滑動您的手指，至少再找到一個項目。"</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"現在將兩指放在清單中的項目上並往上滑動。如果到達畫面頂端，請移開手指並放在清單的較下方，再繼續往上滑動。"</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"很好！請繼續向上滑動手指，進一步捲動清單。"</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="5374753806314829405">"您已完成教學課程。如要結束並返回「隨觸即唸」功能設定，請找出 [<xliff:g id="FINISH">%s</xliff:g>] 按鈕輕觸一下。"</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"拼字修正"</string>
     <!-- no translation found for current_backup_pw_prompt (8314880813545036591) -->
     <skip />
     <!-- no translation found for new_backup_pw_prompt (3491404828757901644) -->
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 46841a3..19d1705 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -2074,7 +2074,7 @@
     <skip />
     <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
     <skip />
-    <!-- no translation found for data_usage_total_during_range (4054704716100246458) -->
+    <!-- no translation found for data_usage_total_during_range (8958205082707733605) -->
     <skip />
     <!-- no translation found for cryptkeeper_emergency_call (198578731586097145) -->
     <skip />
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index ed4ebbb..f9138c2 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -155,7 +155,7 @@
         <item>Extremely Large</item>
     </string-array>
 
-    <string-array name="entryvalues_font_size">
+    <string-array name="entryvalues_font_size" translatable="false">
         <item>0.70</item>
         <item>0.85</item>
         <item>0.95</item>
@@ -350,10 +350,10 @@
 
     <!-- Discoverable mode timeout options -->
     <string-array name="bluetooth_visibility_timeout_entries">
-        <item>2 Minutes</item>
-        <item>5 Minutes</item>
-        <item>1 Hour</item>
-        <item>Never</item>
+        <item>2 minutes</item>
+        <item>5 minutes</item>
+        <item>1 hour</item>
+        <item>Never time out</item>
     </string-array>
 
     <!-- Match this with drawable.wifi_signal. --> <skip />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7315863..06869de 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -230,10 +230,20 @@
     <string name="bluetooth_disconnect_title">Disconnect?</string>
     <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
     <string name="bluetooth_disconnect_all_profiles">This will end your connection with:&lt;br>&lt;b><xliff:g id="device_name">%1$s</xliff:g>&lt;/b></string>
-    <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
-    <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected."</string>
-    <!-- Bluetooth settings.  Message when connected to a device -->
+
+    <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
+    <string name="bluetooth_disable_profile_title">Disable profile?</string>
+    <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_disable_profile_message">This will disable:&lt;br>&lt;b><xliff:g id="profile_name">%1$s</xliff:g>&lt;/b>&lt;br>&lt;br>From:&lt;br>&lt;b><xliff:g id="device_name">%2$s</xliff:g>&lt;/b></string>
+
+    <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
     <string name="bluetooth_connected">Connected</string>
+    <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+    <string name="bluetooth_connected_no_headset">Connected (no phone)</string>
+    <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+    <string name="bluetooth_connected_no_a2dp">Connected (no media)</string>
+    <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+    <string name="bluetooth_connected_no_headset_no_a2dp">Connected (no phone or media)</string>
     <!-- Bluetooth settings.  Message when a device is disconnected -->
     <string name="bluetooth_disconnected">Disconnected</string>
     <!-- Bluetooth settings.  Message when disconnecting from a device -->
@@ -242,12 +252,8 @@
     <string name="bluetooth_connecting">Connecting\u2026</string>
     <!-- Bluetooth settings.  Message when the device state is unknown -->
     <string name="bluetooth_unknown" />
-    <!--Bluetooth settings screen, summary text under individual Bluetooth devices when not paired yet -->
-    <string name="bluetooth_not_connected">Pair with this device</string>
     <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
     <string name="bluetooth_pairing">Pairing\u2026</string>
-    <!--Bluetooth settings screen, summary text under individual Bluetooth devices when paired with one -->
-    <string name="bluetooth_paired">Paired but not connected</string>
     <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
     <string name="bluetooth_device">Unnamed Bluetooth device</string>
     <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
@@ -332,7 +338,7 @@
 
     <!-- The option in the date-format picker for using the normal format
          called for by the user's locale. -->
-    <string name="normal_date_format">Normal (<xliff:g id="date" example="12-31-2009">%s</xliff:g>)</string>
+    <string name="normal_date_format">Regional (<xliff:g id="date" example="12-31-2009">%s</xliff:g>)</string>
 
     <!-- Label of preview text when tweaking font size -->
     <string name="display_preview_label">Preview:</string>
@@ -617,9 +623,9 @@
     <!-- Security Settings --><skip />
 
     <!-- Security settings screen, setting option name to change screen timeout -->
-    <string name="lock_after_timeout">Timeout</string>
+    <string name="lock_after_timeout">Automatically lock</string>
     <!-- Security settings screen, setting option summary to change screen timeout -->
-    <string name="lock_after_timeout_summary">Lock screen <xliff:g id="timeout_string">%1$s</xliff:g> after screen automatically turns off</string>
+    <string name="lock_after_timeout_summary">After <xliff:g id="timeout_string">%1$s</xliff:g> of sleep</string>
     <!-- Text shown next to checkbox for showing owner info on LockScreen [CHAR LIMIT=50]-->
     <string name="show_owner_info_on_lockscreen_label">Show owner info on lock screen</string>
     <!-- Text shown for title of owner info setting [CHAR LIMIT=20]-->
@@ -1011,15 +1017,17 @@
     <string name="bluetooth_connect_specific_profiles_title">Connect to\u2026</string>
 
     <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
-    <string name="bluetooth_profile_a2dp">Media</string>
+    <string name="bluetooth_profile_a2dp">Media audio</string>
     <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
-    <string name="bluetooth_profile_headset">Handsfree</string>
+    <string name="bluetooth_profile_headset">Phone audio</string>
     <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
-    <string name="bluetooth_profile_opp">Transfer</string>
+    <string name="bluetooth_profile_opp">File transfer</string>
     <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
-    <string name="bluetooth_profile_hid">Input Device</string>
-    <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile. [CHAR LIMIT=25]-->
+    <string name="bluetooth_profile_hid">Input device</string>
+    <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40]-->
     <string name="bluetooth_profile_pan">Internet access</string>
+    <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40]-->
+    <string name="bluetooth_profile_pan_nap">Internet connection sharing</string>
 
     <!-- Bluetooth settings.  Message for disconnecting from the A2DP profile. [CHAR LIMIT=80] -->
     <string name="bluetooth_disconnect_a2dp_profile"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from media audio.</string>
@@ -1034,10 +1042,8 @@
     <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
     <string name="bluetooth_disconnect_pan_nap_profile" product="default"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from sharing this phone\'s Internet connection.</string>
 
-    <!-- Bluetooth settings.  Connection options screen.  The title of the screen. -->
-    <string name="bluetooth_device_advanced_title"><xliff:g id="device_name">%1$s</xliff:g> options</string>
-    <!-- Bluetooth settings. Connection options screen. Title of device actions section. [CHAR LIMIT=30] -->
-    <string name="bluetooth_device_advanced_device_actions_title">Device actions</string>
+    <!-- Bluetooth settings.  Connection options screen.  The title of the screen. [CHAR LIMIT=40] -->
+    <string name="bluetooth_device_advanced_title">Paired Bluetooth device</string>
     <!-- Bluetooth settings.  Connection options screen.  The title of the checkbox that controls whether the device is in "online" mode or "offline" mode.  This essentially is the checkbox that controls whether any checks / unchecks on a profile should be applied immediately, or next time the device is connected. -->
     <string name="bluetooth_device_advanced_online_mode_title">Connect</string>
     <!-- Bluetooth settings.  Connection options screen.  The summary of the online mode checkbox.  This describes what the setting does in the context of the screen. -->
@@ -1045,7 +1051,7 @@
     <!-- Bluetooth settings.  Connection options screen.  The title of the header that is above all of the profiles. -->
     <string name="bluetooth_device_advanced_profile_header_title">Profiles</string>
     <!-- Bluetooth settings. Connection options screen. Title for option to rename the device. [CHAR LIMIT=30] -->
-    <string name="bluetooth_device_advanced_rename_device">Rename device</string>
+    <string name="bluetooth_device_advanced_rename_device">Rename</string>
     <!-- Bluetooth settings. Connection options screen. Title for checkbox to enable incoming file transfers [CHAR LIMIT=30] -->
     <string name="bluetooth_device_advanced_enable_opp_title">Allow incoming file transfers</string>
     <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
@@ -1516,9 +1522,9 @@
     <!-- Sound & display settings screen, setting option summary to change brightness -->
     <string name="brightness_summary">Adjust the brightness of the screen</string>
     <!-- Sound & display settings screen, setting option name to change screen timeout -->
-    <string name="screen_timeout">Timeout</string>
+    <string name="screen_timeout">Sleep</string>
     <!-- Sound & display settings screen, setting option summary to change screen timeout -->
-    <string name="screen_timeout_summary">Screen turns off automatically after <xliff:g id="timeout_description">%1$s</xliff:g></string>
+    <string name="screen_timeout_summary">After <xliff:g id="timeout_description">%1$s</xliff:g> of inactivity</string>
     <!-- Wallpaper settings title [CHAR LIMIT=30] -->
     <string name="wallpaper_settings_title">Wallpaper</string>
     <!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->
@@ -2987,7 +2993,7 @@
     <string name="gadget_toggle_bluetooth">Updating Bluetooth setting</string>
 
     <!-- Title of preference to enter the VPN settings activity -->
-    <string name="vpn_settings_title">VPN settings</string>
+    <string name="vpn_settings_title">VPN</string>
 
     <!-- Title of preference group for credential storage settings [CHAR LIMIT=30] -->
     <string name="credentials_title">Credential storage</string>
@@ -3465,7 +3471,7 @@
     <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
     <string name="data_usage_received_sent"><xliff:g id="received" example="128KB">%1$s</xliff:g> received, <xliff:g id="sent" example="1.3GB">%2$s</xliff:g> sent</string>
     <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
-    <string name="data_usage_total_during_range">Data usage: <xliff:g id="total" example="128KB">%1$s</xliff:g> between <xliff:g id="range" example="Jul 1 - Jul 31">%2$s</xliff:g></string>
+    <string name="data_usage_total_during_range">Data usage: <xliff:g id="total" example="128KB">%1$s</xliff:g> on <xliff:g id="range" example="Jul 1 - Jul 31">%2$s</xliff:g></string>
 
     <!-- Button at the bottom of the CryptKeeper screen to make an emergency call. -->
     <string name="cryptkeeper_emergency_call">Emergency call</string>
@@ -3521,7 +3527,7 @@
     <string name="vpn_connect_to">Connect to <xliff:g id="network" example="School">%s</xliff:g></string>
 
     <!-- Preference title for VPN settings. [CHAR LIMIT=40] -->
-    <string name="vpn_title">VPN settings</string>
+    <string name="vpn_title">VPN</string>
     <!-- Preference title to create a new VPN network. [CHAR LIMIT=40] -->
     <string name="vpn_create">Add VPN network</string>
     <!-- Menu item to edit a VPN network. [CHAR LIMIT=40] -->
diff --git a/res/xml/bluetooth_device_advanced.xml b/res/xml/bluetooth_device_advanced.xml
index 6610a69..8d2261c 100644
--- a/res/xml/bluetooth_device_advanced.xml
+++ b/res/xml/bluetooth_device_advanced.xml
@@ -15,12 +15,8 @@
 -->
 
 <PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <PreferenceCategory
-            android:key="title"
-            android:order="10"
-            android:title="@string/bluetooth_device_advanced_device_actions_title" />
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/bluetooth_device_advanced_title">
 
     <EditTextPreference
             android:key="rename_device"
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 40e1880..b6e73e6 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -54,9 +54,7 @@
         android:id="@+id/wireless_settings"
         android:title="@string/radio_controls_title"
         android:breadCrumbTitle="@string/wireless_networks_settings_title"
-        android:fragment="com.android.settings.WirelessSettings"
-        android:icon="@drawable/ic_settings_more_wireless" />
-
+        android:fragment="com.android.settings.WirelessSettings" />
 
     <!-- DEVICE -->
     <header android:title="@string/header_category_device" />
@@ -140,7 +138,7 @@
     <!-- Backup and reset -->
     <header
         android:fragment="com.android.settings.PrivacySettings"
-        android:icon="@drawable/ic_settings_privacy"
+        android:icon="@drawable/ic_settings_backup"
         android:title="@string/privacy_settings"
         android:id="@+id/privacy_settings" />
 
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index d5f0e6b..a13d6fc 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -21,7 +21,6 @@
 
     <com.android.settings.RingerVolumePreference
             android:key="ring_volume"
-            android:dependency="silent"
             android:title="@string/all_volume_title"
             android:dialogTitle="@string/all_volume_title"
             android:persistent="false"
@@ -37,7 +36,7 @@
             android:key="silent"
             android:title="@string/silent_mode_title"
             android:persistent="false"
-            android:disableDependentsState="true" />
+            />
 
     <Preference
             android:key="musicfx"
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 55f6254..9a34f2f 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -235,7 +235,7 @@
             Introduction(
                     R.string.lockpattern_recording_intro_header,
                     LeftButtonMode.Cancel, RightButtonMode.ContinueDisabled,
-                    R.string.lockpattern_recording_intro_footer, true),
+                    ID_EMPTY_MESSAGE, true),
             HelpScreen(
                     R.string.lockpattern_settings_help_how_to_record,
                     LeftButtonMode.Gone, RightButtonMode.Ok, ID_EMPTY_MESSAGE, false),
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 45793b1..bccc5a5 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -37,6 +37,9 @@
 import static android.net.NetworkTemplate.buildTemplateMobile4g;
 import static android.net.NetworkTemplate.buildTemplateMobileAll;
 import static android.net.NetworkTemplate.buildTemplateWifi;
+import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;
+import static android.text.format.DateUtils.FORMAT_SHOW_DATE;
+import static android.text.format.Time.TIMEZONE_UTC;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
 import android.animation.LayoutTransition;
@@ -57,6 +60,7 @@
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
 import android.net.ConnectivityManager;
 import android.net.INetworkPolicyManager;
 import android.net.INetworkStatsService;
@@ -78,7 +82,6 @@
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.text.format.Formatter;
-import android.text.format.Time;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -97,6 +100,7 @@
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.NumberPicker;
@@ -190,8 +194,8 @@
     private TextView mEmpty;
 
     private View mAppDetail;
-    private TextView mAppTitle;
-    private TextView mAppSubtitle;
+    private ImageView mAppIcon;
+    private ViewGroup mAppTitles;
     private Button mAppSettings;
 
     private LinearLayout mAppSwitches;
@@ -295,8 +299,8 @@
         {
             // bind app detail controls
             mAppDetail = mHeader.findViewById(R.id.app_detail);
-            mAppTitle = (TextView) mAppDetail.findViewById(R.id.app_title);
-            mAppSubtitle = (TextView) mAppDetail.findViewById(R.id.app_subtitle);
+            mAppIcon = (ImageView) mAppDetail.findViewById(R.id.app_icon);
+            mAppTitles = (ViewGroup) mAppDetail.findViewById(R.id.app_titles);
             mAppSwitches = (LinearLayout) mAppDetail.findViewById(R.id.app_switches);
 
             mAppSettings = (Button) mAppDetail.findViewById(R.id.app_settings);
@@ -643,6 +647,10 @@
      * depending on {@link #isAppDetailMode()}.
      */
     private void updateAppDetail() {
+        final Context context = getActivity();
+        final PackageManager pm = context.getPackageManager();
+        final LayoutInflater inflater = getActivity().getLayoutInflater();
+
         if (isAppDetailMode()) {
             mAppDetail.setVisibility(View.VISIBLE);
             mCycleAdapter.setChangeVisible(false);
@@ -658,8 +666,18 @@
         // remove warning/limit sweeps while in detail mode
         mChart.bindNetworkPolicy(null);
 
-        final PackageManager pm = getActivity().getPackageManager();
-        mAppTitle.setText(pm.getNameForUid(mUid));
+        // show icon and all labels appearing under this app
+        final UidDetail detail = resolveDetailForUid(context, mUid);
+        mAppIcon.setImageDrawable(detail.icon);
+
+        mAppTitles.removeAllViews();
+        if (detail.detailLabels != null) {
+            for (CharSequence label : detail.detailLabels) {
+                mAppTitles.addView(inflateAppTitle(inflater, mAppTitles, label));
+            }
+        } else {
+            mAppTitles.addView(inflateAppTitle(inflater, mAppTitles, detail.label));
+        }
 
         // enable settings button when package provides it
         // TODO: target torwards entire UID instead of just first package
@@ -693,7 +711,6 @@
 
         updateDetailData();
 
-        final Context context = getActivity();
         if (NetworkPolicyManager.isUidValidForPolicy(context, mUid) && !getRestrictBackground()
                 && isBandwidthControlEnabled()) {
             mAppRestrictView.setVisibility(View.VISIBLE);
@@ -814,7 +831,9 @@
         if (isNetworkPolicyModifiable()) {
             mDisableAtLimitView.setVisibility(View.VISIBLE);
             mDisableAtLimit.setChecked(policy != null && policy.limitBytes != LIMIT_DISABLED);
-            mChart.bindNetworkPolicy(policy);
+            if (!isAppDetailMode()) {
+                mChart.bindNetworkPolicy(policy);
+            }
 
         } else {
             // controls are disabled; don't bind warning/limit sweeps
@@ -998,11 +1017,6 @@
         if (isAppDetailMode()) {
             if (mDetailHistory != null) {
                 entry = mDetailHistory.getValues(start, end, now, null);
-
-                mAppSubtitle.setText(
-                        getString(R.string.data_usage_received_sent,
-                                Formatter.formatFileSize(context, entry.rxBytes),
-                                Formatter.formatFileSize(context, entry.txBytes)));
             } else {
                 entry = null;
             }
@@ -1015,12 +1029,11 @@
             // kick off loader for detailed stats
             getLoaderManager().restartLoader(LOADER_SUMMARY,
                     SummaryForAllUidLoader.buildArgs(mTemplate, start, end), mSummaryForAllUid);
-
         }
 
         final long totalBytes = entry != null ? entry.rxBytes + entry.txBytes : 0;
         final String totalPhrase = Formatter.formatFileSize(context, totalBytes);
-        final String rangePhrase = formatDateRange(context, start, end, null);
+        final String rangePhrase = formatDateRange(context, start, end, false);
 
         mUsageSummary.setText(
                 getString(R.string.data_usage_total_during_range, totalPhrase, rangePhrase));
@@ -1104,7 +1117,7 @@
         }
 
         public CycleItem(Context context, long start, long end) {
-            this.label = formatDateRange(context, start, end, Time.TIMEZONE_UTC);
+            this.label = formatDateRange(context, start, end, true);
             this.start = start;
             this.end = end;
         }
@@ -1119,14 +1132,11 @@
     private static final java.util.Formatter sFormatter = new java.util.Formatter(
             sBuilder, Locale.getDefault());
 
-    private static String formatDateRange(Context context, long start, long end, String timezone) {
-        synchronized (sBuilder) {
-            int flags = DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_ABBREV_MONTH;
-            if (Time.getJulianDay(start, 0) == Time.getJulianDay(end, 0)) {
-                // when times are on same day, include time detail
-                flags |= DateUtils.FORMAT_SHOW_TIME;
-            }
+    public static String formatDateRange(Context context, long start, long end, boolean utcTime) {
+        final int flags = FORMAT_SHOW_DATE | FORMAT_ABBREV_MONTH;
+        final String timezone = utcTime ? TIMEZONE_UTC : null;
 
+        synchronized (sBuilder) {
             sBuilder.setLength(0);
             return DateUtils
                     .formatDateRange(context, sFormatter, start, end, flags, timezone).toString();
@@ -1250,13 +1260,17 @@
 
             final Context context = parent.getContext();
 
+            final ImageView icon = (ImageView) convertView.findViewById(android.R.id.icon);
             final TextView title = (TextView) convertView.findViewById(android.R.id.title);
             final TextView summary = (TextView) convertView.findViewById(android.R.id.summary);
             final ProgressBar progress = (ProgressBar) convertView.findViewById(
                     android.R.id.progress);
 
             final AppUsageItem item = mItems.get(position);
-            title.setText(resolveLabelForUid(context, item.uid));
+            final UidDetail detail = resolveDetailForUid(context, item.uid);
+
+            icon.setImageDrawable(detail.icon);
+            title.setText(detail.label);
             summary.setText(Formatter.formatFileSize(context, item.total));
 
             final int percentTotal = mLargest != 0 ? (int) (item.total * 100 / mLargest) : 0;
@@ -1536,48 +1550,66 @@
         }
     }
 
+    public static class UidDetail {
+        public CharSequence label;
+        public CharSequence[] detailLabels;
+        public Drawable icon;
+    }
+
     /**
      * Resolve best descriptive label for the given UID.
      */
-    public static CharSequence resolveLabelForUid(Context context, int uid) {
+    public static UidDetail resolveDetailForUid(Context context, int uid) {
         final Resources res = context.getResources();
         final PackageManager pm = context.getPackageManager();
 
+        final UidDetail detail = new UidDetail();
+        detail.label = pm.getNameForUid(uid);
+        detail.icon = pm.getDefaultActivityIcon();
+
         // handle special case labels
         switch (uid) {
             case android.os.Process.SYSTEM_UID:
-                return res.getText(R.string.process_kernel_label);
+                detail.label = res.getString(R.string.process_kernel_label);
+                detail.icon = pm.getDefaultActivityIcon();
+                return detail;
             case TrafficStats.UID_REMOVED:
-                return res.getText(R.string.data_usage_uninstalled_apps);
+                detail.label = res.getString(R.string.data_usage_uninstalled_apps);
+                detail.icon = pm.getDefaultActivityIcon();
+                return detail;
         }
 
         // otherwise fall back to using packagemanager labels
         final String[] packageNames = pm.getPackagesForUid(uid);
         final int length = packageNames != null ? packageNames.length : 0;
 
-        CharSequence label = pm.getNameForUid(uid);
         try {
             if (length == 1) {
                 final ApplicationInfo info = pm.getApplicationInfo(packageNames[0], 0);
-                label = info.loadLabel(pm);
+                detail.label = info.loadLabel(pm).toString();
+                detail.icon = info.loadIcon(pm);
             } else if (length > 1) {
-                for (String packageName : packageNames) {
-                    final PackageInfo info = pm.getPackageInfo(packageName, 0);
-                    if (info.sharedUserLabel != 0) {
-                        label = pm.getText(packageName, info.sharedUserLabel, info.applicationInfo);
-                        if (!TextUtils.isEmpty(label)) {
-                            break;
-                        }
+                detail.detailLabels = new CharSequence[length];
+                for (int i = 0; i < length; i++) {
+                    final String packageName = packageNames[i];
+                    final PackageInfo packageInfo = pm.getPackageInfo(packageName, 0);
+                    final ApplicationInfo appInfo = pm.getApplicationInfo(packageName, 0);
+
+                    detail.detailLabels[i] = appInfo.loadLabel(pm).toString();
+                    if (packageInfo.sharedUserLabel != 0) {
+                        detail.label = pm.getText(packageName, packageInfo.sharedUserLabel,
+                                packageInfo.applicationInfo).toString();
+                        detail.icon = appInfo.loadIcon(pm);
                     }
                 }
             }
         } catch (NameNotFoundException e) {
         }
 
-        if (TextUtils.isEmpty(label)) {
-            label = Integer.toString(uid);
+        if (TextUtils.isEmpty(detail.label)) {
+            detail.label = Integer.toString(uid);
         }
-        return label;
+        return detail;
     }
 
     /**
@@ -1652,6 +1684,14 @@
         return view;
     }
 
+    private static View inflateAppTitle(
+            LayoutInflater inflater, ViewGroup root, CharSequence label) {
+        final TextView view = (TextView) inflater.inflate(
+                R.layout.data_usage_app_title, root, false);
+        view.setText(label);
+        return view;
+    }
+
     /**
      * Set {@link android.R.id#title} for a preference view inflated with
      * {@link #inflatePreference(LayoutInflater, ViewGroup, View)}.
diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index 129edee..a626903 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -28,6 +28,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.media.AudioManager;
+import android.media.AudioSystem;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
@@ -36,6 +37,7 @@
 import android.os.Parcelable;
 import android.preference.VolumePreference;
 import android.provider.Settings;
+import android.provider.Settings.System;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -164,10 +166,15 @@
             }
         }
 
+        final int silentableStreams = System.getInt(getContext().getContentResolver(),
+                System.MODE_RINGER_STREAMS_AFFECTED,
+                ((1 << AudioSystem.STREAM_NOTIFICATION) | (1 << AudioSystem.STREAM_RING)));
         // Register callbacks for mute/unmute buttons
         for (int i = 0; i < mCheckBoxes.length; i++) {
             ImageView checkbox = (ImageView) view.findViewById(CHECKBOX_VIEW_ID[i]);
-            checkbox.setOnClickListener(this);
+            if ((silentableStreams & (1 << SEEKBAR_TYPE[i])) != 0) {
+                checkbox.setOnClickListener(this);
+            }
             mCheckBoxes[i] = checkbox;
         }
 
@@ -182,8 +189,8 @@
                 public void onReceive(Context context, Intent intent) {
                     final String action = intent.getAction();
                     if (AudioManager.RINGER_MODE_CHANGED_ACTION.equals(action)) {
-                        mHandler.sendMessage(mHandler.obtainMessage(MSG_RINGER_MODE_CHANGED,
-                                intent.getIntExtra(AudioManager.EXTRA_RINGER_MODE, -1), 0));
+                        mHandler.sendMessage(mHandler.obtainMessage(MSG_RINGER_MODE_CHANGED, intent
+                                .getIntExtra(AudioManager.EXTRA_RINGER_MODE, -1), 0));
                     }
                 }
             };
@@ -222,7 +229,10 @@
     @Override
     public void onActivityStop() {
         super.onActivityStop();
-        cleanup();
+
+        for (SeekBarVolumizer vol : mSeekBarVolumizer) {
+            if (vol != null) vol.stopSample();
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 7efa15d..636799d 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -94,8 +94,7 @@
         final Activity activity = getActivity();
         mAirplaneModePreference = (CheckBoxPreference) findPreference(KEY_TOGGLE_AIRPLANE);
         CheckBoxPreference nfc = (CheckBoxPreference) findPreference(KEY_TOGGLE_NFC);
-        PreferenceScreen zeroclick = (PreferenceScreen)
-                findPreference(KEY_ZEROCLICK_SETTINGS);
+        PreferenceScreen zeroclick = (PreferenceScreen) findPreference(KEY_ZEROCLICK_SETTINGS);
 
         mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
         mNfcEnabler = new NfcEnabler(activity, nfc, zeroclick);
@@ -113,11 +112,18 @@
             // No bluetooth-dependent items in the list. Code kept in case one is added later.
         }
 
+        // Manually set dependencies for NFC when not toggleable.
+        if (toggleable == null || !toggleable.contains(Settings.System.RADIO_NFC)) {
+            findPreference(KEY_TOGGLE_NFC).setDependency(KEY_TOGGLE_AIRPLANE);
+            findPreference(KEY_ZEROCLICK_SETTINGS).setDependency(KEY_TOGGLE_AIRPLANE);
+        }
+
         // Remove NFC if its not available
         mNfcAdapter = NfcAdapter.getDefaultAdapter(activity);
         if (mNfcAdapter == null) {
             getPreferenceScreen().removePreference(nfc);
             getPreferenceScreen().removePreference(zeroclick);
+            mNfcEnabler = null;
         }
 
         // Remove Mobile Network Settings if it's a wifi-only device.
@@ -176,18 +182,8 @@
         super.onResume();
 
         mAirplaneModeEnabler.resume();
-        mNfcEnabler.resume();
-
-        if (mNfcAdapter != null) {
-            // Update zero-click subtitle
-            Preference zeroClick = getPreferenceScreen().
-                    findPreference(KEY_ZEROCLICK_SETTINGS);
-
-            if (mNfcAdapter.zeroClickEnabled()) {
-                zeroClick.setSummary(R.string.zeroclick_on_summary);
-            } else {
-                zeroClick.setSummary(R.string.zeroclick_off_summary);
-            }
+        if (mNfcEnabler != null) {
+            mNfcEnabler.resume();
         }
     }
 
@@ -196,7 +192,9 @@
         super.onPause();
 
         mAirplaneModeEnabler.pause();
-        mNfcEnabler.pause();
+        if (mNfcEnabler != null) {
+            mNfcEnabler.pause();
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/applications/ApplicationsState.java b/src/com/android/settings/applications/ApplicationsState.java
index 519c203..e0899cb 100644
--- a/src/com/android/settings/applications/ApplicationsState.java
+++ b/src/com/android/settings/applications/ApplicationsState.java
@@ -80,6 +80,8 @@
         final long id;
         String label;
         long size;
+        long internalSize;
+        long externalSize;
 
         boolean mounted;
         
@@ -155,7 +157,8 @@
         }
     };
 
-    public static final Comparator<AppEntry> SIZE_COMPARATOR = new Comparator<AppEntry>() {
+    public static final Comparator<AppEntry> SIZE_COMPARATOR
+            = new Comparator<AppEntry>() {
         private final Collator sCollator = Collator.getInstance();
         @Override
         public int compare(AppEntry object1, AppEntry object2) {
@@ -165,6 +168,28 @@
         }
     };
 
+    public static final Comparator<AppEntry> INTERNAL_SIZE_COMPARATOR
+            = new Comparator<AppEntry>() {
+        private final Collator sCollator = Collator.getInstance();
+        @Override
+        public int compare(AppEntry object1, AppEntry object2) {
+            if (object1.internalSize < object2.internalSize) return 1;
+            if (object1.internalSize > object2.internalSize) return -1;
+            return sCollator.compare(object1.label, object2.label);
+        }
+    };
+
+    public static final Comparator<AppEntry> EXTERNAL_SIZE_COMPARATOR
+            = new Comparator<AppEntry>() {
+        private final Collator sCollator = Collator.getInstance();
+        @Override
+        public int compare(AppEntry object1, AppEntry object2) {
+            if (object1.externalSize < object2.externalSize) return 1;
+            if (object1.externalSize > object2.externalSize) return -1;
+            return sCollator.compare(object1.label, object2.label);
+        }
+    };
+
     public static final AppFilter THIRD_PARTY_FILTER = new AppFilter() {
         public void init() {
         }
@@ -712,8 +737,10 @@
                                 entry.externalCodeSize = externalCodeSize;
                                 entry.externalDataSize = externalDataSize;
                                 entry.sizeStr = getSizeStr(entry.size);
-                                entry.internalSizeStr = getSizeStr(getTotalInternalSize(stats));
-                                entry.externalSizeStr = getSizeStr(getTotalExternalSize(stats));
+                                entry.internalSize = getTotalInternalSize(stats);
+                                entry.internalSizeStr = getSizeStr(entry.internalSize);
+                                entry.externalSize = getTotalExternalSize(stats);
+                                entry.externalSizeStr = getSizeStr(entry.externalSize);
                                 if (DEBUG) Log.i(TAG, "Set size of " + entry.label + " " + entry
                                         + ": " + entry.sizeStr);
                                 sizeChanged = true;
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 554ece3..68c942d 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -333,7 +333,17 @@
             }
             switch (mLastSortMode) {
                 case SORT_ORDER_SIZE:
-                    comparatorObj = ApplicationsState.SIZE_COMPARATOR;
+                    switch (mWhichSize) {
+                        case SIZE_INTERNAL:
+                            comparatorObj = ApplicationsState.INTERNAL_SIZE_COMPARATOR;
+                            break;
+                        case SIZE_EXTERNAL:
+                            comparatorObj = ApplicationsState.EXTERNAL_SIZE_COMPARATOR;
+                            break;
+                        default:
+                            comparatorObj = ApplicationsState.SIZE_COMPARATOR;
+                            break;
+                    }
                     break;
                 default:
                     comparatorObj = ApplicationsState.ALPHA_COMPARATOR;
diff --git a/src/com/android/settings/applications/RunningProcessesView.java b/src/com/android/settings/applications/RunningProcessesView.java
index 1f91c33..7c3ebb0 100644
--- a/src/com/android/settings/applications/RunningProcessesView.java
+++ b/src/com/android/settings/applications/RunningProcessesView.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.applications;
 
+import com.android.internal.util.MemInfoReader;
 import com.android.settings.R;
 
 import android.app.ActivityManager;
@@ -24,9 +25,7 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.os.StrictMode;
 import android.os.SystemClock;
-import android.os.SystemProperties;
 import android.preference.PreferenceActivity;
 import android.text.format.DateUtils;
 import android.text.format.Formatter;
@@ -42,7 +41,6 @@
 import android.widget.TextView;
 import android.widget.AbsListView.RecyclerListener;
 
-import java.io.FileInputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -51,9 +49,6 @@
         implements AdapterView.OnItemClickListener, RecyclerListener,
         RunningState.OnRefreshUiListener {
     
-    // Memory pages are 4K.
-    static final long PAGE_SIZE = 4*1024;
-    
     long SECONDARY_SERVER_MEM;
     
     final HashMap<View, ActiveItem> mActiveItems = new HashMap<View, ActiveItem>();
@@ -85,9 +80,9 @@
     long mLastAvailMemory = -1;
     
     Dialog mCurDialog;
-    
-    byte[] mBuffer = new byte[1024];
-    
+
+    MemInfoReader mMemInfoReader = new MemInfoReader();
+
     public static class ActiveItem {
         View mRootView;
         RunningState.BaseItem mItem;
@@ -304,71 +299,7 @@
             }
         }
     }
-    
-    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() {
-        // Permit disk reads here, as /proc/meminfo isn't really "on
-        // disk" and should be fast.  TODO: make BlockGuard ignore
-        // /proc/ and /sys/ files perhaps?
-        StrictMode.ThreadPolicy savedPolicy = StrictMode.allowThreadDiskReads();
-        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) {
-        } finally {
-            StrictMode.setThreadPolicy(savedPolicy);
-        }
-        return 0;
-    }
 
-    
     void refreshUi(boolean dataChanged) {
         if (dataChanged) {
             ServiceListAdapter adapter = (ServiceListAdapter)(mListView.getAdapter());
@@ -383,11 +314,13 @@
 
         // This is the amount of available memory until we start killing
         // background services.
-        long availMem = readAvailMem() - SECONDARY_SERVER_MEM;
+        mMemInfoReader.readMemInfo();
+        long availMem = mMemInfoReader.getFreeSize() + mMemInfoReader.getCachedSize()
+                - SECONDARY_SERVER_MEM;
         if (availMem < 0) {
             availMem = 0;
         }
-        
+
         synchronized (mState.mLock) {
             if (mLastNumBackgroundProcesses != mState.mNumBackgroundProcesses
                     || mLastBackgroundProcessMemory != mState.mBackgroundProcessMemory
@@ -395,10 +328,14 @@
                 mLastNumBackgroundProcesses = mState.mNumBackgroundProcesses;
                 mLastBackgroundProcessMemory = mState.mBackgroundProcessMemory;
                 mLastAvailMemory = availMem;
-                String sizeStr = Formatter.formatShortFileSize(getContext(),
-                        mLastAvailMemory + mLastBackgroundProcessMemory);
+                long freeMem = mLastAvailMemory + mLastBackgroundProcessMemory;
+                String sizeStr = Formatter.formatShortFileSize(getContext(), freeMem);
                 mBackgroundProcessText.setText(getResources().getString(
                         R.string.service_background_processes, sizeStr));
+                sizeStr = Formatter.formatShortFileSize(getContext(),
+                        mMemInfoReader.getTotalSize() - freeMem);
+                mForegroundProcessText.setText(getResources().getString(
+                        R.string.service_foreground_processes, sizeStr));
             }
             if (mLastNumForegroundProcesses != mState.mNumForegroundProcesses
                     || mLastForegroundProcessMemory != mState.mForegroundProcessMemory
@@ -408,15 +345,18 @@
                 mLastForegroundProcessMemory = mState.mForegroundProcessMemory;
                 mLastNumServiceProcesses = mState.mNumServiceProcesses;
                 mLastServiceProcessMemory = mState.mServiceProcessMemory;
+                /*
                 String sizeStr = Formatter.formatShortFileSize(getContext(),
                         mLastForegroundProcessMemory + mLastServiceProcessMemory);
                 mForegroundProcessText.setText(getResources().getString(
                         R.string.service_foreground_processes, sizeStr));
+                */
             }
             
-            float totalMem = availMem + mLastBackgroundProcessMemory
-                    + mLastForegroundProcessMemory + mLastServiceProcessMemory;
-            mColorBar.setRatios(mLastForegroundProcessMemory/totalMem,
+            float totalMem = mMemInfoReader.getTotalSize();
+            float totalShownMem = availMem + mLastBackgroundProcessMemory
+                    + mLastServiceProcessMemory;
+            mColorBar.setRatios((totalMem-totalShownMem)/totalMem,
                     mLastServiceProcessMemory/totalMem,
                     mLastBackgroundProcessMemory/totalMem);
         }
@@ -482,10 +422,10 @@
                 mAdapter.setShowBackground(false);
             }
         });
-        
-        // Magic!  Implementation detail!  Don't count on this!
-        SECONDARY_SERVER_MEM =
-            Integer.valueOf(SystemProperties.get("ro.SECONDARY_SERVER_MEM"))*PAGE_SIZE;
+
+        ActivityManager.MemoryInfo memInfo = new ActivityManager.MemoryInfo();
+        mAm.getMemoryInfo(memInfo);
+        SECONDARY_SERVER_MEM = memInfo.secondaryServerThreshold;
     }
     
     public void doPause() {
diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index 8ca17a5..552aa56 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -28,7 +28,6 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
 import android.content.res.Resources;
-import android.os.Debug;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
@@ -250,7 +249,9 @@
         ActivityManager.RunningAppProcessInfo mRunningProcessInfo;
         
         MergedItem mMergedItem;
-        
+
+        boolean mInteresting;
+
         // Purely for sorting.
         boolean mIsSystem;
         boolean mIsStarted;
@@ -388,8 +389,8 @@
             return changed;
         }
         
-        boolean updateSize(Context context, Debug.MemoryInfo mem, int curSeq) {
-            mSize = ((long)mem.getTotalPss()) * 1024;
+        boolean updateSize(Context context, long pss, int curSeq) {
+            mSize = pss * 1024;
             if (mCurSeq == curSeq) {
                 String sizeStr = Formatter.formatShortFileSize(
                         context, mSize);
@@ -616,7 +617,8 @@
             return true;
         }
         if ((pi.flags&ActivityManager.RunningAppProcessInfo.FLAG_PERSISTENT) == 0
-                && pi.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND
+                && pi.importance >= ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND
+                && pi.importance < ActivityManager.RunningAppProcessInfo.IMPORTANCE_CANT_SAVE_STATE
                 && pi.importanceReasonCode
                         == ActivityManager.RunningAppProcessInfo.REASON_UNKNOWN) {
             return true;
@@ -718,13 +720,16 @@
                     mInterestingProcesses.add(proc);
                 }
                 proc.mCurSeq = mSequence;
+                proc.mInteresting = true;
                 proc.ensureLabel(pm);
+            } else {
+                proc.mInteresting = false;
             }
             
             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();
@@ -756,7 +761,7 @@
         int NHP = mInterestingProcesses.size();
         for (int i=0; i<NHP; i++) {
             ProcessItem proc = mInterestingProcesses.get(i);
-            if (mRunningProcesses.get(proc.mPid) == null) {
+            if (!proc.mInteresting || mRunningProcesses.get(proc.mPid) == null) {
                 changed = true;
                 mInterestingProcesses.remove(i);
                 i--;
@@ -964,12 +969,12 @@
             for (int i=0; i<numProc; i++) {
                 pids[i] = mAllProcessItems.get(i).mPid;
             }
-            Debug.MemoryInfo[] mem = ActivityManagerNative.getDefault()
-                    .getProcessMemoryInfo(pids);
+            long[] pss = ActivityManagerNative.getDefault()
+                    .getProcessPss(pids);
             int bgIndex = 0;
             for (int i=0; i<pids.length; i++) {
                 ProcessItem proc = mAllProcessItems.get(i);
-                changed |= proc.updateSize(context, mem[i], mSequence);
+                changed |= proc.updateSize(context, pss[i], mSequence);
                 if (proc.mCurSeq == mSequence) {
                     serviceProcessMemory += proc.mSize;
                 } else if (proc.mRunningProcessInfo.importance >=
diff --git a/src/com/android/settings/bluetooth/A2dpProfile.java b/src/com/android/settings/bluetooth/A2dpProfile.java
index e8582f3..b7ba44d 100644
--- a/src/com/android/settings/bluetooth/A2dpProfile.java
+++ b/src/com/android/settings/bluetooth/A2dpProfile.java
@@ -138,14 +138,10 @@
         return ORDINAL;
     }
 
-    public int getNameResource() {
+    public int getNameResource(BluetoothDevice device) {
         return R.string.bluetooth_profile_a2dp;
     }
 
-    public int getDisconnectResource(BluetoothDevice device) {
-        return R.string.bluetooth_disconnect_a2dp_profile;
-    }
-
     public int getSummaryResourceForDevice(BluetoothDevice device) {
         int state = mService.getConnectionState(device);
         switch (state) {
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index 68180c6..c659f70 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -65,7 +65,9 @@
 
         mCachedDevice = cachedDevice;
 
-        setWidgetLayoutResource(R.layout.preference_bluetooth);
+        if (cachedDevice.getBondState() == BluetoothDevice.BOND_BONDED) {
+            setWidgetLayoutResource(R.layout.preference_bluetooth);
+        }
 
         mCachedDevice.registerCallback(this);
 
@@ -98,7 +100,17 @@
          */
         setTitle(mCachedDevice.getName());
 
-        setSummary(getConnectionSummary());
+        int summaryResId = getConnectionSummary();
+        if (summaryResId != 0) {
+            setSummary(summaryResId);
+        } else {
+            setSummary(null);   // empty summary for unpaired devices
+        }
+
+        int iconResId = getBtClassDrawable();
+        if (iconResId != 0) {
+            setIcon(iconResId);
+        }
 
         // Used to gray out the item
         setEnabled(!mCachedDevice.isBusy());
@@ -114,40 +126,16 @@
             setDependency("bt_checkbox");
         }
 
+        if (mCachedDevice.getBondState() == BluetoothDevice.BOND_BONDED) {
+            ImageView deviceDetails = (ImageView) view.findViewById(R.id.deviceDetails);
+            if (deviceDetails != null) {
+                deviceDetails.setOnClickListener(this);
+                deviceDetails.setTag(mCachedDevice);
+                deviceDetails.setAlpha(isEnabled() ? 255 : sDimAlpha);
+            }
+        }
+
         super.onBindView(view);
-
-        ImageView btClass = (ImageView) view.findViewById(android.R.id.icon);
-        btClass.setImageResource(getBtClassDrawable());
-        btClass.setAlpha(isEnabled() ? 255 : sDimAlpha);
-        btClass.setVisibility(View.VISIBLE);
-        ImageView deviceDetails = (ImageView) view.findViewById(R.id.deviceDetails);
-        if (mOnSettingsClickListener != null) {
-            deviceDetails.setOnClickListener(this);
-            deviceDetails.setTag(mCachedDevice);
-            deviceDetails.setAlpha(isEnabled() ? 255 : sDimAlpha);
-        } else { // Hide the settings icon and divider
-            deviceDetails.setVisibility(View.GONE);
-            View divider = view.findViewById(R.id.divider);
-            if (divider != null) {
-                divider.setVisibility(View.GONE);
-            }
-        }
-
-        LayoutInflater inflater = (LayoutInflater)
-                getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        ViewGroup profilesGroup = (ViewGroup) view.findViewById(R.id.profileIcons);
-        for (LocalBluetoothProfile profile : mCachedDevice.getProfiles()) {
-            int iconResource = profile.getDrawableResource(mCachedDevice.getBtClass());
-            if (iconResource != 0) {
-                Drawable icon = getContext().getResources().getDrawable(iconResource);
-                inflater.inflate(R.layout.profile_icon_small, profilesGroup, true);
-                ImageView imageView =
-                        (ImageView) profilesGroup.getChildAt(profilesGroup.getChildCount() - 1);
-                imageView.setImageDrawable(icon);
-                boolean profileEnabled = mCachedDevice.isConnectedProfile(profile);
-                imageView.setAlpha(profileEnabled ? 255 : sDimAlpha);
-            }
-        }
     }
 
     public void onClick(View v) {
@@ -224,22 +212,52 @@
     private int getConnectionSummary() {
         final CachedBluetoothDevice cachedDevice = mCachedDevice;
 
-        // if any profiles are connected or busy, return that status
+        boolean profileConnected = false;       // at least one profile is connected
+        boolean a2dpNotConnected = false;       // A2DP is preferred but not connected
+        boolean headsetNotConnected = false;    // Headset is preferred but not connected
+
         for (LocalBluetoothProfile profile : cachedDevice.getProfiles()) {
             int connectionStatus = cachedDevice.getProfileConnectionState(profile);
 
-            if (connectionStatus != BluetoothProfile.STATE_DISCONNECTED) {
-                return Utils.getConnectionStateSummary(connectionStatus);
+            switch (connectionStatus) {
+                case BluetoothProfile.STATE_CONNECTING:
+                case BluetoothProfile.STATE_DISCONNECTING:
+                    return Utils.getConnectionStateSummary(connectionStatus);
+
+                case BluetoothProfile.STATE_CONNECTED:
+                    profileConnected = true;
+                    break;
+
+                case BluetoothProfile.STATE_DISCONNECTED:
+                    if (profile.isProfileReady() && profile.isPreferred(cachedDevice.getDevice())) {
+                        if (profile instanceof A2dpProfile) {
+                            a2dpNotConnected = true;
+                        } else if (profile instanceof HeadsetProfile) {
+                            headsetNotConnected = true;
+                        }
+                    }
+                    break;
+            }
+        }
+
+        if (profileConnected) {
+            if (a2dpNotConnected && headsetNotConnected) {
+                return R.string.bluetooth_connected_no_headset_no_a2dp;
+            } else if (a2dpNotConnected) {
+                return R.string.bluetooth_connected_no_a2dp;
+            } else if (headsetNotConnected) {
+                return R.string.bluetooth_connected_no_headset;
+            } else {
+                return R.string.bluetooth_connected;
             }
         }
 
         switch (cachedDevice.getBondState()) {
-            case BluetoothDevice.BOND_BONDED:
-                return R.string.bluetooth_paired;
             case BluetoothDevice.BOND_BONDING:
                 return R.string.bluetooth_pairing;
+
+            case BluetoothDevice.BOND_BONDED:
             case BluetoothDevice.BOND_NONE:
-                return R.string.bluetooth_not_connected;
             default:
                 return 0;
         }
diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
old mode 100644
new mode 100755
index 6b654b5..babf1e2
--- a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
@@ -234,7 +234,7 @@
 
     void setNumberOfPairedDevices(int pairedDevices) {
         mNumberOfPairedDevices = pairedDevices;
-        setSummaryNotDiscoverable();
+        handleModeChanged(mLocalAdapter.getScanMode());
     }
 
     void handleModeChanged(int mode) {
diff --git a/src/com/android/settings/bluetooth/BluetoothEventManager.java b/src/com/android/settings/bluetooth/BluetoothEventManager.java
index 6f83766..9140b25 100644
--- a/src/com/android/settings/bluetooth/BluetoothEventManager.java
+++ b/src/com/android/settings/bluetooth/BluetoothEventManager.java
@@ -225,7 +225,7 @@
                 Log.w(TAG, "received ACTION_DISAPPEARED for an unknown device: " + device);
                 return;
             }
-            if (mDeviceManager.onDeviceDisappeared(cachedDevice)) {
+            if (CachedBluetoothDeviceManager.onDeviceDisappeared(cachedDevice)) {
                 synchronized (mCallbacks) {
                     for (BluetoothCallback callback : mCallbacks) {
                         callback.onDeviceDeleted(cachedDevice);
@@ -283,7 +283,7 @@
 
                     // if the device is undocked, remove it from the list as well
                     if (!device.getAddress().equals(getDockedDeviceAddress(context))) {
-                        mDeviceManager.onDeviceDisappeared(cachedDevice);
+                        cachedDevice.setVisible(false);
                     }
                 }
                 int reason = intent.getIntExtra(BluetoothDevice.EXTRA_REASON,
@@ -361,7 +361,7 @@
                 if (device != null && device.getBondState() == BluetoothDevice.BOND_NONE) {
                     CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
                     if (cachedDevice != null) {
-                        mDeviceManager.onDeviceDisappeared(cachedDevice);
+                        cachedDevice.setVisible(false);
                     }
                 }
             }
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
index 1cdd41a..940d8d0 100755
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -41,6 +41,7 @@
 import com.android.internal.app.AlertActivity;
 import com.android.internal.app.AlertController;
 import com.android.settings.R;
+import android.view.KeyEvent;
 
 /**
  * BluetoothPairingDialog asks the user to enter a PIN / Passkey / simple confirmation
@@ -340,6 +341,13 @@
         mDevice.cancelPairingUserInput();
     }
 
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            onCancel();
+        }
+        return super.onKeyDown(keyCode,event);
+    }
+
     public void onClick(DialogInterface dialog, int which) {
         switch (which) {
             case BUTTON_POSITIVE:
diff --git a/src/com/android/settings/bluetooth/BluetoothProfilePreference.java b/src/com/android/settings/bluetooth/BluetoothProfilePreference.java
deleted file mode 100644
index 8f6d0a2..0000000
--- a/src/com/android/settings/bluetooth/BluetoothProfilePreference.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.preference.Preference;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.ImageView;
-
-import com.android.settings.R;
-
-/**
- * BluetoothProfilePreference is the preference type used to display each profile for a
- * particular bluetooth device.
- */
-final class BluetoothProfilePreference extends Preference implements OnClickListener {
-
-//    private static final String TAG = "BluetoothProfilePreference";
-
-    private Drawable mProfileDrawable;
-    private boolean mExpanded;
-    private ImageView mProfileExpandView;
-    private final LocalBluetoothProfile mProfile;
-
-    private OnClickListener mOnExpandClickListener;
-
-    BluetoothProfilePreference(Context context, LocalBluetoothProfile profile) {
-        super(context);
-
-        mProfile = profile;
-
-        setWidgetLayoutResource(R.layout.preference_bluetooth_profile);
-        setExpanded(false);
-    }
-
-    public void setOnExpandClickListener(OnClickListener listener) {
-        mOnExpandClickListener = listener;
-    }
-
-    public void setExpanded(boolean expanded) {
-        mExpanded = expanded;
-        notifyChanged();
-    }
-
-    public boolean isExpanded() {
-        return mExpanded;
-    }
-
-    public void setProfileDrawable(Drawable drawable) {
-        mProfileDrawable = drawable;
-    }
-
-    @Override
-    protected void onBindView(View view) {
-        super.onBindView(view);
-
-        ImageView btProfile = (ImageView) view.findViewById(android.R.id.icon);
-        btProfile.setImageDrawable(mProfileDrawable);
-
-        mProfileExpandView = (ImageView) view.findViewById(R.id.profileExpand);
-        if (mProfile.isAutoConnectable()) {
-            mProfileExpandView.setOnClickListener(this);
-            mProfileExpandView.setTag(mProfile);
-            mProfileExpandView.setImageResource(mExpanded
-                    ? com.android.internal.R.drawable.expander_close_holo_dark
-                    : com.android.internal.R.drawable.expander_open_holo_dark);
-        } else {
-            mProfileExpandView.setVisibility(View.GONE);
-        }
-    }
-
-    public void onClick(View v) {
-        if (v == mProfileExpandView) {
-            if (mOnExpandClickListener != null) {
-                setExpanded(!mExpanded);
-                mOnExpandClickListener.onClick(v);
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 4b0db68..af21149 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -142,9 +142,11 @@
 
     @Override
     public void onResume() {
+        // resume BluetoothEnabler before calling super.onResume() so we don't get
+        // any onDeviceAdded() callbacks before setting up view in updateContent()
+        mBluetoothEnabler.resume();
         super.onResume();
 
-        mBluetoothEnabler.resume();
         if (mDiscoverableEnabler != null) {
             mDiscoverableEnabler.resume();
         }
@@ -246,6 +248,11 @@
                     mMyDevicePreference = new Preference(getActivity());
                 }
                 mMyDevicePreference.setTitle(mLocalAdapter.getName());
+                if (getResources().getBoolean(com.android.internal.R.bool.config_voice_capable)) {
+                    mMyDevicePreference.setIcon(R.drawable.ic_bt_cellphone);    // for phones
+                } else {
+                    mMyDevicePreference.setIcon(R.drawable.ic_bt_laptop);   // for tablets, etc.
+                }
                 mMyDevicePreference.setPersistent(false);
                 mMyDevicePreference.setEnabled(true);
                 preferenceScreen.addPreference(mMyDevicePreference);
@@ -337,13 +344,12 @@
             if (v.getTag() instanceof CachedBluetoothDevice) {
                 CachedBluetoothDevice device = (CachedBluetoothDevice) v.getTag();
 
-                Preference pref = new Preference(getActivity());
-                pref.setTitle(device.getName());
-                pref.setFragment(DeviceProfilesSettings.class.getName());
-                pref.getExtras().putParcelable(DeviceProfilesSettings.EXTRA_DEVICE,
-                        device.getDevice());
-                ((PreferenceActivity) getActivity()).onPreferenceStartFragment(
-                        BluetoothSettings.this, pref);
+                Bundle args = new Bundle(1);
+                args.putParcelable(DeviceProfilesSettings.EXTRA_DEVICE, device.getDevice());
+
+                ((PreferenceActivity) getActivity()).startPreferencePanel(
+                        DeviceProfilesSettings.class.getName(), args,
+                        R.string.bluetooth_device_advanced_title, null, null, 0);
             } else {
                 Log.w(TAG, "onClick() called for other View: " + v); // TODO remove
             }
diff --git a/src/com/android/settings/bluetooth/BluetoothVisibilityTimeoutFragment.java b/src/com/android/settings/bluetooth/BluetoothVisibilityTimeoutFragment.java
index dbdb052..7c518fb 100644
--- a/src/com/android/settings/bluetooth/BluetoothVisibilityTimeoutFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothVisibilityTimeoutFragment.java
@@ -53,7 +53,6 @@
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         return new AlertDialog.Builder(getActivity())
-                .setIcon(android.R.drawable.ic_dialog_info)
                 .setTitle(R.string.bluetooth_visibility_timeout)
                 .setSingleChoiceItems(R.array.bluetooth_visibility_timeout_entries,
                         mDiscoverableEnabler.getDiscoverableTimeoutIndex(), this)
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
index f293f50..b511cb3 100644
--- a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
@@ -26,7 +26,6 @@
  * CachedBluetoothDeviceManager manages the set of remote Bluetooth devices.
  */
 final class CachedBluetoothDeviceManager {
-//    private static final String TAG = "CachedBluetoothDeviceManager";
 
     private final List<CachedBluetoothDevice> mCachedDevices =
             new ArrayList<CachedBluetoothDevice>();
@@ -35,20 +34,9 @@
         return new ArrayList<CachedBluetoothDevice>(mCachedDevices);
     }
 
-    public boolean onDeviceDisappeared(CachedBluetoothDevice cachedDevice) {
+    public static boolean onDeviceDisappeared(CachedBluetoothDevice cachedDevice) {
         cachedDevice.setVisible(false);
-        return checkForDeviceRemoval(cachedDevice);
-    }
-
-    private boolean checkForDeviceRemoval(
-            CachedBluetoothDevice cachedDevice) {
-        if (cachedDevice.getBondState() == BluetoothDevice.BOND_NONE &&
-                !cachedDevice.isVisible()) {
-            // If device isn't paired, remove it altogether
-            mCachedDevices.remove(cachedDevice);
-            return true;  // dispatch device deleted
-        }
-        return false;
+        return cachedDevice.getBondState() == BluetoothDevice.BOND_NONE;
     }
 
     public void onDeviceNameUpdated(BluetoothDevice device) {
@@ -120,7 +108,6 @@
         for (int i = mCachedDevices.size() - 1; i >= 0; i--) {
             CachedBluetoothDevice cachedDevice = mCachedDevices.get(i);
             cachedDevice.setVisible(false);
-            checkForDeviceRemoval(cachedDevice);
         }
     }
 
diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
index 53bd33c..061f2c9 100644
--- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
+++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
@@ -128,7 +128,6 @@
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
             Preference preference) {
-
         if (KEY_BT_SCAN.equals(preference.getKey())) {
             mLocalAdapter.startScanning(true);
             return true;
diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
index cee2a53..a840982 100755
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 The Android Open Source Project
+ * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
+import android.text.Html;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -46,15 +47,12 @@
  * (or disconnected).
  */
 public final class DeviceProfilesSettings extends SettingsPreferenceFragment
-        implements CachedBluetoothDevice.Callback, Preference.OnPreferenceChangeListener,
-                View.OnClickListener {
+        implements CachedBluetoothDevice.Callback, Preference.OnPreferenceChangeListener {
     private static final String TAG = "DeviceProfilesSettings";
 
-    private static final String KEY_TITLE = "title";
     private static final String KEY_RENAME_DEVICE = "rename_device";
     private static final String KEY_PROFILE_CONTAINER = "profile_container";
     private static final String KEY_UNPAIR = "unpair";
-    //private static final String KEY_ALLOW_INCOMING = "allow_incoming";
 
     public static final String EXTRA_DEVICE = "device";
     private RenameEditTextPreference mRenameDeviceNamePref;
@@ -69,6 +67,8 @@
             = new HashMap<LocalBluetoothProfile, CheckBoxPreference>();
 
     private AlertDialog mDisconnectDialog;
+    private boolean mProfileGroupIsRemoved;
+
     private class RenameEditTextPreference implements TextWatcher{
         public void afterTextChanged(Editable s) {
             Dialog d = mDeviceNamePref.getDialog();
@@ -87,6 +87,7 @@
             // not used
         }
     }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -126,11 +127,6 @@
         mDeviceNamePref.setText(deviceName);
         mDeviceNamePref.setOnPreferenceChangeListener(this);
 
-        // Set the title of the screen
-        findPreference(KEY_TITLE).setTitle(
-                getString(R.string.bluetooth_device_advanced_title,
-                        deviceName));
-
         // Add a preference for each profile
         addPreferencesForProfiles();
     }
@@ -183,6 +179,18 @@
             Preference pref = createProfilePreference(profile);
             mProfileContainer.addPreference(pref);
         }
+        showOrHideProfileGroup();
+    }
+
+    private void showOrHideProfileGroup() {
+        int numProfiles = mProfileContainer.getPreferenceCount();
+        if (!mProfileGroupIsRemoved && numProfiles == 0) {
+            getPreferenceScreen().removePreference(mProfileContainer);
+            mProfileGroupIsRemoved = true;
+        } else if (mProfileGroupIsRemoved && numProfiles != 0) {
+            getPreferenceScreen().addPreference(mProfileContainer);
+            mProfileGroupIsRemoved = false;
+        }
     }
 
     /**
@@ -193,18 +201,17 @@
      * @return A preference that allows the user to choose whether this profile
      *         will be connected to.
      */
-    private Preference createProfilePreference(LocalBluetoothProfile profile) {
-        BluetoothProfilePreference pref = new BluetoothProfilePreference(getActivity(), profile);
+    private CheckBoxPreference createProfilePreference(LocalBluetoothProfile profile) {
+        CheckBoxPreference pref = new CheckBoxPreference(getActivity());
         pref.setKey(profile.toString());
-        pref.setTitle(profile.getNameResource());
-        pref.setExpanded(false);
+        pref.setTitle(profile.getNameResource(mCachedDevice.getDevice()));
         pref.setPersistent(false);
         pref.setOrder(getProfilePreferenceIndex(profile.getOrdinal()));
-        pref.setOnExpandClickListener(this);
+        pref.setOnPreferenceChangeListener(this);
 
         int iconResource = profile.getDrawableResource(mCachedDevice.getBtClass());
         if (iconResource != 0) {
-            pref.setProfileDrawable(getResources().getDrawable(iconResource));
+            pref.setIcon(getResources().getDrawable(iconResource));
         }
 
         /**
@@ -220,10 +227,7 @@
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
         String key = preference.getKey();
-        if (preference instanceof BluetoothProfilePreference) {
-            onProfileClicked(mProfileManager.getProfileByName(key));
-            return true;
-        } else if (key.equals(KEY_UNPAIR)) {
+        if (key.equals(KEY_UNPAIR)) {
             unpairDevice();
             finish();
             return true;
@@ -236,11 +240,9 @@
         if (preference == mDeviceNamePref) {
             mCachedDevice.setName((String) newValue);
         } else if (preference instanceof CheckBoxPreference) {
-            boolean autoConnect = (Boolean) newValue;
             LocalBluetoothProfile prof = getProfileOf(preference);
-            prof.setPreferred(mCachedDevice.getDevice(),
-                            autoConnect);
-            return true;
+            onProfileClicked(prof);
+            return false;   // checkbox will update from onDeviceAttributesChanged() callback
         } else {
             return false;
         }
@@ -258,6 +260,7 @@
         if (isConnected) {
             askDisconnect(getActivity(), profile);
         } else {
+            profile.setPreferred(device, true);
             mCachedDevice.connectProfile(profile);
         }
     }
@@ -270,22 +273,23 @@
         if (TextUtils.isEmpty(name)) {
             name = context.getString(R.string.bluetooth_device);
         }
-        int disconnectMessage = profile.getDisconnectResource(device.getDevice());
-        if (disconnectMessage == 0) {
-            Log.w(TAG, "askDisconnect: unexpected profile " + profile);
-            disconnectMessage = R.string.bluetooth_disconnect_blank;
-        }
-        String message = context.getString(disconnectMessage, name);
+
+        String profileName = context.getString(profile.getNameResource(device.getDevice()));
+
+        String title = context.getString(R.string.bluetooth_disable_profile_title);
+        String message = context.getString(R.string.bluetooth_disable_profile_message,
+                profileName, name);
 
         DialogInterface.OnClickListener disconnectListener =
                 new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int which) {
                 device.disconnect(profile);
+                profile.setPreferred(device.getDevice(), false);
             }
         };
 
         mDisconnectDialog = Utils.showDisconnectDialog(context,
-                mDisconnectDialog, disconnectListener, name, message);
+                mDisconnectDialog, disconnectListener, title, Html.fromHtml(message));
     }
 
     public void onDeviceAttributesChanged() {
@@ -294,15 +298,6 @@
 
     private void refresh() {
         String deviceName = mCachedDevice.getName();
-        // TODO: figure out how to update "bread crumb" title in action bar
-//        FragmentTransaction transaction = getFragmentManager().openTransaction();
-//        transaction.setBreadCrumbTitle(deviceName);
-//        transaction.commit();
-
-        findPreference(KEY_TITLE).setTitle(getString(
-                R.string.bluetooth_device_advanced_title,
-                deviceName));
-        mDeviceNamePref = (EditTextPreference) findPreference(KEY_RENAME_DEVICE);
         mDeviceNamePref.setSummary(deviceName);
         mDeviceNamePref.setText(deviceName);
 
@@ -311,7 +306,7 @@
 
     private void refreshProfiles() {
         for (LocalBluetoothProfile profile : mCachedDevice.getConnectableProfiles()) {
-            Preference profilePref = findPreference(profile.toString());
+            CheckBoxPreference profilePref = (CheckBoxPreference)findPreference(profile.toString());
             if (profilePref == null) {
                 profilePref = createProfilePreference(profile);
                 mProfileContainer.addPreference(profilePref);
@@ -326,15 +321,18 @@
                 mProfileContainer.removePreference(profilePref);
             }
         }
+        showOrHideProfileGroup();
     }
 
-    private void refreshProfilePreference(Preference profilePref, LocalBluetoothProfile profile) {
+    private void refreshProfilePreference(CheckBoxPreference profilePref,
+            LocalBluetoothProfile profile) {
         BluetoothDevice device = mCachedDevice.getDevice();
 
         /*
          * Gray out checkbox while connecting and disconnecting
          */
         profilePref.setEnabled(!mCachedDevice.isBusy());
+        profilePref.setChecked(mCachedDevice.isConnectedProfile(profile));
         profilePref.setSummary(profile.getSummaryResourceForDevice(device));
     }
 
@@ -352,32 +350,6 @@
         }
     }
 
-    public void onClick(View v) {
-        if (v.getTag() instanceof LocalBluetoothProfile) {
-            LocalBluetoothProfile prof = (LocalBluetoothProfile) v.getTag();
-            CheckBoxPreference autoConnectPref = mAutoConnectPrefs.get(prof);
-            if (autoConnectPref == null) {
-                autoConnectPref = new CheckBoxPreference(getActivity());
-                autoConnectPref.setLayoutResource(com.android.internal.R.layout.preference_child);
-                autoConnectPref.setKey(prof.toString());
-                autoConnectPref.setTitle(R.string.bluetooth_auto_connect);
-                autoConnectPref.setOrder(getProfilePreferenceIndex(prof.getOrdinal()) + 1);
-                autoConnectPref.setChecked(getAutoConnect(prof));
-                autoConnectPref.setOnPreferenceChangeListener(this);
-                mAutoConnectPrefs.put(prof, autoConnectPref);
-            }
-            BluetoothProfilePreference profilePref =
-                    (BluetoothProfilePreference) findPreference(prof.toString());
-            if (profilePref != null) {
-                if (profilePref.isExpanded()) {
-                    mProfileContainer.addPreference(autoConnectPref);
-                } else {
-                    mProfileContainer.removePreference(autoConnectPref);
-                }
-            }
-        }
-    }
-
     private int getProfilePreferenceIndex(int profIndex) {
         return mProfileContainer.getOrder() + profIndex * 10;
     }
@@ -386,18 +358,6 @@
         mCachedDevice.unpair();
     }
 
-    /*
-    private void setIncomingFileTransfersAllowed(boolean allow) {
-        // TODO: make an IPC call into BluetoothOpp to update
-        Log.d(TAG, "Set allow incoming = " + allow);
-    }
-
-    private boolean isIncomingFileTransfersAllowed() {
-        // TODO: get this value from BluetoothOpp ???
-        return true;
-    }
-    */
-
     private boolean getAutoConnect(LocalBluetoothProfile prof) {
         return prof.isPreferred(mCachedDevice.getDevice());
     }
diff --git a/src/com/android/settings/bluetooth/HeadsetProfile.java b/src/com/android/settings/bluetooth/HeadsetProfile.java
index 13dce33..99d070b 100644
--- a/src/com/android/settings/bluetooth/HeadsetProfile.java
+++ b/src/com/android/settings/bluetooth/HeadsetProfile.java
@@ -170,14 +170,10 @@
         return ORDINAL;
     }
 
-    public int getNameResource() {
+    public int getNameResource(BluetoothDevice device) {
         return R.string.bluetooth_profile_headset;
     }
 
-    public int getDisconnectResource(BluetoothDevice device) {
-        return R.string.bluetooth_disconnect_headset_profile;
-    }
-
     public int getSummaryResourceForDevice(BluetoothDevice device) {
         int state = mService.getConnectionState(device);
         switch (state) {
diff --git a/src/com/android/settings/bluetooth/HidProfile.java b/src/com/android/settings/bluetooth/HidProfile.java
index 13d3db9..920f4bb 100644
--- a/src/com/android/settings/bluetooth/HidProfile.java
+++ b/src/com/android/settings/bluetooth/HidProfile.java
@@ -112,14 +112,11 @@
         return ORDINAL;
     }
 
-    public int getNameResource() {
+    public int getNameResource(BluetoothDevice device) {
+        // TODO: distinguish between keyboard and mouse?
         return R.string.bluetooth_profile_hid;
     }
 
-    public int getDisconnectResource(BluetoothDevice device) {
-        return R.string.bluetooth_disconnect_hid_profile;
-    }
-
     public int getSummaryResourceForDevice(BluetoothDevice device) {
         int state = mService.getConnectionState(device);
         switch (state) {
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfile.java b/src/com/android/settings/bluetooth/LocalBluetoothProfile.java
index 878a032..8c0de95 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothProfile.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothProfile.java
@@ -54,15 +54,9 @@
 
     /**
      * Returns the string resource ID for the localized name for this profile.
+     * @param device the Bluetooth device (to distinguish between PAN roles)
      */
-    int getNameResource();
-
-    /**
-     * Returns the string resource ID for the disconnect confirmation text
-     * for this profile.
-     * @param device
-     */
-    int getDisconnectResource(BluetoothDevice device);
+    int getNameResource(BluetoothDevice device);
 
     /**
      * Returns the string resource ID for the summary text for this profile
diff --git a/src/com/android/settings/bluetooth/OppProfile.java b/src/com/android/settings/bluetooth/OppProfile.java
index eb5900e..7ee2ad1 100644
--- a/src/com/android/settings/bluetooth/OppProfile.java
+++ b/src/com/android/settings/bluetooth/OppProfile.java
@@ -75,14 +75,10 @@
         return ORDINAL;
     }
 
-    public int getNameResource() {
+    public int getNameResource(BluetoothDevice device) {
         return R.string.bluetooth_profile_opp;
     }
 
-    public int getDisconnectResource(BluetoothDevice device) {
-        return 0; // user must use notification to disconnect OPP transfer.
-    }
-
     public int getSummaryResourceForDevice(BluetoothDevice device) {
         return 0;   // OPP profile not displayed in UI
     }
diff --git a/src/com/android/settings/bluetooth/PanProfile.java b/src/com/android/settings/bluetooth/PanProfile.java
index 6cb1991..3db4a2b 100644
--- a/src/com/android/settings/bluetooth/PanProfile.java
+++ b/src/com/android/settings/bluetooth/PanProfile.java
@@ -112,15 +112,11 @@
         return ORDINAL;
     }
 
-    public int getNameResource() {
-        return R.string.bluetooth_profile_pan;
-    }
-
-    public int getDisconnectResource(BluetoothDevice device) {
+    public int getNameResource(BluetoothDevice device) {
         if (isLocalRoleNap(device)) {
-            return R.string.bluetooth_disconnect_pan_nap_profile;
+            return R.string.bluetooth_profile_pan_nap;
         } else {
-            return R.string.bluetooth_disconnect_pan_user_profile;
+            return R.string.bluetooth_profile_pan;
         }
     }
 
diff --git a/src/com/android/settings/inputmethod/InputMethodPreference.java b/src/com/android/settings/inputmethod/InputMethodPreference.java
index 21057a6..f490fd2 100644
--- a/src/com/android/settings/inputmethod/InputMethodPreference.java
+++ b/src/com/android/settings/inputmethod/InputMethodPreference.java
@@ -21,6 +21,7 @@
 
 import android.app.AlertDialog;
 import android.app.Fragment;
+import android.content.ActivityNotFoundException;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -102,7 +103,13 @@
                     new OnClickListener() {
                         @Override
                         public void onClick(View arg0) {
-                            mFragment.startActivity(mSettingsIntent);
+                            try {
+                                mFragment.startActivity(mSettingsIntent);
+                            } catch (ActivityNotFoundException e) {
+                                Log.d(TAG, "IME's Settings Activity Not Found: " + e);
+                                // If the IME's settings activity does not exist, we can just
+                                // do nothing...
+                            }
                         }
                     });
         }
diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java
index 99cf8f0..722787d 100644
--- a/src/com/android/settings/nfc/NfcEnabler.java
+++ b/src/com/android/settings/nfc/NfcEnabler.java
@@ -27,6 +27,8 @@
 import android.preference.PreferenceScreen;
 import android.util.Log;
 
+import com.android.settings.R;
+
 /**
  * NfcEnabler is a helper to manage the Nfc on/off checkbox preference. It is
  * turns on/off Nfc and ensures the summary of the preference reflects the
@@ -46,16 +48,13 @@
         @Override
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
-            if (NfcAdapter.ACTION_ADAPTER_STATE_CHANGE.equals(action)) {
-                handleNfcStateChanged(intent.getBooleanExtra(
-                    NfcAdapter.EXTRA_NEW_BOOLEAN_STATE,
-                    false));
+            if (NfcAdapter.ACTION_ADAPTER_STATE_CHANGED.equals(action)) {
+                handleNfcStateChanged(intent.getIntExtra(NfcAdapter.EXTRA_ADAPTER_STATE,
+                        NfcAdapter.STATE_OFF));
             }
         }
     };
 
-    private boolean mNfcState;
-
     public NfcEnabler(Context context, CheckBoxPreference checkBoxPreference,
             PreferenceScreen zeroclick) {
         mContext = context;
@@ -66,20 +65,20 @@
         if (mNfcAdapter == null) {
             // NFC is not supported
             mCheckbox.setEnabled(false);
+            mZeroClick.setEnabled(false);
+            mIntentFilter = null;
+            return;
         }
-
-        mIntentFilter = new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGE);
-
+        mIntentFilter = new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
     }
 
     public void resume() {
         if (mNfcAdapter == null) {
             return;
         }
+        handleNfcStateChanged(mNfcAdapter.getAdapterState());
         mContext.registerReceiver(mReceiver, mIntentFilter);
         mCheckbox.setOnPreferenceChangeListener(this);
-        mNfcState = mNfcAdapter.isEnabled();
-        mCheckbox.setChecked(mNfcState);
     }
 
     public void pause() {
@@ -96,41 +95,43 @@
         final boolean desiredState = (Boolean) value;
         mCheckbox.setEnabled(false);
 
-        // Start async update of the NFC adapter state, as the API is
-        // unfortunately blocking...
-        new Thread("toggleNFC") {
-            @Override
-            public void run() {
-                Log.d(TAG, "Setting NFC enabled state to: " + desiredState);
-                boolean success = false;
-                if (desiredState) {
-                    success = mNfcAdapter.enable();
-                } else {
-                    success = mNfcAdapter.disable();
-                }
-                if (success) {
-                    Log.d(TAG, "Successfully changed NFC enabled state to " + desiredState);
-                    mHandler.post(new Runnable() {
-                        public void run() {
-                            handleNfcStateChanged(desiredState);
-                        }
-                    });
-                } else {
-                    Log.w(TAG, "Error setting NFC enabled state to " + desiredState);
-                    mHandler.post(new Runnable() {
-                            public void run() {
-                                mCheckbox.setEnabled(true);
-                            }
-                        });
-                }
-            }
-        }.start();
+        if (desiredState) {
+            mNfcAdapter.enable();
+        } else {
+            mNfcAdapter.disable();
+        }
+
         return false;
     }
 
-    private void handleNfcStateChanged(boolean newState) {
-        mCheckbox.setChecked(newState);
-        mCheckbox.setEnabled(true);
-        mZeroClick.setEnabled(newState);
+    private void handleNfcStateChanged(int newState) {
+        switch (newState) {
+        case NfcAdapter.STATE_OFF:
+            mCheckbox.setChecked(false);
+            mCheckbox.setEnabled(true);
+            mZeroClick.setEnabled(false);
+            mZeroClick.setSummary(R.string.zeroclick_off_summary);
+            break;
+        case NfcAdapter.STATE_ON:
+            mCheckbox.setChecked(true);
+            mCheckbox.setEnabled(true);
+            mZeroClick.setEnabled(true);
+            if (mNfcAdapter.isZeroClickEnabled()) {
+                mZeroClick.setSummary(R.string.zeroclick_on_summary);
+            } else {
+                mZeroClick.setSummary(R.string.zeroclick_off_summary);
+            }
+            break;
+        case NfcAdapter.STATE_TURNING_ON:
+            mCheckbox.setChecked(true);
+            mCheckbox.setEnabled(false);
+            mZeroClick.setEnabled(false);
+            break;
+        case NfcAdapter.STATE_TURNING_OFF:
+            mCheckbox.setChecked(false);
+            mCheckbox.setEnabled(false);
+            mZeroClick.setEnabled(false);
+            break;
+        }
     }
 }
diff --git a/src/com/android/settings/nfc/ZeroClick.java b/src/com/android/settings/nfc/ZeroClick.java
index 5c67e52..1b59b52 100644
--- a/src/com/android/settings/nfc/ZeroClick.java
+++ b/src/com/android/settings/nfc/ZeroClick.java
@@ -63,7 +63,7 @@
         mActionBarSwitch.setOnCheckedChangeListener(this);
 
         mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
-        mActionBarSwitch.setChecked(mNfcAdapter.zeroClickEnabled());
+        mActionBarSwitch.setChecked(mNfcAdapter.isZeroClickEnabled());
     }
 
     @Override
@@ -77,7 +77,7 @@
     private void initView(View view) {
         mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
         mActionBarSwitch.setOnCheckedChangeListener(this);
-        mActionBarSwitch.setChecked(mNfcAdapter.zeroClickEnabled());
+        mActionBarSwitch.setChecked(mNfcAdapter.isZeroClickEnabled());
     }
 
     @Override
diff --git a/src/com/android/settings/vpn2/VpnDialog.java b/src/com/android/settings/vpn2/VpnDialog.java
index c1a4531..cce5e2d 100644
--- a/src/com/android/settings/vpn2/VpnDialog.java
+++ b/src/com/android/settings/vpn2/VpnDialog.java
@@ -213,7 +213,6 @@
         // First, hide everything.
         mMppe.setVisibility(View.GONE);
         mView.findViewById(R.id.l2tp).setVisibility(View.GONE);
-        mView.findViewById(R.id.ipsec_id).setVisibility(View.GONE);
         mView.findViewById(R.id.ipsec_psk).setVisibility(View.GONE);
         mView.findViewById(R.id.ipsec_user).setVisibility(View.GONE);
         mView.findViewById(R.id.ipsec_ca).setVisibility(View.GONE);
@@ -223,12 +222,11 @@
             case VpnProfile.TYPE_PPTP:
                 mMppe.setVisibility(View.VISIBLE);
                 break;
+
             case VpnProfile.TYPE_L2TP_IPSEC_PSK:
                 mView.findViewById(R.id.l2tp).setVisibility(View.VISIBLE);
-                mView.findViewById(R.id.ipsec_psk).setVisibility(View.VISIBLE);
-                break;
+                // fall through
             case VpnProfile.TYPE_IPSEC_XAUTH_PSK:
-                mView.findViewById(R.id.ipsec_id).setVisibility(View.VISIBLE);
                 mView.findViewById(R.id.ipsec_psk).setVisibility(View.VISIBLE);
                 break;
 
@@ -255,6 +253,7 @@
         }
         switch (mType.getSelectedItemPosition()) {
             case VpnProfile.TYPE_PPTP:
+            case VpnProfile.TYPE_IPSEC_HYBRID_RSA:
                 return true;
 
             case VpnProfile.TYPE_L2TP_IPSEC_PSK:
@@ -343,10 +342,10 @@
             case VpnProfile.TYPE_PPTP:
                 profile.mppe = mMppe.isChecked();
                 break;
+
             case VpnProfile.TYPE_L2TP_IPSEC_PSK:
                 profile.l2tpSecret = mL2tpSecret.getText().toString();
-                profile.ipsecSecret = mIpsecSecret.getText().toString();
-                break;
+                // fall through
             case VpnProfile.TYPE_IPSEC_XAUTH_PSK:
                 profile.ipsecIdentifier = mIpsecIdentifier.getText().toString();
                 profile.ipsecSecret = mIpsecSecret.getText().toString();
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 5fe6426..0197333 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -53,7 +53,6 @@
         DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
 
     private static final String TAG = "VpnSettings";
-    private static final String SCRIPT = "/etc/ppp/ip-up-vpn";
 
     private final IConnectivityManager mService = IConnectivityManager.Stub
             .asInterface(ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
@@ -171,7 +170,9 @@
         }
 
         // Unregister for context menu.
-        unregisterForContextMenu(getListView());
+        if (getView() != null) {
+            unregisterForContextMenu(getListView());
+        }
     }
 
     @Override
@@ -373,7 +374,8 @@
         switch (profile.type) {
             case VpnProfile.TYPE_L2TP_IPSEC_PSK:
                 racoon = new String[] {
-                    interfaze, profile.server, "udppsk", profile.ipsecSecret, "1701",
+                    interfaze, profile.server, "udppsk", profile.ipsecIdentifier,
+                    profile.ipsecSecret, "1701",
                 };
                 break;
             case VpnProfile.TYPE_L2TP_IPSEC_RSA:
@@ -384,19 +386,19 @@
             case VpnProfile.TYPE_IPSEC_XAUTH_PSK:
                 racoon = new String[] {
                     interfaze, profile.server, "xauthpsk", profile.ipsecIdentifier,
-                    profile.ipsecSecret, profile.username, profile.password, SCRIPT, gateway,
+                    profile.ipsecSecret, profile.username, profile.password, "", gateway,
                 };
                 break;
             case VpnProfile.TYPE_IPSEC_XAUTH_RSA:
                 racoon = new String[] {
                     interfaze, profile.server, "xauthrsa", privateKey, userCert, caCert,
-                    profile.username, profile.password, SCRIPT, gateway,
+                    profile.username, profile.password, "", gateway,
                 };
                 break;
             case VpnProfile.TYPE_IPSEC_HYBRID_RSA:
                 racoon = new String[] {
                     interfaze, profile.server, "hybridrsa", caCert,
-                    profile.username, profile.password, SCRIPT, gateway,
+                    profile.username, profile.password, "", gateway,
                 };
                 break;
         }
diff --git a/src/com/android/settings/widget/ChartGridView.java b/src/com/android/settings/widget/ChartGridView.java
index 7a83fbf..c2702e4 100644
--- a/src/com/android/settings/widget/ChartGridView.java
+++ b/src/com/android/settings/widget/ChartGridView.java
@@ -17,12 +17,20 @@
 package com.android.settings.widget;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
+import android.text.Layout;
+import android.text.StaticLayout;
+import android.text.TextPaint;
 import android.util.AttributeSet;
+import android.util.TypedValue;
 import android.view.View;
 
+import com.android.settings.DataUsageSummary;
 import com.android.settings.R;
 import com.google.common.base.Preconditions;
 
@@ -32,14 +40,16 @@
  */
 public class ChartGridView extends View {
 
-    // TODO: eventually teach about drawing chart labels
-
     private ChartAxis mHoriz;
     private ChartAxis mVert;
 
     private Drawable mPrimary;
     private Drawable mSecondary;
     private Drawable mBorder;
+    private int mLabelColor;
+
+    private Layout mLayoutStart;
+    private Layout mLayoutEnd;
 
     public ChartGridView(Context context) {
         this(context, null, 0);
@@ -60,7 +70,7 @@
         mPrimary = a.getDrawable(R.styleable.ChartGridView_primaryDrawable);
         mSecondary = a.getDrawable(R.styleable.ChartGridView_secondaryDrawable);
         mBorder = a.getDrawable(R.styleable.ChartGridView_borderDrawable);
-        // TODO: eventually read labelColor
+        mLabelColor = a.getColor(R.styleable.ChartGridView_labelColor, Color.RED);
 
         a.recycle();
     }
@@ -70,6 +80,13 @@
         mVert = Preconditions.checkNotNull(vert, "missing vert");
     }
 
+    void setBounds(long start, long end) {
+        final Context context = getContext();
+        mLayoutStart = makeLayout(DataUsageSummary.formatDateRange(context, start, start, true));
+        mLayoutEnd = makeLayout(DataUsageSummary.formatDateRange(context, end, end, true));
+        invalidate();
+    }
+
     @Override
     protected void onDraw(Canvas canvas) {
         final int width = getWidth();
@@ -98,5 +115,38 @@
 
         mBorder.setBounds(0, 0, width, height);
         mBorder.draw(canvas);
+
+        final int padding = mLayoutStart.getHeight() / 8;
+
+        final Layout start = mLayoutStart;
+        if (start != null) {
+            canvas.save();
+            canvas.translate(0, height + padding);
+            start.draw(canvas);
+            canvas.restore();
+        }
+
+        final Layout end = mLayoutEnd;
+        if (end != null) {
+            canvas.save();
+            canvas.translate(width - end.getWidth(), height + padding);
+            end.draw(canvas);
+            canvas.restore();
+        }
     }
+
+    private Layout makeLayout(CharSequence text) {
+        final Resources res = getResources();
+        final TextPaint paint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
+        paint.density = res.getDisplayMetrics().density;
+        paint.setCompatibilityScaling(res.getCompatibilityInfo().applicationScale);
+        paint.setColor(mLabelColor);
+        paint.setTextSize(
+                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 10, res.getDisplayMetrics()));
+
+        return new StaticLayout(text, paint,
+                (int) Math.ceil(Layout.getDesiredWidth(text, paint)),
+                Layout.Alignment.ALIGN_NORMAL, 1.f, 0, true);
+    }
+
 }
diff --git a/src/com/android/settings/widget/ChartSweepView.java b/src/com/android/settings/widget/ChartSweepView.java
index b5e044f..d5e8de8 100644
--- a/src/com/android/settings/widget/ChartSweepView.java
+++ b/src/com/android/settings/widget/ChartSweepView.java
@@ -29,7 +29,6 @@
 import android.text.SpannableStringBuilder;
 import android.text.TextPaint;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.util.MathUtils;
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/src/com/android/settings/widget/DataUsageChartView.java b/src/com/android/settings/widget/DataUsageChartView.java
index b2ad844..a1c92e1 100644
--- a/src/com/android/settings/widget/DataUsageChartView.java
+++ b/src/com/android/settings/widget/DataUsageChartView.java
@@ -343,6 +343,7 @@
      */
     public void setVisibleRange(long visibleStart, long visibleEnd) {
         mHoriz.setBounds(visibleStart, visibleEnd);
+        mGrid.setBounds(visibleStart, visibleEnd);
 
         final long validStart = Math.max(visibleStart, getStatsStart());
         final long validEnd = Math.min(visibleEnd, getStatsEnd());
diff --git a/tests/res/drawable/ic_settings_applications.png b/tests/res/drawable/ic_settings_applications.png
new file mode 100755
index 0000000..5cea33f
--- /dev/null
+++ b/tests/res/drawable/ic_settings_applications.png
Binary files differ