Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev

2 files changed, 31 insertions, 109 deletions

diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 2529dea..4940c23 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -253,13 +253,6 @@
     <item msgid="3170120558236848008">"动画缩放 5x"</item>
     <item msgid="1069584980746680398">"动画缩放 10x"</item>
   </string-array>
-  <string-array name="overlay_display_devices_entries">
-    <item msgid="1606809880904982133">"无"</item>
-    <item msgid="688482401508173818">"720x480 mdpi"</item>
-    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
-    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
-    <item msgid="3646519549495410112">"1280x720 tvdpi 和 1920x1080 xhdpi"</item>
-  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"标准限制"</item>
     <item msgid="4071574792028999443">"不允许后台进程"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f8ebd02..469cdeb 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -600,7 +600,6 @@
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"正在搜索…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"重命名设备"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"对等设备"</string>
-    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"已保存的群组"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"无法连接。"</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"无法重命名设备。"</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"断开连接？"</string>
@@ -608,8 +607,6 @@
     <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_p2p_cancel_connect_title" msgid="255267538099324413">"取消邀请？"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"要取消连接<xliff:g id="PEER_NAME">%1$s</xliff:g>的邀请吗？"</string>
-    <string name="wifi_p2p_delete_group_title" msgid="8049872630241986374">"删除群组吗？"</string>
-    <string name="wifi_p2p_delete_group_message" msgid="5521624017163200215">"您想要删除群组“<xliff:g id="GROUP_NAME">%1$s</xliff:g>”吗？"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"便携式 Wi-Fi 热点"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"正在打开热点..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"正在关闭热点..."</string>
@@ -682,16 +679,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"壁纸"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"选择壁纸来源"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"梦"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"插入基座或休眠且正在充电时"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"任意一种情况"</string>
-    <string name="screensaver_settings_summary_sleep" msgid="3642352561593337637">"休眠且正在充电时"</string>
-    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"插入基座时"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"插入基座或休眠且正在充电时"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"休眠且正在充电时"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"插入基座时"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"已停用"</string>
-    <string name="screensaver_settings_disabled_prompt" msgid="2060724968623677666">"要控制手机在插入基座时和/或休眠状态下的行为，请启用“梦”。"</string>
-    <string name="screensaver_settings_start_dreaming" msgid="1695787491111862810">"立即入梦"</string>
-    <string name="screensaver_settings_when_to_dream" msgid="9110320844270942351">"何时入梦"</string>
-    <!-- no translation found for screensaver_settings_dream_start (1265346994126658796) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"所选的梦"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"激活时间"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"闲置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"永不"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"试试看！"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"休眠时启动"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"插入基座时启动"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"自动调整亮度"</string>
     <string name="title_font_size" msgid="4405544325522105222">"字体大小"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"字体大小"</string>
@@ -761,8 +759,6 @@
     <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="5052397223077021181">"可用空间"</string>
-    <!-- no translation found for memory_available_read_only (6497534390167920206) -->
-    <skip />
     <string name="memory_size" msgid="6629067715017232195">"总容量"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"正在计算..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"应用（应用数据和媒体内容）"</string>
@@ -786,6 +782,7 @@
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"清除内部 USB 存储设备中的全部数据，例如音乐和照片"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"清除 SD 卡中的全部数据，例如音乐和照片"</string>
     <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP 或 PTP 功能已启用"</string>
+    <string name="read_only" msgid="6702420168629076340">" （只读）"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"要卸载 USB 存储设备吗？"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"要卸载 SD 卡吗？"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"如果卸载该 USB 存储设备，您当前使用的某些应用会停止运行，并且在您重新装载该设备前可能都无法使用。"</string>
@@ -808,8 +805,6 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"相机 (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"让您可以使用相机软件传输照片，并在不支持 MTP 的计算机上传输任何文件"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"安装文件传输工具"</string>
-    <!-- no translation found for storage_other_users (808708845102611856) -->
-    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"电池状态"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"电池电量"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -998,10 +993,6 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"允许安装来自未知来源的应用"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"您的平板电脑和个人数据更容易受到从未知来源获取的应用的攻击。对于因使用这些应用而造成的平板电脑损坏或数据丢失，您同意自行承担全部责任。"</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"您的手机和个人数据更容易受到从未知来源获取的应用的攻击。对于因使用这些应用而造成的手机损坏或数据丢失，您同意自行承担全部责任。"</string>
-    <!-- no translation found for verify_applications (3532112158501736577) -->
-    <skip />
-    <!-- no translation found for verify_applications_summary (6737505521913263792) -->
-    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"高级设置"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"启用更多设置选项"</string>
     <string name="application_info_label" msgid="5736524913065714880">"应用信息"</string>
@@ -1259,31 +1250,14 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"辅助功能设置"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"服务"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"系统"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (159538947700130120) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (3349112911447101716) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_large_text_preference_title (6307247527580207161) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_screen_magnification_preference_title (2472285215737820469) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_screen_magnification_auto_update_preference_title (7218498768415430963) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_screen_magnification_auto_update_preference_summary (4392059334816220155) -->
-    <skip />
-    <!-- no translation found for accessibility_power_button_ends_call_prerefence_title (6673851944175874235) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_speak_password_preference_title (5986628515113204844) -->
-    <skip />
-    <!-- no translation found for accessibility_long_press_timeout_preference_title (6708467774619266508) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_script_injection_preference_title (7950932054266694403) -->
-    <skip />
+    <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_long_press_timeout_title" msgid="2373216941395035306">"触摸和按住延迟"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"增强网页辅助功能"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"设置"</string>
-    <!-- no translation found for accessibility_feature_state_on (2864292320042673806) -->
-    <skip />
-    <!-- no translation found for accessibility_feature_state_off (4172584906487070211) -->
-    <skip />
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"启用"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"关闭"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"允许"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"不允许"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"允许"</string>
@@ -1366,8 +1340,6 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"停止或卸载应用"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"手动控制 GPS，以阻止应用使用它"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"该应用中可能提供了用于减少耗电量的设置"</string>
-    <!-- no translation found for battery_desc_users (7682989161885027823) -->
-    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"拔下电源后已过 <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"上次拔下电源 <xliff:g id="UNPLUGGED">%1$s</xliff:g> 时"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"总使用量"</string>
@@ -1424,34 +1396,6 @@
     <string name="gadget_title" msgid="5519037532720577836">"电量控制"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"正在更新 Wi-Fi 设置"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"正在更新蓝牙设置"</string>
-    <!-- no translation found for gadget_state_template (5156935629902649932) -->
-    <skip />
-    <!-- no translation found for gadget_state_on (6909119593004937688) -->
-    <skip />
-    <!-- no translation found for gadget_state_off (5220212352953066317) -->
-    <skip />
-    <!-- no translation found for gadget_state_turning_on (3395992057029439039) -->
-    <skip />
-    <!-- no translation found for gadget_state_turning_off (2395546048102176157) -->
-    <skip />
-    <!-- no translation found for gadget_wifi (5960290421313061434) -->
-    <skip />
-    <!-- no translation found for gadget_bluetooth (8998572807378694410) -->
-    <skip />
-    <!-- no translation found for gadget_gps (1558173602059236567) -->
-    <skip />
-    <!-- no translation found for gadget_sync (858895763714222152) -->
-    <skip />
-    <!-- no translation found for gadget_brightness_template (930541920933123603) -->
-    <skip />
-    <!-- no translation found for gadget_brightness_state_auto (6667967252426515446) -->
-    <skip />
-    <!-- no translation found for gadget_brightness_state_full (6814570109772137631) -->
-    <skip />
-    <!-- no translation found for gadget_brightness_state_half (3696671957608774204) -->
-    <skip />
-    <!-- no translation found for gadget_brightness_state_off (946382262872753084) -->
-    <skip />
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"凭据存储"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"从存储设备安装"</string>
@@ -1637,19 +1581,12 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"窗口动画缩放"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"过渡动画缩放"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"动画程序时长调整"</string>
-    <string name="overlay_display_devices_title" msgid="5364176287998398539">"模拟辅助显示设备"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"应用"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"不保留活动"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"用户离开后即销毁每个活动"</string>
     <string name="app_process_limit_title" msgid="4280600650253107163">"后台进程限制"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"显示所有“应用无响应”(ANR)"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"为后台应用显示“应用无响应”对话框"</string>
-    <!-- no translation found for debug_accessibility_category (3417643359072054409) -->
-    <skip />
-    <!-- no translation found for display_magnification_auto_update (4236067240516003515) -->
-    <skip />
-    <!-- no translation found for display_magnification_auto_update_summary (5022668486882658025) -->
-    <skip />
     <string name="data_usage_summary_title" msgid="3804110657238092929">"流量使用情况"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"流量使用周期"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"移动数据网络漫游"</string>
@@ -1746,7 +1683,7 @@
     <string name="vpn_menu_edit" msgid="408275284159243490">"修改配置文件"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"删除配置文件"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"始终处于打开状态的 VPN"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"选择要始终保持连接的 VPN 配置文件。只有在连接到此 VPN 之后才可以使用网络。"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"选择要始终保持连接的 VPN 配置文件。只有在连接到此 VPN 之后才可以使用网络流量。"</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"无"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"始终处于打开状态的 VPN 需要服务器和 DNS 的 IP 地址。"</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"目前没有网络连接。请稍后重试。"</string>
@@ -1770,31 +1707,23 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"已停用"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"许可"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"执行中"</string>
-    <string name="user_settings_title" msgid="6151874007858148344">"用户"</string>
-    <!-- no translation found for user_list_title (8866161687358773982) -->
+    <!-- no translation found for user_settings_title (6151874007858148344) -->
     <skip />
+    <string name="user_list_title" msgid="2152311434413878709">"用户"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"添加用户"</string>
-    <!-- no translation found for user_summary_active (4740649452346004418) -->
-    <skip />
-    <!-- no translation found for user_summary_inactive (3758296246095054572) -->
-    <skip />
-    <!-- no translation found for user_owner (3879126011135546571) -->
-    <skip />
-    <!-- no translation found for user_nickname (5148818000228994488) -->
-    <skip />
-    <!-- no translation found for user_add_user_title (3961861593718285403) -->
-    <skip />
-    <!-- no translation found for user_add_user_message (140543405860254208) -->
-    <skip />
+    <string name="user_details_title" msgid="3037625632127241370">"修改详细信息"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"用户信息"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"用户名"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"内容限制"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"需要 PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"内容分级"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"系统应用"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"已安装的应用"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"舍弃"</string>
     <string name="user_remove_user_menu" msgid="3210146886949340574">"删除用户"</string>
-    <!-- no translation found for user_new_user_name (369856859816028856) -->
-    <skip />
+    <string name="user_new_user_name" msgid="7603010274765911161">"Pesky kid"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"是否删除用户？"</string>
     <string name="user_confirm_remove_message" msgid="5284111415714437285">"您确定要从设备中删除该用户和所有相关数据吗？"</string>
-    <!-- no translation found for user_adding_new_user (1521674650874241407) -->
-    <skip />
-    <!-- no translation found for user_delete_user_description (3158592592118767056) -->
-    <skip />
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"显示通知"</string>
     <string name="help_label" msgid="1107174367904110532">"帮助"</string>
     <string name="user_account_title" msgid="1127193807312271167">"内容帐户"</string>