Revert "Import translations. DO NOT MERGE"

Broke the build.

This reverts commit d08dce4e693d898f12dacac23e84cf17ec3d6ec6

Change-Id: I512a72571adfa5c8cd893a72c7dc40570decec47

2 files changed, 13 insertions, 22 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 af33367..bd5f754 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -602,7 +602,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>
@@ -610,8 +609,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>
@@ -684,16 +681,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">"要控制手机在插入基座时和/或休眠状态下的行为，请启用 Dream。"</string>
-    <string name="screensaver_settings_start_dreaming" msgid="1695787491111862810">"立即开始启用 Dream"</string>
-    <string name="screensaver_settings_when_to_dream" msgid="9110320844270942351">"何时启用 Dream"</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>
@@ -1585,7 +1583,6 @@
     <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>
@@ -1688,7 +1685,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>
@@ -1712,7 +1709,8 @@
     <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_settings_title (6151874007858148344) -->
+    <skip />
     <string name="user_list_title" msgid="2152311434413878709">"用户"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"添加用户"</string>
     <string name="user_details_title" msgid="3037625632127241370">"修改详细信息"</string>