Import revised translations.

Change-Id: Ia9338cf200345ea00eb0179ca06770a9c47c16d8
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 79ae316..ac54ad7 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -122,6 +122,8 @@
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"您平板电脑上的某一应用程序正在请求相应权限,以便打开蓝牙,从而让其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的平板电脑。要授予该权限吗?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"您手机上的某一应用程序正在请求相应权限以便打开蓝牙,从而使其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。是否要授予这种权限?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"正在打开蓝牙…"</string>
+    <!-- no translation found for bluetooth_auto_connect (8013003320667198460) -->
+    <skip />
     <string name="date_and_time" msgid="4114084177056654663">"日期和时间设置"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"下午 1:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -136,7 +138,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"启动<xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"帐户:"</string>
-    <string name="proxy_settings_title" msgid="6262282922722097473">"代理设置"</string>
+    <!-- outdated translation 6262282922722097473 -->     <string name="proxy_settings_title" msgid="5912878565897294401">"代理设置"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"设置全局 HTTP 代理和排除列表"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"清除"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"端口"</string>
@@ -225,7 +227,7 @@
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"正在停用无线连接..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"正在启用无线连接..."</string>
     <string name="radio_controls_title" msgid="5868688473587168882">"无线和网络"</string>
-    <string name="wireless_networks_settings_title" msgid="149274247949769551">"无线和网络设置"</string>
+    <!-- outdated translation 149274247949769551 -->     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"无线和网络设置"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"管理 Wi-Fi、蓝牙、飞行模式、移动网络和虚拟专用网"</string>
     <string name="roaming" msgid="3596055926335478572">"数据漫游"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"漫游时连接到数据服务"</string>
@@ -326,6 +328,10 @@
     <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"设备管理员不允许使用最近的密码"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"确定"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"取消"</string>
+    <!-- no translation found for lockpattern_tutorial_cancel_label (6431583477570493261) -->
+    <skip />
+    <!-- no translation found for lockpattern_tutorial_continue_label (3559793618653400434) -->
+    <skip />
     <string name="device_admin_title" msgid="3562216873644263804">"设备管理"</string>
     <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"选择设备管理器"</string>
     <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"添加或删除设备管理器"</string>
@@ -335,9 +341,10 @@
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"蓝牙设置"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"管理连接、设置设备名称和可检测性"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"蓝牙配对请求"</string>
-    <string name="bluetooth_device_info" msgid="6644515376523965073">"蓝牙设备信息"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"键入 PIN 与“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”进行配对。(尝试键入 0000 或 1234。)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"键入匹配密钥可与“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”进行配对。"</string>
+    <!-- no translation found for bluetooth_enter_pin_msg (1499285355129256289) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_passkey_msg (8301499416158195044) -->
+    <skip />
     <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"要与“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”配对,请核实其中是否显示匹配密钥:<xliff:g id="PASSKEY">%2$s</xliff:g>。"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"想要配对。"</string>
     <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"在“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”中输入<xliff:g id="PASSKEY">%2$s</xliff:g>可进行配对。"</string>
@@ -367,12 +374,6 @@
     <string name="bluetooth_profile_opp" msgid="3799470046565284440">"传输"</string>
     <string name="bluetooth_profile_hid" msgid="3000858580917633478">"输入设备"</string>
     <string name="bluetooth_profile_pan" msgid="4225813400648547154">"绑定"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"已连接到媒体音频"</string>
-    <string name="bluetooth_summary_connected_to_headset" product="tablet" msgid="598335151406893070">"已连接到平板电脑音频"</string>
-    <string name="bluetooth_summary_connected_to_headset" product="default" msgid="4876496372728623918">"已连接到手机音频"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"已连接到手机和媒体音频"</string>
-    <string name="bluetooth_summary_connected_to_hid" msgid="8147499644396475561">"已连接到输入设备"</string>
-    <string name="bluetooth_summary_connected_to_pan" msgid="3157622705092537266">"已绑定"</string>
     <!-- no translation found for bluetooth_disconnect_a2dp_profile (3524648279150937177) -->
     <skip />
     <!-- no translation found for bluetooth_disconnect_headset_profile (8635908811168780720) -->
@@ -398,6 +399,8 @@
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"用于手机音频"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"用于文件传输"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"用于输入"</string>
+    <!-- no translation found for bluetooth_pan_profile_summary_use_for (5664884523822068653) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"底座设置"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"底座用于音频"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"将底座用作免提电话"</string>
@@ -631,8 +634,6 @@
     <string name="sd_eject" product="default" msgid="6915293408836853020">"卸载 SD 卡"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"卸载内部 USB 存储设备"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"需要先卸载 SD 卡,然后才能将其安全移除"</string>
-    <string name="ptp_mode" msgid="3954718349875117695">"启用 PTP 模式"</string>
-    <string name="ptp_mode_summary" msgid="8709697530987890394">"在通过 USB 连接时显示为 PTP 相机设备,而不是 MTP 设备"</string>
     <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"插入要装载的 USB 存储设备"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"插入 SD 卡进行安装"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"装载 USB 存储设备"</string>
@@ -759,8 +760,6 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"蓝牙绑定出错"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"无法绑定到 <xliff:g id="MAXCONNECTION">%1$d</xliff:g> 台以上的设备"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"即将解除与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>的绑定。"</string>
-    <string name="bluetooth_tether_settings_text" msgid="2273368767599539525">"蓝牙绑定设置"</string>
-    <string name="bluetooth_tether_settings_subtext" msgid="5970033999897946708">"选择要绑定的蓝牙设备"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"帮助"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"移动网络"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"设置漫游、网络、APN 选项"</string>
@@ -796,11 +795,17 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"您没有数据连接。要立即查看此信息,请通过连接到互联网的任意计算机访问 %s。"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"正在载入..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"选择您的密码"</string>
+    <!-- no translation found for lockpassword_choose_your_pattern_header (6949761069941694050) -->
+    <skip />
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"选择您的 PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"确认您的密码"</string>
+    <!-- no translation found for lockpassword_confirm_your_pattern_header (7543433733032330821) -->
+    <skip />
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"确认您的 PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"密码不匹配"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PIN 不匹配!"</string>
+    <!-- no translation found for lockpassword_choose_lock_generic_header (3811438094903786145) -->
+    <skip />
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"密码已设置"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN 已设置"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"图案已设置"</string>
@@ -834,10 +839,11 @@
     <string name="next_button_label" msgid="8890792540116568321">"下一步"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"保护您的平板电脑"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"手机安全设置"</string>
-    <string name="lock_intro_message" product="tablet" msgid="4544669202394019747"><font size="17">"通过创建个人屏幕解锁图案,防止他人在未经授权的情况下使用您的平板电脑。"\n<font height="17">\n</font><b>"1"</b>"  在下一屏幕上,观看示例图案的绘制过程。"\n<font height="17">\n</font><b>"2"</b>"  准备就绪后,绘制您自己的个人解锁图案。可尝试不同的图案,但至少要连接四个点。"\n<font height="17">\n</font><b>"3"</b>"  重新绘制您的图案进行确认。"\n<font height="17">\n</font><b>"可以开始了吗?触摸“下一步”"</b>"。"\n<font height="3">\n</font>"要让平板电脑保留为不受保护的状态,请触摸“取消”。"</font></string>
+    <!-- unknown placeholder TAG_FONT_0 in lock_intro_message -->
+    <skip />
+    <!-- no translation found for lock_intro_message (3692151094288835065) -->
+    <skip />
     <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"通过创建个人屏幕解锁图案,防止他人未经授权使用您的手机。"\n<font height="17">\n</font><b>"1"</b>"  在下一屏幕上,观看示例图案的绘制过程。"\n<font height="17">\n</font><b>"2"</b>"  准备就绪后,绘制您自己的个人解锁图案。可尝试不同的图案,但至少要连接四个点。"\n<font height="17">\n</font><b>"3"</b>"  重新绘制您的图案进行确认。"\n<font height="17">\n</font><b>"可以开始了吗?触摸“下一步”"</b>"。"\n<font height="3">\n</font>"要让手机处于不受保护的状态,请触摸“取消”。"</font></string>
-    <string name="lock_example_title" msgid="8052305554017485410">"示例图案"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"至少连接四个点。"\n\n"准备就绪后,触摸“下一步”绘制自己的图案。"</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"管理应用程序"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"管理和删除安装的应用程序"</string>
     <string name="applications_settings" msgid="3736173521008476946">"应用程序"</string>
@@ -956,7 +962,7 @@
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"确定要停止此系统服务吗?如果停止,您平板电脑上的某些功能也会立即停止工作,除非您将其关闭后再重新打开。"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"确定要停止此系统服务吗?如果停止,您手机上的某些功能也会立即停止工作,除非您将其关闭后再重新打开。"</string>
     <!-- outdated translation 2939555761536357092 -->     <string name="language_settings" msgid="5292716747264442359">"语言区域和文字"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"语言和键盘设置"</string>
+    <!-- outdated translation 3455826933385341107 -->     <string name="language_keyboard_settings_title" msgid="243220021717425813">"语言和键盘设置"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"语言设置"</string>
     <string name="keyboard_settings_category" msgid="7060453865544070642">"键盘设置"</string>
     <string name="phone_language" msgid="1165758957501090679">"选择语言"</string>
@@ -997,11 +1003,27 @@
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"快捷方式"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"文字输入"</string>
     <string name="input_method" msgid="5434026103176856164">"输入法"</string>
+    <!-- no translation found for current_input_method (2146807723398303917) -->
+    <skip />
+    <!-- no translation found for input_method_selector (4311213129681430709) -->
+    <skip />
+    <!-- no translation found for input_method_selector_show_automatically_title (1001612945471546158) -->
+    <skip />
+    <!-- no translation found for input_method_selector_always_show_title (3891824124222371634) -->
+    <skip />
+    <!-- no translation found for input_method_selector_always_hide_title (7699647095118680424) -->
+    <skip />
+    <!-- no translation found for configure_input_method (7773992829158322455) -->
+    <skip />
+    <!-- no translation found for input_method_settings (5801295625486269553) -->
+    <skip />
+    <!-- no translation found for active_input_method_subtypes (3596398805424733238) -->
+    <skip />
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"管理文字输入选项"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> 设置"</string>
-    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <!-- no translation found for input_methods_and_subtype_enabler_title (4018402267502337338) -->
     <skip />
-    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (5513389679127310099) -->
     <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"屏幕键盘设置"</string>
     <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"内置键盘"</string>
@@ -1292,9 +1314,9 @@
     <string name="personal_data_section_title" msgid="7815209034443782061">"个人数据"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"备份我的数据"</string>
     <string name="backup_data_summary" msgid="6515285107793232815">"将应用程序数据、Wi-Fi 密码和其他设置备份至 Google 服务器"</string>
-    <!-- no translation found for backup_configure_transport_title (1642593939931033647) -->
+    <!-- no translation found for backup_configure_account_title (3790872965773196615) -->
     <skip />
-    <!-- no translation found for backup_configure_transport_default_summary (1855090161240800307) -->
+    <!-- no translation found for backup_configure_account_default_summary (2436933224764745553) -->
     <skip />
     <string name="auto_restore_title" msgid="5397528966329126506">"自动还原"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"重新安装某个应用程序后,系统会还原已经备份的设置或其他数据"</string>
@@ -1330,10 +1352,16 @@
     <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"正在查找网络..."</string>
     <!-- outdated translation 4438531984292574854 -->     <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"触摸以选择网络"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"连接到现有网络"</string>
+    <!-- no translation found for wifi_setup_status_unsecured_network (8143046977328718252) -->
+    <skip />
     <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"输入网络配置"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"连接到新的网络"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"正在连接..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"继续下一步"</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="account_sync_settings_title" msgid="4578227872921044660">"同步设置"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"同步操作当前遇到了一些问题,很快便可恢复。"</string>
     <string name="add_account_label" msgid="7811707265834013767">"添加帐户"</string>
@@ -1348,9 +1376,6 @@
     <string name="sync_enabled" msgid="4551148952179416813">"同步功能已开启"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"同步功能已关闭"</string>
     <string name="sync_error" msgid="5060969083117872149">"同步出错"</string>
-    <!-- no translation found for app_label (5443184607893378389) -->
-    <skip />
-    <string name="sync_too_many_deletes" msgid="7648720493358579441">"超出了删除限制"</string>
     <string name="settings_backup" msgid="2274732978260797031">"备份设置"</string>
     <!-- no translation found for settings_backup_summary (7916877705938054035) -->
     <skip />
@@ -1361,10 +1386,6 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"日历"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"联系人"</string>
-    <string name="sync_too_many_deletes_desc" msgid="1629933977544304140">"对于<xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>、帐户 <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>,有 <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> 个删除的项目。您希望执行什么操作?"</string>
-    <string name="sync_really_delete" msgid="8501873911799839009">"删除这些项目。"</string>
-    <string name="sync_undo_deletes" msgid="2154022612361710595">"撤消删除操作。"</string>
-    <string name="sync_do_nothing" msgid="5889328648484047916">"现在什么都不做。"</string>
     <!-- no translation found for sync_plug (5952575609349860569) -->
     <skip />
     <!-- no translation found for header_application_sync_settings (5514539555293976035) -->