Import revised translations.

Change-Id: I989beece90deec6abb2542697d06caf88ae2f4a9
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index ed968cd..636afa6 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -252,35 +252,46 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Select date format"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sort alphabetically"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sort by time zone"</string>
-    <string name="lock_after_timeout" msgid="9100576335787336455">"Lock device after timeout"</string>
-    <string name="lock_after_timeout_summary" msgid="5751027735105958453">"Adjust the delay before the device locks automatically"</string>
+    <string name="date_picker_title" msgid="1338210036394128512">"Date"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Time"</string>
+    <!-- outdated translation 9100576335787336455 -->     <string name="lock_after_timeout" msgid="940509402681580537">"Lock device after timeout"</string>
+    <!-- no translation found for lock_after_timeout_summary (4726009794344934278) -->
+    <skip />
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Show owner info on lock screen"</string>
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Owner info"</string>
-    <string name="owner_info_settings_summary" msgid="8656024590287117256">"Set or disable showing owner info on lock screen"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Enter text to display on the lock screen"</string>
     <string name="security_settings_title" msgid="5168491784222013179">"Location &amp; security"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"Location &amp; security settings"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Set My Location, screen unlock, credential storage lock"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passwords"</string>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Screen-unlock security"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Set up screen lock"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Lock screen with a pattern, PIN or password"</string>
+    <!-- outdated translation 3973555216065628262 -->     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Screen-unlock security"</string>
+    <!-- outdated translation 1129684221223017902 -->     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Set up screen lock"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Change screen lock"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Change or disable pattern, PIN or password security"</string>
-    <string name="unlock_set_unlock_launch_picker_enable_title" msgid="6781842145908947514">"Enable screen lock"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Choose a method to lock the screen"</string>
     <string name="unlock_set_unlock_off_title" msgid="1613932765246180079">"Off"</string>
-    <string name="unlock_set_unlock_off_summary" msgid="2992485517488881365">"Don\'t show the lock screen"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"None"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Disable screen-unlock security"</string>
+    <!-- outdated translation 2992485517488881365 -->     <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"Don\'t show the lock screen"</string>
+    <!-- outdated translation 3760684669884671990 -->     <string name="unlock_set_unlock_none_title" msgid="5165705762615690332">"None"</string>
+    <!-- outdated translation 2658550480388272618 -->     <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Disable screen-unlock security"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Pattern"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Draw pattern to unlock screen"</string>
+    <!-- outdated translation 3018395214738645405 -->     <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Draw pattern to unlock screen"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Enter a numeric PIN to unlock screen"</string>
+    <!-- outdated translation 4131169672844263316 -->     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Enter a numeric PIN to unlock screen"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Enter a password to unlock screen"</string>
+    <!-- outdated translation 4623254789833899286 -->     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Enter a password to unlock screen"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Disabled by remote device administrator"</string>
+    <!-- no translation found for unlock_set_unlock_mode_off (378729687629105388) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_none (7953821968316697309) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_pattern (464022606293547390) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_pin (1379365142708807163) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_password (6955742995327081060) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Turn off screen lock"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Remove unlock pattern"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remove unlock PIN"</string>
@@ -346,7 +357,8 @@
     <skip />
     <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>DEVICE_NAMEPASSKEY<xliff:g id="PASSKEY">%2$s</xliff:g>"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"wants to pair."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Enter <xliff:g id="PASSKEY">%2$s</xliff:g> on \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" to pair."</string>
+    <!-- no translation found for bluetooth_display_passkey_pin_msg (9139892462102104755) -->
+    <skip />
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Pair"</string>
     <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Don\'t Pair"</string>
     <string name="bluetooth_remote_device" msgid="2406662802908395389">"Bluetooth device"</string>
@@ -486,7 +498,7 @@
     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> portable Wi-Fi hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android Hotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Sound"</string>
-    <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
+    <!-- outdated translation 1708697328627382561 -->     <string name="display_settings_title" msgid="2378894265964357591">"Display"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Sound settings"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Silent mode"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"All sounds except media &amp; alarms"</string>
@@ -557,8 +569,9 @@
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Switch orientation automatically when rotating phone"</string>
     <string name="brightness" msgid="2354961343555249270">"Brightness"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Adjust the brightness of the screen"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Screen timeout"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Adjust the delay before the screen turns off automatically"</string>
+    <!-- outdated translation 4882669461447531301 -->     <string name="screen_timeout" msgid="6962654593018319466">"Screen timeout"</string>
+    <!-- no translation found for screen_timeout_summary (4471347210332380587) -->
+    <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM card lock settings"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Set up SIM card lock"</string>
@@ -595,7 +608,8 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Not available"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"phone number, signal, etc."</string>
+    <!-- outdated translation 1393072115751923019 -->     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"IMEI, phone number, signal, etc."</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"phone number, signal, etc."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Storage"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Storage settings"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Unmount USB storage, view available storage"</string>
@@ -767,9 +781,9 @@
     <string name="assisted_gps" msgid="4649317129586736885">"Use assisted GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Use server to assist GPS (un-tick to reduce network usage)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Use server to assist GPS (un-tick to improve GPS performance)"</string>
-    <string name="use_location_title" msgid="3214740644957841179">"Use location for Google search"</string>
-    <string name="use_location_summary_disabled" msgid="1876901471649359806">"Use location for Google search and other Google services"</string>
-    <string name="use_location_summary_enabled" msgid="984549156918597265">"Location used to improve Google search results and other Google services"</string>
+    <!-- outdated translation 3214740644957841179 -->     <string name="use_location_title" msgid="3659340070401464551">"Use location for Google search"</string>
+    <!-- outdated translation 1876901471649359806 -->     <string name="use_location_summary_disabled" msgid="6518008620918354403">"Use location for Google search and other Google services"</string>
+    <!-- outdated translation 984549156918597265 -->     <string name="use_location_summary_enabled" msgid="8110246289085796179">"Location used to improve Google search results and other Google services"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"About tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"About phone"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"View legal info, status, software version"</string>
@@ -789,21 +803,18 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"You do not have a data connection. To view this information now, go to %s from any computer connected to the Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Loading…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Choose your password"</string>
-    <!-- no translation found for lockpassword_choose_your_pattern_header (6949761069941694050) -->
-    <skip />
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Choose your pattern"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Choose your PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirm your password"</string>
-    <!-- no translation found for lockpassword_confirm_your_pattern_header (7543433733032330821) -->
-    <skip />
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirm your PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Passwords don\'t match"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PINs don\'t match"</string>
-    <!-- no translation found for lockpassword_choose_lock_generic_header (3811438094903786145) -->
-    <skip />
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Unlock selection"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"password has been set"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN has been set"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Pattern has been set"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Screen unlock"</string>
+    <!-- outdated translation 975088518210629938 -->     <string name="lock_settings_title" msgid="8943058958424073651">"Screen unlock"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Change unlock pattern"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Change unlock PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirm saved pattern"</string>
@@ -1013,11 +1024,10 @@
     <skip />
     <!-- no translation found for active_input_method_subtypes (3596398805424733238) -->
     <skip />
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Manage text input options"</string>
+    <!-- no translation found for use_system_language_to_select_input_method_subtypes (3346751753141428573) -->
+    <skip />
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> Settings"</string>
     <!-- outdated translation 6850705060511001699 -->     <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Manage Input Methods"</string>
-    <!-- no translation found for input_methods_and_subtype_enabler_title_format (5513389679127310099) -->
-    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"On-screen keyboard settings"</string>
     <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Built-in keyboard"</string>
     <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Built-in, physical keyboard settings"</string>
@@ -1307,10 +1317,8 @@
     <string name="personal_data_section_title" msgid="7815209034443782061">"personal data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Back up my data"</string>
     <string name="backup_data_summary" msgid="6515285107793232815">"Back up application data, Wi-Fi passwords and other settings, to Google servers"</string>
-    <!-- no translation found for backup_configure_account_title (3790872965773196615) -->
-    <skip />
-    <!-- no translation found for backup_configure_account_default_summary (2436933224764745553) -->
-    <skip />
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Backup account"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"No account is currently storing backed up data"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatic restore"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"If I reinstall an application, restore backed-up settings or other data"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Backup"</string>
@@ -1330,7 +1338,7 @@
     <string name="sound_category_calls_title" msgid="3688531959256239012">"Incoming calls"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notifications"</string>
     <string name="sound_category_feedback_title" msgid="4399742321363475393">"Feedback"</string>
-    <string name="wifi_setup_title" msgid="3130584822275278425">"Wi-Fi setup"</string>
+    <!-- outdated translation 3130584822275278425 -->     <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi setup"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Not connected"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Add network"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Refresh list"</string>
@@ -1346,16 +1354,13 @@
     <!-- no translation found for wifi_setup_status_select_network (7519563569903137003) -->
     <skip />
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Connect to existing network"</string>
-    <!-- no translation found for wifi_setup_status_unsecured_network (8143046977328718252) -->
-    <skip />
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Connect to unsecured network"</string>
     <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Enter network configuration"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Connect to new network"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Connecting..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Proceed to the next step"</string>
-    <!-- no translation found for wifi_setup_status_eap_not_supported (3196386445567501484) -->
-    <skip />
-    <!-- no translation found for wifi_setup_eap_not_supported (5083895763075722698) -->
-    <skip />
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP not supported"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="5083895763075722698">"You can\'t configure an EAP Wi-Fi connection during setup. After setup, you can do that in Settings, under Wireless &amp; Networks."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Sync settings"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Sync is currently experiencing problems. It will be back shortly."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Add account"</string>