Import revised translations.

Change-Id: I51cf9d94cd14e67e56a86e669a92e1a64eb6540b

2 files changed, 209 insertions, 190 deletions

diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 01af948e8..65f526e62 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -39,8 +39,26 @@
     <item msgid="4460915688877708508">"显示部分窗口动画"</item>
     <item msgid="488968798204105119">"显示所有窗口动画"</item>
   </string-array>
-    <!-- no translation found for screen_timeout_entries:6 (6864027152847611413) -->
-    <!-- no translation found for lock_after_timeout_entries:8 (4322676235684793329) -->
+  <string-array name="screen_timeout_entries">
+    <item msgid="3342301044271143016">"15 秒"</item>
+    <item msgid="8881760709354815449">"30 秒"</item>
+    <item msgid="7589406073232279088">"1 分钟"</item>
+    <item msgid="7001195990902244174">"2 分钟"</item>
+    <item msgid="7489864775127957179">"5 分钟"</item>
+    <item msgid="2314124409517439288">"10 分钟"</item>
+    <item msgid="6864027152847611413">"30 分钟"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="5416834369150305288">"无延迟"</item>
+    <item msgid="6736512735606834431">"5 秒"</item>
+    <item msgid="8044619388267891375">"15 秒"</item>
+    <item msgid="1822002388249545488">"30 秒"</item>
+    <item msgid="8538071621211916519">"1 分钟"</item>
+    <item msgid="5663439580228932882">"2 分钟"</item>
+    <item msgid="49888496216106852">"5 分钟"</item>
+    <item msgid="9002737361305019353">"10 分钟"</item>
+    <item msgid="4322676235684793329">"30 分钟"</item>
+  </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"很慢"</item>
     <item msgid="2361722960903353554">"慢"</item>
@@ -98,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 分钟"</item>
+    <item msgid="5780349442819375570">"5 分钟"</item>
+    <item msgid="1166466894270177580">"1 小时"</item>
+    <item msgid="9032073376232198148">"从不"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"弱"</item>
     <item msgid="5615082285463430971">"一般"</item>
@@ -105,9 +129,9 @@
     <item msgid="5702329417707689835">"强"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"屏幕关闭时休眠"</item>
+    <item msgid="643915340724070374">"当屏幕关闭时（使用更多移动数据）"</item>
     <item msgid="1549288661423279207">"充电时永不休眠"</item>
-    <item msgid="1986753720941888596">"永不休眠"</item>
+    <item msgid="6592896328877671197">"从不（增加耗电量）"</item>
   </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"自动"</item>
@@ -143,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"无"</item>
-    <item msgid="6267482274276126058">"静态"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"静态"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"关"</item>
@@ -156,6 +180,9 @@
     <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="app_install_location_entries">
     <item msgid="8151497958991952759">"设备内部存储"</item>
     <item msgid="3738430123799803530">"可卸载的 SD 卡"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 6775d055c..5899fccff 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -87,12 +87,14 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"没电"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"过电压"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"未知错误"</string>
-    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
-    <skip />
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"电量低"</string>
     <string name="bluetooth" msgid="5549625000628014477">"蓝牙"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"可检测性"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> 秒内可检测到..."</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"可检测到"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"可以检测到设备"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"可检测到设备的时间超时"</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>
     <string name="bluetooth_devices" msgid="1886018064039454227">"蓝牙设备"</string>
@@ -112,18 +114,22 @@
     <string name="progress_scanning" msgid="3760897655335759141">"正在扫描"</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"蓝牙配对请求"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"配对请求"</string>
-    <!-- no translation found for bluetooth_notif_message (618099089987569242) -->
-    <skip />
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"选择与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对"</string>
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"显示收到的文件"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"显示通过蓝牙收到的文件列表"</string>
     <string name="device_picker" msgid="8721012448931226323">"蓝牙设备选择器"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"蓝牙权限请求"</string>
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"某一应用程序正在请求相应权限，以便打开蓝牙。要授予该权限吗？"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"您平板电脑上的某一应用程序正在请求相应权限，以便让其他蓝牙设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的平板电脑。要授予该权限吗？"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"您手机上的某一应用程序正在请求相应权限以便打开蓝牙，从而使其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。是否要授予这种权限？"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"平板电脑上的某一应用程序正在请求相应权限，以便让其他蓝牙设备“一直可检测到”您的平板电脑。要授予该权限吗？"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"手机上的某一应用程序正在请求相应权限，以便让其他蓝牙设备“一直可检测到”您的手机。要授予该权限吗？"</string>
     <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_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"平板电脑上的某一应用程序正在请求相应权限以便打开蓝牙，从而让其他设备可检测到您的平板电脑。要授予该权限吗？"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"手机上的某一应用程序正在请求相应权限以便打开蓝牙，从而让其他设备可检测到您的手机。要授予该权限吗？"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"正在打开蓝牙…"</string>
-    <!-- no translation found for bluetooth_auto_connect (8013003320667198460) -->
-    <skip />
+    <string name="bluetooth_auto_connect" msgid="8013003320667198460">"自动连接"</string>
     <string name="date_and_time" msgid="4114084177056654663">"日期和时间设置"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"下午 1:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -138,14 +144,14 @@
     <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>
-    <!-- outdated translation 6262282922722097473 -->     <string name="proxy_settings_title" msgid="5912878565897294401">"代理设置"</string>
+    <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>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"端口"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"以下对象没有代理："</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"恢复默认设置"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"完成"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"主机名"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"主机名"</string>
     <string name="proxy_error" msgid="8926675299638611451">"注意"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"确定"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"您输入的主机名无效。"</string>
@@ -153,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"您必须填写端口字段。"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"如果主机字段为空，则端口字段必须为空。"</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"您输入的端口无效。"</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"地点："</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"相邻的 CID："</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"数据尝试次数："</string>
@@ -221,13 +229,13 @@
     <string name="cancel" msgid="6859253417269739139">"取消"</string>
     <string name="settings_label" msgid="1626402585530130914">"设置"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"设置"</string>
-    <!-- outdated translation 3672145147925639262 -->     <string name="settings_shortcut" msgid="8597387747077828217">"设置"</string>
+    <string name="settings_shortcut" msgid="8597387747077828217">"选择设置快捷方式"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"飞行模式"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"停用所有无线连接"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"正在停用无线连接..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"正在启用无线连接..."</string>
     <string name="radio_controls_title" msgid="5868688473587168882">"无线和网络"</string>
-    <!-- outdated translation 149274247949769551 -->     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"无线和网络设置"</string>
+    <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>
@@ -239,6 +247,7 @@
     <string name="networks" msgid="6333316876545927039">"运营商选择"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"选择网络运营商"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"日期和时间"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"设置日期和时间"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"设置日期、时间、时区和格式"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"自动确定日期和时间"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"使用网络上的时间"</string>
@@ -255,9 +264,8 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"按时区排序"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"日期"</string>
     <string name="time_picker_title" msgid="483460752287255019">"时间"</string>
-    <!-- outdated translation 9100576335787336455 -->     <string name="lock_after_timeout" msgid="940509402681580537">"超时后锁定设备"</string>
-    <!-- no translation found for lock_after_timeout_summary (4726009794344934278) -->
-    <skip />
+    <string name="lock_after_timeout" msgid="940509402681580537">"超时"</string>
+    <string name="lock_after_timeout_summary" msgid="4726009794344934278">"屏幕自动关闭的 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>后锁定屏幕"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"在锁定屏幕上显示拥有者信息"</string>
     <string name="owner_info_settings_title" msgid="2723190010708381889">"拥有者信息"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
@@ -267,32 +275,54 @@
     <string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM 卡锁定和凭据存储锁定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"设置我的位置、屏幕解锁和凭据存储锁定"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密码"</string>
-    <!-- outdated translation 3973555216065628262 -->     <string name="lock_settings_picker_title" msgid="8665454308380158195">"屏幕解锁保护"</string>
-    <!-- outdated translation 1129684221223017902 -->     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"设置屏幕锁定"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"加密"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"加密平板电脑"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"加密手机"</string>
+    <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="2150571569618349332">"您可以加密自己的帐户、设置、已下载的应用程序及其数据、媒体和其他文件。加密平板电脑后，您每次开机时都必须输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置，而这会清除平板电脑上的所有数据。"\n\n"加密过程需要一个小时或更长时间。在开始加密前，您必须先为电池充满电，并在加密完成前一直连接电源。如果您中断加密过程，则会丢失部分或全部数据。"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"您可以加密自己的帐户、设置、已下载的应用程序及其数据、媒体和其他文件。加密手机后，您每次开机时都必须输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置，而这会清除手机上的所有数据。"\n\n"加密过程需要一个小时或更长时间。在开始加密前，您必须先为电池充满电，并在加密完成前一直连接电源。如果您中断加密过程，则会丢失部分或全部数据。"</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="5920622844033087792">"请为电池充电，然后重试。"</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"请插上充电器，然后重试。"</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"没有锁定屏幕 PIN 或密码"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"您必须先设置锁定屏幕 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_setup_title" msgid="1783951453124244969">"正在加密"</string>
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
+    <skip />
+    <string name="crypt_keeper_cooldown" msgid="6736063610343230255">"^1 秒后重试。"</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"输入您的密码"</string>
+    <string name="crypt_keeper_failed_title" msgid="1166918236711686187">"加密失败"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"加密过程已中断，无法完成。您必须先恢复出厂设置（清除所有数据）才能继续使用平板电脑。您可以在恢复完成后尝试重新加密平板电脑。"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"加密过程已中断，无法完成。您必须先恢复出厂设置（清除所有数据）才能继续使用手机。您可以在恢复完成后尝试重新加密手机。"</string>
+    <string name="lock_settings_picker_title" msgid="8665454308380158195">"配置锁定屏幕"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"配置锁定屏幕"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"更改屏幕锁定"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"更改或停用图案、PIN 或密码保护"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"选择锁定屏幕的方法"</string>
     <string name="unlock_set_unlock_off_title" msgid="1613932765246180079">"关闭"</string>
-    <!-- outdated translation 2992485517488881365 -->     <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"不显示锁定屏幕"</string>
-    <!-- outdated translation 3760684669884671990 -->     <string name="unlock_set_unlock_none_title" msgid="5165705762615690332">"无"</string>
-    <!-- outdated translation 2658550480388272618 -->     <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"停用屏幕解锁保护"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"从不锁定屏幕"</string>
+    <string name="unlock_set_unlock_none_title" msgid="5165705762615690332">"不设置安全保护"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"不需要图案、PIN 或密码即可解锁屏幕"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"图案"</string>
-    <!-- outdated translation 3018395214738645405 -->     <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"绘制图案给屏幕解锁"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"需要图案才能解锁屏幕"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <!-- outdated translation 4131169672844263316 -->     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"输入数字 PIN 给屏幕解锁"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"需要数字 PIN 才能解锁屏幕"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"密码"</string>
-    <!-- outdated translation 4623254789833899286 -->     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"输入密码给屏幕解锁"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"已由远程设备管理员停用"</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_set_unlock_password_summary" msgid="7871968012198279034">"需要密码才能解锁屏幕"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"已由远程设备管理员停用"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"关闭"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"不设置安全保护"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"使用图案设置安全保护"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"使用 PIN 进行保护"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"通过密码设置安全保护"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"关闭屏幕锁定"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"删除解锁图案"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"删除解锁 PIN"</string>
@@ -304,8 +334,10 @@
     <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="7354418473281442589">"PIN 不得超过 %d 位数"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN 不得超过 %d 位数"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <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>
@@ -339,27 +371,22 @@
     <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="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"取消"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"下一页"</string>
     <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>
+    <string name="manage_device_admin" msgid="5059296715271077278">"设备管理器"</string>
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"查看或停用设备管理器"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"蓝牙"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"打开蓝牙"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"蓝牙设置"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"蓝牙设置"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"管理连接、设置设备名称和可检测性"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"蓝牙配对请求"</string>
-    <!-- no translation found for bluetooth_enter_pin_msg (1499285355129256289) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_msg (8301499416158195044) -->
-    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"输入 PIN 与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对。（请尝试 0000 或 1234。）您可能需要在蓝牙设备上输入同样的 PIN。"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8301499416158195044">\n"键入匹配密钥可与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对。"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"要与“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”配对，请核实其中是否显示匹配密钥：<xliff:g id="PASSKEY">%2$s</xliff:g>。"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"想要配对。"</string>
-    <!-- no translation found for bluetooth_display_passkey_pin_msg (9139892462102104755) -->
-    <skip />
+    <string name="bluetooth_display_passkey_pin_msg" msgid="9139892462102104755">"在“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”上输入“<xliff:g id="PASSKEY">%2$s</xliff:g>”进行配对，然后返回或输入。"</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"配对"</string>
     <string name="bluetooth_pairing_decline" msgid="930951069988011471">"不要配对"</string>
     <string name="bluetooth_remote_device" msgid="2406662802908395389">"蓝牙设备"</string>
@@ -382,18 +409,14 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"选项…"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"连接到..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"媒体"</string>
-    <!-- outdated translation 2252738313413646294 -->     <string name="bluetooth_profile_headset" msgid="81844079120986198">"平板电脑"</string>
+    <string name="bluetooth_profile_headset" msgid="81844079120986198">"免提"</string>
     <string name="bluetooth_profile_opp" msgid="3799470046565284440">"传输"</string>
     <string name="bluetooth_profile_hid" msgid="3000858580917633478">"输入设备"</string>
     <string name="bluetooth_profile_pan" msgid="4225813400648547154">"绑定"</string>
-    <!-- no translation found for bluetooth_disconnect_a2dp_profile (3524648279150937177) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_headset_profile (8635908811168780720) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_hid_profile (3282295189719352075) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_pan_profile (877883150720888525) -->
-    <skip />
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>将与媒体音频断开连接。"</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>将与免提音频断开连接。"</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>将与输入设备断开连接。"</string>
+    <string name="bluetooth_disconnect_pan_profile" msgid="877883150720888525">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>将与绑定断开连接。"</string>
     <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>选项"</string>
     <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"设备操作"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"连接"</string>
@@ -411,8 +434,7 @@
     <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_pan_profile_summary_use_for" msgid="5664884523822068653">"用于访问互联网"</string>
     <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>
@@ -420,9 +442,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"记住设置"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"使用近距离通信读取和交换标签"</string>
-    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
-    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
-    <skip />
+    <string name="nfc_toggle_error" msgid="2233172102497535522">"出现错误。"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"打开 Wi-Fi"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Wi-Fi 设置"</string>
@@ -435,6 +455,9 @@
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"无法通过扫描查找网络"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"网络通知"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"附近有开放网络时通知我"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Wi-Fi 断开连接策略"</string>
+    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"指定何时要从 Wi-Fi 切换到手机数据"</string>
+    <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"更改设置时出现问题"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"添加 Wi-Fi 网络"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi 网络"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"扫描"</string>
@@ -444,8 +467,10 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"修改网络"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"网络设置"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"从接入点输入 PIN"</string>
-    <string name="wifi_wps_pin_method_configuration" msgid="9019042137789692817">"WPS PIN 方法配置"</string>
+    <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS 设置"</string>
     <string name="wifi_wps_pin_output" msgid="8682102965680650853">"请输入接入点上的 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="2277409652621482331">"启动 WPS 失败，请重试"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"网络 SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"安全性"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"信号强度"</string>
@@ -474,10 +499,8 @@
     <string name="wifi_forget" msgid="8168174695608386644">"不保存"</string>
     <string name="wifi_save" msgid="3331121567988522826">"保存"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"取消"</string>
+    <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"系统检测到其他的 WPS 会话，请过几分钟再试"</string>
     <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"高级"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Wi-Fi 休眠策略"</string>
-    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"指定何时要从 Wi-Fi 切换到手机数据"</string>
-    <string name="wifi_setting_sleep_policy_error" msgid="5103670439972135148">"设置休眠策略时出现问题。"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi 频带"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"指定操作的频率范围"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"设置频带时出现问题。"</string>
@@ -504,7 +527,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> 便携式 Wi-Fi 热点"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android 热点"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"声音"</string>
-    <!-- outdated translation 1708697328627382561 -->     <string name="display_settings_title" msgid="2378894265964357591">"显示"</string>
+    <string name="display_settings_title" msgid="2378894265964357591">"屏幕"</string>
     <string name="sound_settings" msgid="5007659014828162881">"声音设置"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"静音模式"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"除媒体和闹钟以外，所有声音均设为静音"</string>
@@ -575,9 +598,8 @@
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"旋转手机时自动改变显示方向"</string>
     <string name="brightness" msgid="2354961343555249270">"亮度"</string>
     <string name="brightness_summary" msgid="838917350127550703">"调整屏幕亮度"</string>
-    <!-- outdated translation 4882669461447531301 -->     <string name="screen_timeout" msgid="6962654593018319466">"屏幕超时"</string>
-    <!-- no translation found for screen_timeout_summary (4471347210332380587) -->
-    <skip />
+    <string name="screen_timeout" msgid="6962654593018319466">"超时"</string>
+    <string name="screen_timeout_summary" msgid="4471347210332380587">"屏幕会在 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后自动关闭"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"自动调整亮度"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 卡锁定设置"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"设置 SIM 卡锁定"</string>
@@ -614,13 +636,14 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"不可用"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"状态消息"</string>
     <string name="device_status" msgid="607405385799807324">"状态消息"</string>
-    <!-- outdated translation 1393072115751923019 -->     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"移动通信国际识别码、电话号码、信号等"</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"电池状态、网络状态和其他信息"</string>
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"电话号码、信号等"</string>
     <string name="storage_settings" msgid="4211799979832404953">"存储"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"存储设置"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"卸载 USB 存储设备，查看可用存储设备"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"卸载 SD 卡，查看可用存储设备"</string>
-    <string name="status_number" msgid="5123197324870153205">"本机号码"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"移动目录编号 (MDN)"</string>
+    <string name="status_number" product="default" msgid="5123197324870153205">"本机号码"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL 版本"</string>
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
@@ -635,15 +658,14 @@
     <string name="status_unavailable" msgid="7862009036663793314">"不可用"</string>
     <string name="status_up_time" msgid="7294859476816760399">"开机时间"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"唤醒时间"</string>
-    <string name="internal_memory" msgid="9129595691484260784">"内部存储设备"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"内部存储空间"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB 存储设备"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD 卡"</string>
-    <string name="memory_available" msgid="418542433817289474">"可用空间"</string>
-    <string name="memory_size" msgid="6629067715017232195">"总容量"</string>
-    <!-- no translation found for memory_calculating_size (2188358544203768588) -->
-    <skip />
-    <string name="memory_apps_usage" msgid="5818922761412589352">"应用程序使用情况"</string>
-    <string name="memory_media_usage" msgid="5655498435493764372">"媒体使用情况"</string>
+    <string name="memory_available" msgid="5052397223077021181">"可用空间"</string>
+    <string name="memory_size" msgid="5458889090691922288">"总存储空间"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"正在计算..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"应用程序"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"媒体"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"卸载共享存储设备"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"卸载 SD 卡"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"卸载内部 USB 存储设备"</string>
@@ -652,12 +674,12 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"插入 SD 卡进行安装"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"装载 USB 存储设备"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"安装 SD 卡"</string>
-    <!-- outdated translation 6733254203291665551 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"装载内部 USB 存储设备"</string>
+    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"装载 USB 存储器"</string>
     <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"安装 SD 卡"</string>
     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"格式化 USB 存储设备"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"格式化 SD 卡"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"清除内部 USB 存储设备中的全部数据，例如音乐和照片"</string>
-    <!-- outdated translation 6331905044907914603 -->     <string name="sd_format_summary" product="default" msgid="212703692181793109">"清除内部 USB 存储设备中的全部数据，例如音乐和照片"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"清除 SD 卡中的全部数据，例如音乐和照片"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"不可用"</string>
     <string name="read_only" msgid="6702420168629076340">" （只读）"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"卸载 USB 存储设备"</string>
@@ -695,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP 或 CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN 类型"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"删除 APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"新建 APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"保存"</string>
@@ -713,8 +737,9 @@
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"此操作会清除您手机的"<b>"内部存储设备"</b>"中的全部数据，包括："\n\n<li>"您的 Google 帐户"</li>\n<li>"系统和应用程序数据和设置"</li>\n<li>"已下载的应用程序"</li></string>
     <string name="master_clear_desc" product="default" msgid="2950536633526374209">"此操作会清除您手机的"<b>"内部存储设备"</b>"中的全部数据，包括："\n\n<li>"您的 Google 帐户"</li>\n<li>"系统和应用程序数据和设置"</li>\n<li>"已下载的应用程序"</li></string>
     <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>
-    <!-- outdated translation 4740866328425123395 -->     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"要清除音乐、照片和其他用户数据，请格式化 "<b>"USB 存储设备"</b>"。"</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"如果也要删除音乐、图片和其他用户数据，则需要清除 "<b>"SD 卡"</b>"。"</string>
     <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>
@@ -787,9 +812,9 @@
     <string name="assisted_gps" msgid="4649317129586736885">"使用增强型 GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"使用服务器来辅助 GPS（取消选中可降低网络使用率）"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"使用服务器来辅助 GPS（取消选中可提高 GPS 性能）"</string>
-    <!-- outdated translation 3214740644957841179 -->     <string name="use_location_title" msgid="3659340070401464551">"将位置用于 Google 搜索"</string>
-    <!-- outdated translation 1876901471649359806 -->     <string name="use_location_summary_disabled" msgid="6518008620918354403">"将位置用于 Google 搜索和 Google 的其他服务"</string>
-    <!-- outdated translation 984549156918597265 -->     <string name="use_location_summary_enabled" msgid="8110246289085796179">"已将位置用于改进 Google 搜索结果和 Google 的其他服务"</string>
+    <string name="use_location_title" msgid="3659340070401464551">"将位置信息用于 Google 搜索"</string>
+    <string name="use_location_summary_disabled" msgid="6518008620918354403">"将位置信息用于 Google 搜索和 Google 的其他服务"</string>
+    <string name="use_location_summary_enabled" msgid="8110246289085796179">"已将位置信息用于改善 Google 搜索结果和 Google 的其他服务"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"关于平板电脑"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"关于手机"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"查看法律信息、状态和软件版本"</string>
@@ -820,7 +845,7 @@
     <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>
-    <!-- outdated translation 975088518210629938 -->     <string name="lock_settings_title" msgid="8943058958424073651">"屏幕解锁"</string>
+    <string name="lock_settings_title" msgid="8943058958424073651">"锁定屏幕"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"更改解锁图案"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"更改解锁 PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"确认已保存的图案"</string>
@@ -850,10 +875,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>
-    <!-- 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="tablet" msgid="3692151094288835065">"通过创建个人屏幕解锁图案，防止他人未经授权使用您的平板电脑。用手指按任意顺序连接下一屏幕上的点，但至少要连接四个点。"\n\n"可以开始了吗？触摸“下一步”。"</string>
     <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="manageapplications_settings_title" msgid="5712405848153426706">"管理应用程序"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"管理和删除安装的应用程序"</string>
@@ -876,6 +898,8 @@
     <string name="total_size_label" msgid="1048676419552557254">"总计"</string>
     <string name="application_size_label" msgid="5055196275624686382">"应用程序"</string>
     <string name="data_size_label" msgid="8679376373625710107">"数据"</string>
+    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"USB 存储器"</string>
+    <string name="external_size_label" product="default" msgid="2107155737635944440">"SD 卡"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"卸载"</string>
     <string name="disable_text" msgid="6544054052049395202">"停用"</string>
     <string name="enable_text" msgid="9217362512327828987">"启用"</string>
@@ -899,7 +923,7 @@
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD 卡中"</string>
     <string name="disabled" msgid="9206776641295849915">"已停用"</string>
     <string name="no_applications" msgid="5190227407135243904">"无应用程序。"</string>
-    <string name="internal_storage" msgid="1584700623164275282">"内部存储设备"</string>
+    <string name="internal_storage" msgid="1584700623164275282">"内部存储空间"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB 存储设备"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD 卡存储设备"</string>
     <string name="recompute_size" msgid="7722567982831691718">"正在重新计算大小..."</string>
@@ -972,15 +996,15 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"要停止系统服务吗？"</string>
     <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>
-    <!-- outdated translation 3455826933385341107 -->     <string name="language_keyboard_settings_title" msgid="243220021717425813">"语言和键盘设置"</string>
+    <string name="language_settings" msgid="5292716747264442359">"语言和输入设备"</string>
+    <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>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"自动替换"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"更正错误输入的字词"</string>
-    <!-- outdated translation 581633131114124121 -->     <string name="auto_caps" msgid="6379232078052591265">"自动大写"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"自动大写"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"将句首字母大写"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"自动加标点"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"物理键盘设置"</string>
@@ -1014,27 +1038,17 @@
     <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 />
-    <!-- no translation found for use_system_language_to_select_input_method_subtypes (3346751753141428573) -->
-    <skip />
+    <string name="current_input_method" msgid="2146807723398303917">"当前输入法"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"输入法选择器"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"自动"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"总是显示"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"始终隐藏"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"配置输入法"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"设置"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"有效的输入法"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"使用系统语言"</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 (4018402267502337338) -->
-    <skip />
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"选择有效的输入法"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"屏幕键盘设置"</string>
     <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"内置键盘"</string>
     <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"内置物理键盘设置"</string>
@@ -1097,9 +1111,8 @@
     <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi 开启时间"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi 开启时间"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <!-- no translation found for history_details_title (3608240585315506067) -->
-    <skip />
-    <!-- outdated translation 7564809986329021063 -->     <string name="details_title" msgid="3792801565213935385">"电量使用详情"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"历史记录详细信息"</string>
+    <string name="details_title" msgid="3792801565213935385">"使用详情"</string>
     <string name="details_subtitle" msgid="32593908269911734">"详细使用情况"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"调配电量"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"包括的软件包"</string>
@@ -1185,7 +1198,7 @@
     <string name="tts_engine_error_reselect" msgid="3071453963296013376">"选择其他引擎"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"此语音合成引擎能够收集语音中出现的所有信息，包括密码和信用卡号码之类的个人数据。此功能由 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> 引擎提供。是否启用此语音合成引擎？"</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"引擎"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> 设置"</string>
+    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>设置"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"已启用 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"已停用 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"语言和语音"</string>
@@ -1234,8 +1247,7 @@
     <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"服务器协商失败。该服务器可能不认可您的加密选项。是否要检查您的加密设置？"</string>
     <string name="vpn_type_title" msgid="6392933604218676224">"添加虚拟专用网"</string>
     <string name="vpn_add_new_vpn" msgid="5438260689052714550">"添加虚拟专用网"</string>
-    <!-- no translation found for vpn_details_title (418806440938510331) -->
-    <skip />
+    <string name="vpn_details_title" msgid="418806440938510331">"VPN 详细信息"</string>
     <string name="vpn_edit_title_add" msgid="2121313217989682890">"添加 VPN“<xliff:g id="NAME">%s</xliff:g>”"</string>
     <string name="vpn_edit_title_edit" msgid="2457278794066617935">"“<xliff:g id="NAME">%s</xliff:g>”详情"</string>
     <string name="vpns" msgid="3148141862835492816">"虚拟专用网"</string>
@@ -1278,44 +1290,31 @@
     <string name="vpn_settings_summary" msgid="8849924181594963972">"设置和管理虚拟专用网"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"（未更改）"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"（未设置）"</string>
-    <string name="credentials_category" msgid="8536992056377271234">"凭证存储"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"凭据存储"</string>
     <string name="credentials_access" msgid="4843187230913860492">"使用安全凭证"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"允许应用程序访问安全凭证和其他凭证"</string>
-    <string name="credentials_unlock" msgid="1463040326264133844">"输入密码"</string>
-    <string name="credentials_unlock_hint" msgid="594679530407918031">"输入凭证存储密码。"</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"从 USB 存储设备安装"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"从 SD 卡安装"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"从 USB 存储设备安装已加密的证书"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"从 SD 卡安装加密的证书"</string>
+    <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"从 USB 存储设备安装"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"从 SD 卡安装"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"从 USB 存储设备安装证书"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"从 SD 卡安装证书"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"设置密码"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"设置或更改凭证存储密码"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"清除存储"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"清除所有内容的凭证存储并重置其密码"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"确定要删除所有凭证，并且重置凭证存储密码吗？"</string>
+    <string name="credentials_set_password_summary" msgid="6756719720826053228">"设置或更改凭据存储密码"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"清除凭据"</string>
+    <string name="credentials_reset_summary" msgid="3810369467217453606">"删除所有内容并重置密码"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"输入密码"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"输入凭据存储密码。"</string>
+    <string name="credentials_password_hint" msgid="4915128717409363024">"设置凭据存储密码（至少 8 个字符）。"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"当前密码："</string>
     <string name="credentials_new_password" msgid="267487774686796938">"新密码："</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"确认新密码："</string>
-    <string name="credentials_first_time_hint" msgid="1567821077545346039">"设置凭证存储密码（至少 8 个字符）。"</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"请输入正确的密码。"</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"请输入正确的密码。在系统删除该凭证存储之前，您还有一次输入正确密码的机会。"</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"请输入正确的密码。在系统删除该凭证存储之前，您还有 <xliff:g id="NUMBER">%1$d</xliff:g> 次输入正确密码的机会。"</string>
+    <string name="credentials_reset_hint" msgid="2336340927894094814">"系统会删除所有内容并重置密码。您确定要执行此操作吗？"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"密码不匹配。"</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"您需要输入并确认密码。"</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"请输入密码。"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"密码至少应包含 8 个字符。"</string>
-    <string name="credentials_erased" msgid="7700309135582200849">"该凭证存储已删除。"</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"密码不正确。"</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"密码不正确。您还可以重试一次，如果输入的密码仍不正确，系统将删除凭据存储。"</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"密码不正确。您还可以重试 <xliff:g id="NUMBER">%1$d</xliff:g> 次，如果输入的密码仍不正确，系统将删除凭据存储。"</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"凭据存储已删除。"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"凭证存储已启用。"</string>
-    <string name="credentials_disabled" msgid="7453188089059045380">"凭证存储已停用。"</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"加密文件系统"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"加密用户私人数据"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"在此设备中针对用户私人数据启用加密文件系统存储"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"必须清除设备数据才能启用加密文件系统。"</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"必须清除设备数据才能停用加密文件系统。"</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"启用"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"停用"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"取消"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"已取消加密文件系统的模式更改。"</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"加密文件系统警告。"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"紧急提示音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"设置进行紧急呼救时的行为"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"隐私权"</string>
@@ -1345,7 +1344,11 @@
     <string name="sound_category_calls_title" msgid="3688531959256239012">"来电"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"通知"</string>
     <string name="sound_category_feedback_title" msgid="4399742321363475393">"反馈"</string>
-    <!-- outdated translation 3130584822275278425 -->     <string name="wifi_setup_title" msgid="661074868726906436">"WiFi 设置"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi 设置"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"连接到 Wi-Fi 网络<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"正在连接到 Wi-Fi 网络<xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"已连接到 Wi-Fi 网络<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"添加网络"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"未连接"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"添加网络"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"刷新列表"</string>
@@ -1358,7 +1361,7 @@
     <string name="wifi_setup_save" msgid="3659235094218508211">"保存"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"取消"</string>
     <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_select_network" msgid="7519563569903137003">"触摸某个网络即可与其连接"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"连接到现有网络"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"连接到不受保护的网络"</string>
     <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"输入网络配置"</string>
@@ -1366,7 +1369,9 @@
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"正在连接..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"继续下一步"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"不支持 EAP"</string>
-    <string name="wifi_setup_eap_not_supported" msgid="5083895763075722698">"不能在设置过程中配置 EAP Wi-Fi 连接。设置完成后，您可以在“设置”下的“无线和网络”中进行配置。"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"不能在设置过程中配置 EAP Wi-Fi 连接。设置完成后，您可以在“设置”下的"<b>"无线和网络"</b>"中进行配置。"</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"建立连接可能需要几分钟的时间..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"触摸"<b>"下一步"</b>"可继续进行设置。"\n\n"触摸"<b>"返回"</b>"可连接到其他 Wi-Fi 网络。"</string>
     <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>
@@ -1382,45 +1387,32 @@
     <string name="sync_disabled" msgid="8511659877596511991">"同步功能已关闭"</string>
     <string name="sync_error" msgid="5060969083117872149">"同步出错"</string>
     <string name="settings_backup" msgid="2274732978260797031">"备份设置"</string>
-    <!-- no translation found for settings_backup_summary (7916877705938054035) -->
-    <skip />
+    <string name="settings_backup_summary" msgid="7916877705938054035">"备份我的设置"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"立即同步"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"取消同步"</string>
-    <!-- no translation found for sync_one_time_sync (6766593624598183090) -->
-    <skip />
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"触摸可立即同步（<xliff:g id="LAST_SYNC_TIME">
+%1$s</xliff:g>）"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"日历"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"联系人"</string>
-    <!-- no translation found for sync_plug (5952575609349860569) -->
-    <skip />
-    <!-- no translation found for header_application_sync_settings (5514539555293976035) -->
-    <skip />
-    <!-- no translation found for header_data_and_synchronization (5165024023936509896) -->
-    <skip />
-    <!-- no translation found for preference_change_password_title (8955581790270130056) -->
-    <skip />
-    <!-- no translation found for header_account_settings (5382475087121880626) -->
-    <skip />
-    <!-- no translation found for remove_account_label (5921986026504804119) -->
-    <skip />
-    <!-- no translation found for header_add_an_account (756108499532023798) -->
-    <skip />
-    <!-- no translation found for finish_button_label (481587707657751116) -->
-    <skip />
-    <!-- no translation found for really_remove_account_title (6574643117748564960) -->
-    <skip />
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"欢迎使用“Google Sync”！"</font>\n"Google 的这款同步数据工具可让您随时随地访问您的联系人、约会以及更多信息。"</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"应用程序同步设置"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"数据与同步"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"更改密码"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"帐户设置"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"删除帐户"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"添加帐户"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"完成"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"删除帐户"</string>
     <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"确实要删除此帐户吗？删除该帐户会同时从平板设备中删除其所有讯息、联系人以及其他数据。"\n"是否继续？"</string>
     <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"确实要删除此帐户吗？删除该帐户会同时从手机中删除其所有讯息、联系人以及其他数据。"\n"是否继续？"</string>
-    <!-- no translation found for remove_account_failed (1093911989149396624) -->
-    <skip />
-    <!-- no translation found for remove_account_failed (9174390193652391412) -->
-    <skip />
-    <!-- no translation found for provider_label (7724593781904508866) -->
-    <skip />
-    <!-- no translation found for sync_item_title (1931551540462877488) -->
-    <skip />
-    <!-- no translation found for cant_sync_dialog_title (7185199796123573317) -->
-    <skip />
-    <!-- no translation found for cant_sync_dialog_message (2372359241135295930) -->
-    <skip />
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"某些应用程序需要使用此帐户。您只有将平板电脑重置为出厂默认设置（此操作会删除您的所有个人数据），才能删除此帐户。您可以在“设置”应用程序的“隐私”下执行此操作。"</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"某些应用程序需要使用此帐户。您只有将手机重置为出厂默认设置（此操作会删除您所有的个人数据），才能删除此帐户。您可以在“设置”应用程序的“隐私”下执行此操作。"</string>
+    <string name="provider_label" msgid="7724593781904508866">"推送订阅"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"同步<xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"无法手动同步"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"当前已停止同步此条目。要更改您的偏好设置，请暂时启用背景数据和自动同步功能。"</string>
+    <string name="enter_password" msgid="3268224850821675915">"输入密码，解密存储设备"</string>
+    <string name="try_again" msgid="5904121494468643129">"很抱歉，请重试"</string>
+    <string name="service_busy" msgid="225227519012409130">"服务正忙，请重试"</string>
 </resources>