Import revised translations.

Change-Id: I80538778f484d7bc37fdb78947d56802cc57286b
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 96052d9..41632fe 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -135,9 +135,9 @@
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"未在附近找到蓝牙设备。"</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"蓝牙配对请求"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"配对请求"</string>
-    <string name="bluetooth_notif_message" msgid="1931617700075106801">"触摸可与“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”进行配对"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"触摸可与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对。"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"显示接收到的文件"</string>
-    <string name="device_picker" msgid="8721012448931226323">"蓝牙设备选择器"</string>
+    <string name="device_picker" msgid="8398232791303186677">"蓝牙设备选择器"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"蓝牙权限请求"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"某个应用程序想要打开蓝牙。允许该程序打开蓝牙吗?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"您平板电脑上的某个应用程序想让其他蓝牙设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的平板电脑。允许该程序执行相应操作吗?"</string>
@@ -155,7 +155,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"触摸可连接到“<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>
-    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"“%1$s”希望访问您的联系人和通话记录。要向“%2$s”授予访问权吗?"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s想访问您的联系人信息和通话记录。要向%2$s授予访问权限吗?"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"下次不再询问"</string>
     <string name="date_and_time" msgid="4114084177056654663">"日期和时间设置"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"下午 1:00"</string>
@@ -224,23 +224,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"设置"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"失败"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"成功"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"重新连接 USB 线后更改生效"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"重新连接 USB 线后更改就会生效。"</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"启用 USB 大容量存储设备"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"总字节数:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"未装载 USB 存储设备"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"无 SD 卡"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"未装载 USB 存储设备。"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"无 SD 卡。"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"可用的字节数:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB 存储设备已被用作大容量存储设备"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD 卡已被视为大容量存储设备"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"现在可以安全地移除该 USB 存储设备了"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"现在可以安全地移除该 SD 卡了"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"计算机正将 USB 存储设备用作大容量存储设备。"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"计算机正将 SD 卡用作大容量存储设备。"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"现在可以安全地移除该 USB 存储设备了。"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"现在可以安全地移除 SD 卡了。"</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB 存储设备仍在使用中便被移除!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD 卡仍在使用中便被移除!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"已使用的字节数:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"正在扫描 USB 存储设备中的媒体..."</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"正从 SD 卡扫描媒体..."</string>
-    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"已将 USB 存储设备装载为只读设备"</string>
-    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"安装的 SD 卡为只读状态"</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"已将 USB 存储设备装载为只读设备。"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"已将 SD 卡装载为只读设备。"</string>
     <string name="skip_label" msgid="47510779345218297">"跳过"</string>
     <string name="next_label" msgid="4693520878012668114">"下一步"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"语言"</string>
@@ -266,8 +266,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"漫游时连接到数据服务"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"数据连接已断,因为您已离开本地网络并已关闭数据漫游。"</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"将其启用"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"要允许数据漫游?这可能产生大量漫游费!"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"注意"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"请注意,允许数据​​漫游可能会产生高额漫游费!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"允许数据漫游吗?"</string>
     <string name="networks" msgid="6333316876545927039">"运营商选择"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"选择网络运营商"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"日期和时间"</string>
@@ -283,7 +283,7 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"设置时间"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"选择时区"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"设置日期"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"选择日期格式"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"选择日期格式"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"按字母顺序排序"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"按时区排序"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"日期"</string>
@@ -306,17 +306,17 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"您每次开机时都需要输入数字 PIN 或密码才能解密平板电脑"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"您每次开机时都需要输入数字 PIN 或密码才能解密手机"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"已加密"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"您可以加密自己的帐户、设置、已下载的应用程序及其数据、媒体和其他文件。加密平板电脑后,您每次开机时都需要输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置,但这会清除平板电脑上的所有数据。"\n\n"加密过程需要一个小时或更长时间。在开始加密前,请务必确保电池有电,并且在加密完成前必须一直连接电源。如果中断了加密过程,可能会丢失部分或全部数据。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"您可以加密自己的帐户、设置、已下载的应用程序及其数据、媒体和其他文件。加密手机后,您每次开机时都需要输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置,但这会清除手机上的所有数据。"\n\n"加密过程需要一个小时或更长时间。在开始加密前,请务必确保电池有电,并且在加密完成前必须一直连接电源。如果中断了加密过程,可能会丢失部分或全部数据。"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"您可以加密自己的帐户、设置、已下载的应用程序及其数据、媒体和其他文件。加密平板电脑后,您每次开机时都需要输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置,但这会清除平板电脑上的所有数据。"\n\n"加密过程需要 1 小时或更长时间。在开始加密前,电池必须有电,并且在加密完成前必须一直连接电源。如果您中断加密过程,则会丢失部分或全部数据。"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"您可以加密自己的帐户、设置、已下载的应用程序及其数据、媒体和其他文件。加密手机后,您每次开机时都需要输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置,但这会清除手机上的所有数据。"\n\n"加密过程需要 1 小时或更长时间。在开始加密前,电池必须有电,并且在加密完成前必须一直连接电源。如果您中断加密过程,则会丢失部分或全部数据。"</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"加密平板电脑"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"加密手机"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"请为电池充电,然后重试。"</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"插上充电器,然后重试。"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"没有锁定屏幕 PIN 或密码"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"您需要先设置锁定屏幕 PIN 或密码才能开始加密。"</string>
-    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"确认加密"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"要加密平板电脑吗?此操作不可逆,如果您中断该过程,则会丢失数据。加密过程需要一个小时或更长时间,在此期间,平板电脑会重新启动数次。"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"要加密手机吗?此操作不可逆,如果您中断该过程,则会丢失数据。加密过程需要一个小时或更长时间,在此期间,手机会重新启动数次。"</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"要加密吗?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"加密操作无法撤消,如果您中断该过程,则会丢失数据。加密过程需要 1 小时或更长时间,在此期间,平板电脑会重新启动数次。"</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"加密操作无法撤消,如果您中断该过程,则会丢失数据。加密过程需要 1 小时或更长时间,在此期间,手机会重新启动数次。"</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"正在加密"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"正在加密您的平板电脑(已完成 <xliff:g id="PERCENT">^1</xliff:g>%),请耐心等待。"</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"正在加密您的手机(已完成 <xliff:g id="PERCENT">^1</xliff:g>%),请耐心等待。"</string>
@@ -325,7 +325,7 @@
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"加密失败"</string>
     <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"加密过程中断,无法完成。因此,您已无法再使用平板电脑上的数据。"\n\n"要继续使用您的平板电脑,您需要恢复出厂设置。恢复出厂设置后对平板电脑进行设置时,您可以将之前备份到 Google 帐户的所有数据恢复到平板电脑中。"</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"加密过程中断,无法完成。因此,您已无法再使用手机上的数据。"\n\n"要继续使用您的手机,您需要恢复出厂设置。恢复出厂设置后对手机进行设置时,您可以将之前备份到 Google 帐户的所有数据恢复到手机中。"</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"选择屏幕锁定"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"选择屏幕锁定方式"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"选择备份锁"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"屏幕锁定"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"更改锁定屏幕"</string>
@@ -362,44 +362,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN 必须至少包含 %d 个字符"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"完成后触摸“继续”"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"继续"</string>
-    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"密码必须少于 <xliff:g id="NUMBER">%d</xliff:g> 个字符"</string>
-    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN 必须少于 <xliff:g id="NUMBER">%d</xliff:g> 位数"</string>
-    <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN 只能由 0-9 的数字组成"</string>
-    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"设备管理器不允许使用最近的 PIN"</string>
-    <string name="lockpassword_illegal_character" msgid="6204396794254688549">"密码包含非法字符"</string>
-    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"密码中至少应包含一个字母"</string>
-    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"密码中至少应包含一个数字"</string>
-    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"密码中至少应包含一个符号"</string>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"密码必须少于 <xliff:g id="NUMBER">%d</xliff:g> 个字符。"</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN 必须少于 <xliff:g id="NUMBER">%d</xliff:g> 位数。"</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN 只能包含 0-9 的数字。"</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"设备管理员不允许使用最近用过的 PIN。"</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"密码包含非法字符。"</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"密码必须包含至少 1 个字母。"</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"密码必须包含至少 1 个数字。"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"密码必须包含至少 1 个符号。"</string>
   <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="1462968118065694590">"密码中至少应包含 1 个字母"</item>
-    <item quantity="other" msgid="7278096339907683541">"密码中至少应包含 %d 个字母"</item>
+    <item quantity="one" msgid="3063853802158131458">"密码必须包含至少 1 个字母。"</item>
+    <item quantity="other" msgid="8186027808415585970">"密码必须包含至少 %d 个字母。"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="2048653993044269649">"密码中至少应包含 1 个小写字母"</item>
-    <item quantity="other" msgid="588499075580432178">"密码中至少应包含 %d 个小写字母"</item>
+    <item quantity="one" msgid="5583986519662091001">"密码必须包含至少 1 个小写字母。"</item>
+    <item quantity="other" msgid="2693910942679679225">"密码必须包含至少 %d 个小写字母。"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="7677454174080582601">"密码中至少应包含 1 个大写字母"</item>
-    <item quantity="other" msgid="2183090598541826806">"密码中至少应包含 %d 个大写字母"</item>
+    <item quantity="one" msgid="2611909966725502768">"密码必须包含至少 1 个大写字母。"</item>
+    <item quantity="other" msgid="3030801209112209245">"密码必须包含至少 %d 个大写字母。"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="8585088032818933985">"密码中至少应包含 1 个数字"</item>
-    <item quantity="other" msgid="995673409754935278">"密码中至少应包含 %d 个数字"</item>
+    <item quantity="one" msgid="3820355568839621231">"密码必须包含至少 1 个数字。"</item>
+    <item quantity="other" msgid="4703982391407595924">"密码必须包含至少 %d 个数字。"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="3930886641317826293">"密码中至少应包含 1 个特殊符号"</item>
-    <item quantity="other" msgid="3047460862484105274">"密码中至少应包含 %d 个特殊符号"</item>
+    <item quantity="one" msgid="8456579939292408631">"密码必须包含至少 1 个特殊符号。"</item>
+    <item quantity="other" msgid="1221290525051187757">"密码必须包含至少 %d 个特殊符号。"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="1716355580615489062">"密码中至少应包含 1 个非字母字符"</item>
-    <item quantity="other" msgid="5574191164708145973">"密码中至少应包含 %d 个非字母字符"</item>
+    <item quantity="one" msgid="4594051152085925921">"密码必须包含至少 1 个非字母字符。"</item>
+    <item quantity="other" msgid="3952508584649046404">"密码必须包含至少 %d 个非字母字符。"</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"设备管理器不允许使用最近的密码"</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"设备管理员不允许使用最近用过的密码。"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"确定"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"取消"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"取消"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"下一步"</string>
-    <string name="lock_setup" msgid="1759001157415978959">"设置已完成"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"设置完毕。"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"设备管理"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"设备管理器"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"查看或停用设备管理器"</string>
@@ -413,8 +413,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"要与 <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> 设备配对,请键入该设备所需的配对密钥:"</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_enter_pin_other_device" msgid="4637977124526813470">"您可能还需要在另一台设备上输入此 PIN。"</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"您可能还需要在另一台设备上输入此密钥。"</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="2796550001376088433">"要与 <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> 设备配对,请在该设备上键入:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>,然后按回车键。"</string>
@@ -425,7 +425,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"PIN 或配对密钥不正确,无法与“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”配对。"</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"无法与“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”进行通信。"</string>
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 已拒绝配对。"</string>
-    <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"连接到<xliff:g id="DEVICE_NAME">%1$s</xliff:g>时出现问题。"</string>
+    <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"无法连接到<xliff:g id="DEVICE_NAME">%1$s</xliff:g>。"</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"扫描查找设备"</string>
     <string name="bluetooth_search_for_devices" msgid="5957007154213560390">"搜索设备"</string>
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"正在搜索..."</string>
@@ -516,7 +516,7 @@
     <string name="wifi_wps_setup_title" msgid="2301524571580808871">"WPS 设置"</string>
     <string name="wifi_wps_pin_output" msgid="7773693032190962123">"键入接入点上的 PIN <xliff:g id="WPS_PIN">%1$s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="2776555137392461525">"正在进行 WPS,这一过程可能需要数十秒的时间"</string>
-    <string name="wifi_wps_failed" msgid="1648418410092969300">"无法启动 WPS,请重试。"</string>
+    <string name="wifi_wps_failed" msgid="1034868466481449492">"无法启动 WPS,请重试。"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"网络 SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"安全性"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"信号强度"</string>
@@ -568,21 +568,21 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"域名 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"网关"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"网络前缀长度"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"设置对等连接"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"设备信息"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Wi-Fi 保护设置"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"键入 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_remove_group" msgid="4844634506540667517">"删除群组"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"高级"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"可用设备"</string>
+    <string name="wifi_p2p_menu_search" msgid="4421031496764707775">"搜索设备"</string>
+    <string name="wifi_p2p_menu_searching" msgid="6957538511318517543">"正在搜索"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"重命名设备"</string>
+    <string name="wifi_p2p_peer_devices" msgid="4617081331669395794">"对等设备"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"无法连接。"</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"断开连接?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"如果断开连接,您与<xliff:g id="PEER_NAME">%1$s</xliff:g>的连接将中断。"</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"如果断开连接,您与<xliff:g id="PEER_NAME">%1$s</xliff:g>和另外 <xliff:g id="PEER_COUNT">%2$s</xliff:g> 台设备的连接将中断。"</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>
-    <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"配置 Wi-Fi 热点"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"设置 Wi-Fi 热点"</string>
     <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> 便携式 Wi-Fi 热点"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android 热点"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"显示"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"音乐效果"</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>
+    <string name="vibrate_on_ring_title" msgid="40343855247989536">"振动并响铃"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"默认通知"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"有通知时指示灯闪烁"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"铃声"</string>
@@ -702,7 +702,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"本机号码"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="8499039751817386529">"PRL 版本"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"PRL 版本"</string>
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"手机网络类型"</string>
@@ -915,7 +915,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"按 MENU 获得帮助。"</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"完成后松开手指。"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"至少连接 <xliff:g id="NUMBER">%d</xliff:g> 个点,请重试:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"图案已记录!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"图案已记录。"</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"再次绘制图案进行确认:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"您的新解锁图案:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"确认"</string>
@@ -936,7 +936,7 @@
     <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="8616353869251700776">"创建个人屏幕解锁图案可防止他人未经许可使用您的手机。在下一屏幕上用手指以任意顺序连接至少四个点。"\n\n"准备好开始了吗?请触摸“下一步”。"</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"创建个人屏幕解锁图案可防止他人未经许可使用您的平板电脑。在下一屏幕上用手指以任意顺序连接至少四个点。"\n\n"准备好开始了吗?请触摸“下一步”。"</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"创建个人屏幕解锁图案可防止他人未经许可使用您的手机。在下一屏幕上滑动手指以任意顺序连接至少四个点。"\n\n"准备好开始了吗?请触摸“下一步”。"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"管理应用程序"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"管理和删除已安装的应用程序"</string>
@@ -1009,7 +1009,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"此应用程序有权访问您平板电脑上的以下内容:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"此应用程序有权访问您手机上的以下内容:"</string>
     <string name="computing_size" msgid="1599186977475211186">"正在计算..."</string>
-    <string name="invalid_size_value" msgid="1901940003700269523">"无法计算包大小"</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"无法计算包的大小。"</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"未安装任何第三方应用程序。"</string>
     <string name="version_text" msgid="9189073826278676425">"版本 <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"移动"</string>
@@ -1091,11 +1091,19 @@
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"添加"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"添加到词典"</string>
+    <!-- no translation found for user_dict_settings_add_dialog_more_options (8848798370746019825) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_dialog_less_options (2441785268726036101) -->
+    <skip />
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"确定"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"快捷键:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"语言:"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"编辑字词"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"编辑"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"删除"</string>
     <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"用户词典中没有您定义的任何字词。您可以触摸“添加”(+) 按钮添加字词。"</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"所有语言"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"所有语言"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"更多语言..."</string>
     <string name="testing" msgid="6584352735303604146">"测试"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"平板电脑信息"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"手机信息"</string>
@@ -1158,6 +1166,7 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"系统"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"大号字体"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"按“电源”按钮结束通话"</string>
+    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"说出密码"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"触摸浏览"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"当“触摸浏览”功能打开时,您可以听到或看到您触摸内容的说明。"\n\n"此功能适用于视力不好的用户。"</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"触摸和按住延迟"</string>
@@ -1179,12 +1188,12 @@
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"需要屏幕阅读器吗?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"“话语提示”可提供语音反馈以帮助盲人和有视力障碍的用户。您要通过 Android 电子市场免费安装该服务吗?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"您要允许应用程序安装来自 Google 的脚本,以便于您浏览这些应用程序的网页内容吗?"</string>
-    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"此功能会更改您的设备对触摸的响应方式。要打开吗?"</string>
+    <string name="accessibility_touch_exploration_warning" msgid="5474167409993309316">"此功能会更改您的设备对触摸操作的响应方式。要启用吗?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"没有提供说明。"</string>
     <string name="settings_button" msgid="3006713718908152930">"设置"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"电池"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"耗电情况"</string>
-    <string name="power_usage_not_available" msgid="3583407442633768046">"无法获取电池使用数据"</string>
+    <string name="power_usage_not_available" msgid="3214000535532434353">"无法获取电池使用数据。"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"拔下电源后的电量消耗情况"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"重置后的电量消耗情况"</string>
@@ -1282,7 +1291,7 @@
     <string name="tts_install_data_summary" msgid="5742135732511822589">"安装语音合成所需的语音数据"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"语音合成所需的语音已安装妥当"</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"设置已发生变化。这是声音效果示例。"</string>
-    <string name="tts_engine_error" msgid="5513288178403066867">"您选择的引擎无法运行"</string>
+    <string name="tts_engine_error" msgid="3305141107104670703">"您选择的引擎无法运行。"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"配置"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"选择其他引擎"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"此语音合成引擎能够收集语音中出现的所有信息,包括密码和信用卡号码之类的个人数据。此功能由 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> 引擎提供。是否启用此语音合成引擎?"</string>
@@ -1298,7 +1307,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"女声"</string>
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"男声"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"语音合成引擎已安装"</string>
-    <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"启用新引擎后才能使用"</string>
+    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"启用新引擎后才能使用。"</string>
     <string name="tts_engine_settings_button" msgid="1030512042040722285">"进行引擎设置"</string>
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"首选引擎"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"常规"</string>
@@ -1340,8 +1349,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"自动还原"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"重新安装某个应用程序后,系统会还原已经备份的设置和数据"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"桌面备份密码"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"桌面完整备份当前未设置保护。"</string>
-    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"选择以更改或删除桌面完整备份的密码"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"桌面完整备份当前未设置密码保护"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"触摸可更改或删除用于桌面完整备份的密码"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"要停止备份您的 Wi-Fi 密码、书签、其他设置以及应用程序数据,并清除 Google 服务器上的所有副本吗?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"设备管理设置"</string>
@@ -1410,7 +1419,7 @@
     <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_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"欢迎使用“Google Sync”!"</font>\n"Google 的这款同步数据工具可让您随时随地访问您的联系人、约会以及更多信息。"</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"欢迎使用 Google Sync!"</font>" "\n"这款数据同步工具可让您随时随地查看您的联系人、约会以及更多信息。"</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"应用程序同步设置"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"数据与同步"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"更改密码"</string>
@@ -1485,8 +1494,8 @@
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"移动"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
-    <string name="data_usage_list_mobile" msgid="8285167120931486089">"移动"</string>
-    <string name="data_usage_list_none" msgid="2899530183512542206">"无"</string>
+    <string name="data_usage_list_mobile" msgid="5588685410495019866">"移动网络"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"无"</string>
     <string name="data_usage_enable_mobile" msgid="986782622560157977">"移动数据"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G 数据"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G 数据"</string>
@@ -1523,6 +1532,7 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec 预共享密钥"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec 用户证书"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA 证书"</string>
+    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec 服务器证书"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"显示高级选项"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS 搜索域"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS 服务器(例如 8.8.8.8)"</string>
@@ -1532,6 +1542,7 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"保存帐户信息"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(未使用)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(不验证服务器)"</string>
+    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(来自服务器)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"取消"</string>
     <string name="vpn_save" msgid="4233484051644764510">"保存"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"连接"</string>