Revert "Import translations. DO NOT MERGE"

Broken Build.

This reverts commit e88b7faf434ef1ddecf341e6c3470bc055610bb7

Change-Id: I6860b5d4694e8f6338c190f14c6e615a45030076

2 files changed, 22 insertions, 54 deletions

diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 6527365..0af57e7 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -253,13 +253,6 @@
     <item msgid="3170120558236848008">"Animation scale 5x"</item>
     <item msgid="1069584980746680398">"Animation scale 10x"</item>
   </string-array>
-  <string-array name="overlay_display_devices_entries">
-    <item msgid="1606809880904982133">"None"</item>
-    <item msgid="688482401508173818">"720x480 mdpi"</item>
-    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
-    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
-    <item msgid="3646519549495410112">"1280x720 tvdpi and 1920x1080 xhdpi"</item>
-  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standard limit"</item>
     <item msgid="4071574792028999443">"No background processes"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 73c8195..a59c470 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -600,7 +600,6 @@
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Searching…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Rename device"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Peer devices"</string>
-    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Remembered groups"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Could not connect."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Failed to rename device."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Disconnect?"</string>
@@ -608,8 +607,6 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"If you disconnect, your connection with <xliff:g id="PEER_NAME">%1$s</xliff:g> and <xliff:g id="PEER_COUNT">%2$s</xliff:g> other devices will end."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancel invitation"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Do you want to cancel invitation to connect with <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
-    <string name="wifi_p2p_delete_group_title" msgid="8049872630241986374">"Delete group?"</string>
-    <string name="wifi_p2p_delete_group_message" msgid="5521624017163200215">"Do you want to delete the group <xliff:g id="GROUP_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Portable Wi-Fi hotspot"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Turning hotspot on…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Turning off hotspot…"</string>
@@ -682,16 +679,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Choose wallpaper from"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Dream"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"When docked or asleep and charging"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Either"</string>
-    <string name="screensaver_settings_summary_sleep" msgid="3642352561593337637">"While asleep and charging"</string>
-    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"While docked"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"When docked or asleep and charging"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"When asleep and charging"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"When docked"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Disabled"</string>
-    <string name="screensaver_settings_disabled_prompt" msgid="2060724968623677666">"To control what happens when the phone is docked and/or sleeping, turn Dreams on."</string>
-    <string name="screensaver_settings_start_dreaming" msgid="1695787491111862810">"Start dreaming now"</string>
-    <string name="screensaver_settings_when_to_dream" msgid="9110320844270942351">"When to dream"</string>
-    <!-- no translation found for screensaver_settings_dream_start (1265346994126658796) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Selected dream"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"When to activate"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> spent idle"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Never"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Try it!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Start on sleep"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Start when docked"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Font size"</string>
@@ -1015,7 +1013,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB storage data"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD card"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Uninstall"</string>
-    <string name="install_text" msgid="884360662922471113">"Install"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Disable"</string>
     <string name="enable_text" msgid="9217362512327828987">"Enable"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Clear data"</string>
@@ -1398,34 +1397,6 @@
     <string name="gadget_title" msgid="5519037532720577836">"Power control"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Updating WiFi setting"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Updating Bluetooth setting"</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">"Credential storage"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Install from storage"</string>
@@ -1611,7 +1582,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Window animation scale"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Transition animation scale"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator duration scale"</string>
-    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulate secondary displays"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Don\'t keep activities"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destroy every activity as soon as the user leaves it"</string>
@@ -1713,10 +1683,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Add VPN profile"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Edit profile"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Delete profile"</string>
-    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Always-on VPN"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Select a VPN profile to always remain connected to. Network traffic will only be allowed when connected to this VPN."</string>
-    <string name="vpn_lockdown_none" msgid="9214462857336483711">"None"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Always-on VPN requires an IP address for both server and DNS."</string>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <string name="vpn_no_network" msgid="3050233675132726155">"There is no network connection. Please try again later."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"A certificate is missing. Please edit the profile."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
@@ -1738,7 +1712,8 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Disabled"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing"</string>
-    <string name="user_settings_title" msgid="6151874007858148344">"Users"</string>
+    <!-- no translation found for user_settings_title (6151874007858148344) -->
+    <skip />
     <string name="user_list_title" msgid="2152311434413878709">"Users"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Add user"</string>
     <string name="user_details_title" msgid="3037625632127241370">"Edit details"</string>