Import revised translations.

Change-Id: If127a3dcc17eb1ddebf5ef4cb08bb3b1dcfdc418

2 files changed, 33 insertions, 19 deletions

diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 65f526e..fafeea4 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -167,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"无"</item>
-    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"静态"</item>
+    <item msgid="8673874894887358090">"手动"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"关"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5899fcc..4f1f9f4 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -147,11 +147,11 @@
     <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>
-    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"端口"</string>
+    <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>
-    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"主机名"</string>
+    <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>
@@ -159,8 +159,7 @@
     <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="proxy_warning_limited_support" msgid="7442676587591460854">"浏览器使用 HTTP 代理，但其他应用程序可能不会使用"</string>
     <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>
@@ -220,7 +219,7 @@
     <string name="activity_picker_label" msgid="4910700713930693329">"选择活动"</string>
     <string name="device_info_label" msgid="6551553813651711205">"设备信息"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"电池信息"</string>
-    <string name="display_label" msgid="7403874003169865762">"显示"</string>
+    <!-- outdated translation 7403874003169865762 -->     <string name="display_label" msgid="8074070940506840792">"显示"</string>
     <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"平板电脑信息"</string>
     <string name="phone_info_label" product="default" msgid="2127552523124277664">"手机信息"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB 存储设备"</string>
@@ -334,10 +333,8 @@
     <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>
-    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
-    <skip />
-    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
-    <skip />
+    <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>
@@ -587,7 +584,7 @@
     <string name="sync_settings_summary" msgid="2962179505214965667">"添加或删除帐户和更改帐户设置"</string>
     <string name="search_settings" msgid="1910951467596035063">"搜索"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"管理搜索设置和历史记录"</string>
-    <string name="display_settings" msgid="3912042046350078328">"显示设置"</string>
+    <!-- outdated translation 3912042046350078328 -->     <string name="display_settings" msgid="5947830029420609057">"显示设置"</string>
     <string name="animations_title" msgid="1062189037402346023">"动画"</string>
     <string name="animations_summary_on" msgid="8843613112130484436">"打开和关闭窗口时显示动画"</string>
     <string name="animations_summary_off" msgid="2777026828025551983">"打开和关闭窗口时显示动画"</string>
@@ -666,6 +663,14 @@
     <string name="memory_calculating_size" msgid="2188358544203768588">"正在计算..."</string>
     <string name="memory_apps_usage" msgid="9079237985722858506">"应用程序"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"媒体"</string>
+    <!-- no translation found for memory_downloads_usage (3755173051677533027) -->
+    <skip />
+    <!-- no translation found for memory_dcim_usage (6679615808140067136) -->
+    <skip />
+    <!-- no translation found for memory_music_usage (4040027367622874108) -->
+    <skip />
+    <!-- no translation found for memory_media_misc_usage (235452944021647124) -->
+    <skip />
     <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>
@@ -717,8 +722,7 @@
     <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="apn_protocol" msgid="3272222921649348640">"APN 协议"</string>
     <string name="menu_delete" msgid="6981294422841124659">"删除 APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"新建 APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"保存"</string>
@@ -1050,8 +1054,8 @@
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> 设置"</string>
     <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>
+    <!-- outdated translation 5274990495405941804 -->     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"内置键盘"</string>
+    <!-- outdated translation 7990296351888096836 -->     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"内置物理键盘设置"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"开发"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"设置应用程序开发选项"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB 调试"</string>
@@ -1116,7 +1120,7 @@
     <string name="details_subtitle" msgid="32593908269911734">"详细使用情况"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"调配电量"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"包括的软件包"</string>
-    <string name="power_screen" msgid="2353149143338929583">"显示屏"</string>
+    <!-- outdated translation 2353149143338929583 -->     <string name="power_screen" msgid="3023346080675904613">"显示屏"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"蓝牙"</string>
     <string name="power_cell" msgid="6596471490976003056">"手机待机"</string>
@@ -1139,7 +1143,7 @@
     <string name="battery_action_stop" msgid="649958863744041872">"强行停止"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"应用程序信息"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"应用程序设置"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"显示设置"</string>
+    <!-- outdated translation 5302763261448580102 -->     <string name="battery_action_display" msgid="7338551244519110831">"显示设置"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi 设置"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"蓝牙设置"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"语音通话所耗的电量"</string>
@@ -1293,9 +1297,9 @@
     <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_install" product="nosdcard" msgid="1395748667227729987">"从 USB 存储设备安装"</string>
+    <!-- outdated translation 1395748667227729987 -->     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"从 USB 存储设备安装"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"从 SD 卡安装"</string>
-    <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"从 USB 存储设备安装证书"</string>
+    <!-- outdated translation 3679446246093149828 -->     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"从 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="6756719720826053228">"设置或更改凭据存储密码"</string>
@@ -1415,4 +1419,14 @@
     <string name="enter_password" msgid="3268224850821675915">"输入密码，解密存储设备"</string>
     <string name="try_again" msgid="5904121494468643129">"很抱歉，请重试"</string>
     <string name="service_busy" msgid="225227519012409130">"服务正忙，请重试"</string>
+    <!-- no translation found for delete (4219243412325163003) -->
+    <skip />
+    <!-- no translation found for misc_files (6298643430106707497) -->
+    <skip />
+    <!-- no translation found for misc_files_selected_count (9131622592106231274) -->
+    <skip />
+    <!-- no translation found for misc_files_selected_count_out_of (3181533298684350893) -->
+    <skip />
+    <!-- no translation found for select_all (6783085295161532497) -->
+    <skip />
 </resources>