From c888555f8907328a8625cb2301e081fcd143f2c5 Mon Sep 17 00:00:00 2001
From: Mathias Agopian <mathias@google.com>
Date: Fri, 31 Aug 2012 01:59:05 -0700
Subject: [PATCH] FIX BUILD (DO NOT MERGE)

Revert "Import translations. DO NOT MERGE"

This reverts commit b3e78cc41f16b0227a5fd31431c95f911c268567.

Change-Id: Ifbff2b21c249dab09126b03a8cbbccde964781df
---
 res/values-af/arrays.xml      |  5 ----
 res/values-af/strings.xml     | 45 ++++++++++++++++-------------------
 res/values-am/arrays.xml      |  5 ----
 res/values-am/strings.xml     | 45 ++++++++++++++++-------------------
 res/values-ar/arrays.xml      |  5 ----
 res/values-ar/strings.xml     | 30 ++++++++---------------
 res/values-be/arrays.xml      |  5 ----
 res/values-be/strings.xml     | 45 ++++++++++++++++-------------------
 res/values-bg/arrays.xml      |  5 ----
 res/values-bg/strings.xml     | 30 ++++++++---------------
 res/values-ca/arrays.xml      |  5 ----
 res/values-ca/strings.xml     | 45 ++++++++++++++++-------------------
 res/values-cs/arrays.xml      |  5 ----
 res/values-cs/strings.xml     | 45 ++++++++++++++++-------------------
 res/values-da/arrays.xml      |  5 ----
 res/values-da/strings.xml     | 45 ++++++++++++++++-------------------
 res/values-de/arrays.xml      |  5 ----
 res/values-de/strings.xml     | 45 ++++++++++++++++-------------------
 res/values-el/arrays.xml      |  5 ----
 res/values-el/strings.xml     | 45 ++++++++++++++++-------------------
 res/values-en-rGB/arrays.xml  |  5 ----
 res/values-en-rGB/strings.xml | 45 ++++++++++++++++-------------------
 res/values-es-rUS/arrays.xml  |  5 ----
 res/values-es-rUS/strings.xml | 45 ++++++++++++++++-------------------
 res/values-es/arrays.xml      |  5 ----
 res/values-es/strings.xml     | 30 ++++++++---------------
 res/values-et/arrays.xml      |  5 ----
 res/values-et/strings.xml     | 30 ++++++++---------------
 res/values-fa/arrays.xml      |  5 ----
 res/values-fa/strings.xml     | 30 ++++++++---------------
 res/values-fi/arrays.xml      |  5 ----
 res/values-fi/strings.xml     | 45 ++++++++++++++++-------------------
 res/values-fr/arrays.xml      |  9 ++-----
 res/values-fr/strings.xml     | 45 ++++++++++++++++-------------------
 res/values-hi/arrays.xml      |  5 ----
 res/values-hi/strings.xml     | 30 ++++++++---------------
 res/values-hr/arrays.xml      |  5 ----
 res/values-hr/strings.xml     | 30 ++++++++---------------
 res/values-hu/arrays.xml      |  5 ----
 res/values-hu/strings.xml     | 30 ++++++++---------------
 res/values-in/arrays.xml      |  5 ----
 res/values-in/strings.xml     | 30 ++++++++---------------
 res/values-it/arrays.xml      |  5 ----
 res/values-it/strings.xml     | 45 ++++++++++++++++-------------------
 res/values-iw/arrays.xml      |  5 ----
 res/values-iw/strings.xml     | 45 ++++++++++++++++-------------------
 res/values-ja/arrays.xml      |  5 ----
 res/values-ja/strings.xml     | 30 ++++++++---------------
 res/values-ko/arrays.xml      |  5 ----
 res/values-ko/strings.xml     | 30 ++++++++---------------
 res/values-lt/arrays.xml      |  5 ----
 res/values-lt/strings.xml     | 30 ++++++++---------------
 res/values-lv/arrays.xml      |  5 ----
 res/values-lv/strings.xml     | 30 ++++++++---------------
 res/values-ms/arrays.xml      |  5 ----
 res/values-ms/strings.xml     | 30 ++++++++---------------
 res/values-nb/arrays.xml      |  5 ----
 res/values-nb/strings.xml     | 45 ++++++++++++++++-------------------
 res/values-nl/arrays.xml      |  5 ----
 res/values-nl/strings.xml     | 45 ++++++++++++++++-------------------
 res/values-pl/arrays.xml      |  5 ----
 res/values-pl/strings.xml     | 45 ++++++++++++++++-------------------
 res/values-pt-rPT/arrays.xml  |  5 ----
 res/values-pt-rPT/strings.xml | 45 ++++++++++++++++-------------------
 res/values-pt/arrays.xml      |  5 ----
 res/values-pt/strings.xml     | 30 ++++++++---------------
 res/values-rm/arrays.xml      |  5 ----
 res/values-rm/strings.xml     | 24 +++++++++----------
 res/values-ro/arrays.xml      |  5 ----
 res/values-ro/strings.xml     | 30 ++++++++---------------
 res/values-ru/arrays.xml      |  5 ----
 res/values-ru/strings.xml     | 33 ++++++++++---------------
 res/values-sk/arrays.xml      |  5 ----
 res/values-sk/strings.xml     | 30 ++++++++---------------
 res/values-sl/arrays.xml      |  5 ----
 res/values-sl/strings.xml     | 30 ++++++++---------------
 res/values-sr/arrays.xml      |  5 ----
 res/values-sr/strings.xml     | 30 ++++++++---------------
 res/values-sv/arrays.xml      |  5 ----
 res/values-sv/strings.xml     | 45 ++++++++++++++++-------------------
 res/values-sw/arrays.xml      |  5 ----
 res/values-sw/strings.xml     | 45 ++++++++++++++++-------------------
 res/values-th/arrays.xml      |  5 ----
 res/values-th/strings.xml     | 30 ++++++++---------------
 res/values-tl/arrays.xml      |  5 ----
 res/values-tl/strings.xml     | 30 ++++++++---------------
 res/values-tr/arrays.xml      |  5 ----
 res/values-tr/strings.xml     | 45 ++++++++++++++++-------------------
 res/values-uk/arrays.xml      |  5 ----
 res/values-uk/strings.xml     | 30 ++++++++---------------
 res/values-vi/arrays.xml      |  5 ----
 res/values-vi/strings.xml     | 30 ++++++++---------------
 res/values-zh-rCN/arrays.xml  |  5 ----
 res/values-zh-rCN/strings.xml | 30 ++++++++---------------
 res/values-zh-rTW/arrays.xml  |  5 ----
 res/values-zh-rTW/strings.xml | 30 ++++++++---------------
 res/values-zu/arrays.xml      |  5 ----
 res/values-zu/strings.xml     | 45 ++++++++++++++++-------------------
 98 files changed, 716 insertions(+), 1330 deletions(-)

diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 6b08ef15dc3..397ee9e2ec3 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Animasieskaal 5x"</item>
     <item msgid="1069584980746680398">"Animasieskaal 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standaardlimiet"</item>
     <item msgid="4071574792028999443">"Geen agtergrondprosesse"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index a8607a65483..c5f2d9498ec 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Muurpapier"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Kies muurpapier uit"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Droom"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Wanneer gedok of sluimer en besig om te laai"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Wanneer sluimer en besig om te laai"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Wanneer gedok"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Gedeaktiveer"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Het droom gekies"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Wanneer om te aktiveer"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> van niksdoen"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nooit"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Probeer dit!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Begin wanneer sluimer"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Begin wanneer gedok"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Outomatiese helderheid"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fontgrootte"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Lettergrootte"</string>
@@ -1029,7 +1021,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-berging-data"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kaart"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Verwyder"</string>
-    <string name="install_text" msgid="884360662922471113">"Installeer"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Deaktiveer"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktiveer"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Vee data uit"</string>
@@ -1597,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Vensteranimasieskaal"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Oorganganimasieskaal"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator-tydsduurskaal"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Programme"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Moenie aktiwiteite behou nie"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Vernietig elke aktiwiteit sodra die gebruiker dit verlaat"</string>
@@ -1700,10 +1691,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Voeg VPN-profiel by"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Redigeer profiel"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Vee profiel uit"</string>
-    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Altydaan-VPN"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Kies \'n VPN-profiel om altyd aan gekoppel te bly. Netwerkverkeer sal net toegelaat word wanneer verbind aan hierdie VPN."</string>
-    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Geen"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Altydaan-VPN vereis \'n IP-adres vir beide die bediener en 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">"Daar is geen netwerkverbinding nie. Probeer asseblief later weer."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"\'n Sertifikaat ontbreek. Wysig asseblief die profiel."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Stelsel"</string>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index 8772e6132b8..00b010151a5 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"የእነማ ልኬት ለውጥ 5x"</item>
     <item msgid="1069584980746680398">"የእነማ ልኬት ለውጥ 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"መደበኛ ወሰኖች"</item>
     <item msgid="4071574792028999443">"ምንም የዳራ ሂደቶች የሉም"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 98c5c7e54fd..9392e149f13 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -687,25 +687,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>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <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>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <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>
@@ -1029,7 +1021,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"የUSB ማከማቻ ውሂብ"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD ካርድ"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"አራግፍ"</string>
-    <string name="install_text" msgid="884360662922471113">"ጫን"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"አታቦዝን"</string>
     <string name="enable_text" msgid="9217362512327828987">"አንቃ"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"ውሂብ አጥራ"</string>
@@ -1597,8 +1590,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>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <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>
@@ -1700,10 +1691,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"የVPN መገለጫ አክል"</string>
     <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_none" msgid="9214462857336483711">"ምንም"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"ሁልጊዜ የበራ VPN ለአገልጋይም ለ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">"ምንም የአውታረ መረብ ግኑኝነት የለም። እባክህ ቆይተህ እንደገና ሞክር።"</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"የዕውቅና ማረጋገጫ ይጎድላል። እባክህ መገለጫውን አርትዕ።"</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"ስርዓት"</string>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 28dcfae36fe..b8fa065c09a 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"حجم الرسوم المتحركة 5x"</item>
     <item msgid="1069584980746680398">"حجم الرسوم المتحركة 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"الحد القياسي"</item>
     <item msgid="4071574792028999443">"ليست هناك عمليات بالخلفية"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index cdadbca1534..e9c2eebfaba 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -687,25 +687,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>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <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>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <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>
@@ -1598,8 +1590,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>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <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>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index f93712a2074..eb58bcd1af5 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Маштаб анімацыі 5x"</item>
     <item msgid="1069584980746680398">"Маштаб анімацыі 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартны ліміт"</item>
     <item msgid="4071574792028999443">"Няма фонавых працэсаў"</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index ca3a1a73b85..c7535f859af 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -687,25 +687,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">"Захавальнiк"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Калі падключана або ў рэжыме сну цi зараджаецца"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"У рэжыме сну i падчас зарадкi"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Калі падключана"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Адключана"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <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">"Пачаць пры падключэннi"</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>
@@ -1029,7 +1021,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Дадзеныя USB-сховішча"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-карта"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Выдаліць"</string>
-    <string name="install_text" msgid="884360662922471113">"Усталяваць"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Адключыць"</string>
     <string name="enable_text" msgid="9217362512327828987">"Уключанае"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Ачысціць дадзеныя"</string>
@@ -1597,8 +1590,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">"Шкала працягласці анiматара"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Прыкладаннi"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Не трымаць дзеянні"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Знішч. кож.дзеянне, як толькі карыст.пакідае яго"</string>
@@ -1700,10 +1691,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Дадаць профіль VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Рэдагаваць профiль"</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">"Дазволiць, каб VPN заўсёды заставаўся падключаным да сеткi, можна будзе толькi пасля падключэння да гэтага VPN."</string>
-    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Няма"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Заўсёды ўключаны VPN патрабуе IP-адрас для сервера і 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">"Падключэнне да сеткi адсутнічае. Паўтарыце спробу пазней."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Сертыфікат адсутнічае. Адрэдагуйце профіль."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Сістэма"</string>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 4142c7b3a7a..4c8cc1c8879 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Скала на анимацията 5x"</item>
     <item msgid="1069584980746680398">"Скала на анимацията 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартно ограничение"</item>
     <item msgid="4071574792028999443">"Няма процеси на заден план"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 6237017f577..3aff202d332 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -687,25 +687,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>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <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>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <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>
@@ -1598,8 +1590,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">"Скала за Animator"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <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>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 99fa4668978..f8366f85159 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Animació a escala 5x"</item>
     <item msgid="1069584980746680398">"Animació a escala 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Límit estàndard"</item>
     <item msgid="4071574792028999443">"Cap procés de fons"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 7dd5dda9d5e..5d86d320ecc 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fons de pantalla"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Selecciona fons de pantalla de"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Somni"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Quan estigui connectat o inactiu i carregant-se"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Quan estigui inactiu i carregant-se"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Quan estigui connectat"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Desactivat"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Somni seleccionat"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Moment de l\'activació"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'estat inactiu"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Mai"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Prova-ho!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Inicia quan estigui inactiu"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Inicia quan estigui connectat"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillantor automàtica"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Mida del tipus de lletra"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Mida de la lletra"</string>
@@ -1029,7 +1021,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dades de l\'emmagatzematge USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Targeta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstal·la"</string>
-    <string name="install_text" msgid="884360662922471113">"Instal·la"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Desactiva"</string>
     <string name="enable_text" msgid="9217362512327828987">"Activa"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Esborra les dades"</string>
@@ -1597,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Finestra escala animació"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Transició escala animació"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Escala durada d\'animació"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplicacions"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"No conservis les activitats"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destrueix activitats tan aviat com usuari en surt"</string>
@@ -1700,10 +1691,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Addició d\'un perfil de VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Edita el perfil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Suprimeix el perfil"</string>
-    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN sempre activada"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecciona un perfil de VPN per estar-hi sempre connectat. El trànsit de la xarxa només es permetrà quan estigui connectada a aquesta VPN."</string>
-    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Cap"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Per tenir la VPN sempre activada cal una adreça IP per al servidor i per al 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">"No hi ha cap connexió de xarxa. Torna-ho a provar més tard."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Falta un certificat. Edita el perfil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistema"</string>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index ddb2c437701..e01d331bb0c 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Měřítko animace 5x"</item>
     <item msgid="1069584980746680398">"Měřítko animace 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardní limit"</item>
     <item msgid="4071574792028999443">"Procesy na pozadí deaktivovány"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 01bbc70090e..004d6eef3dc 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vybrat tapetu:"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Sen"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Při vložení do doku nebo při nabíjení v režimu spánku"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Při nabíjení v režimu spánku"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Při vložení do doku"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Vypnuto"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Vybraný sen"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Čas aktivace"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Doba nečinnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nikdy"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Vyzkoušet"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Spustit při přechodu do režimu spánku"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Spustit při vložení do doku"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Velikost písma"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Velikost písma"</string>
@@ -1029,7 +1021,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Data úložiště USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Karta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Odinstalovat"</string>
-    <string name="install_text" msgid="884360662922471113">"Instalovat"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Vypnout"</string>
     <string name="enable_text" msgid="9217362512327828987">"Povolit"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Mazání dat"</string>
@@ -1597,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Měřítko animace okna"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Měřítko animace přeměny"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Měřítko délky animace"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplikace"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Neukládat aktivity"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Rušit všechny činnosti, jakmile je uživatel zavře"</string>
@@ -1700,10 +1691,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Přidat profil VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Upravit profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Smazat profil"</string>
-    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Trvalá síť VPN"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Vyberte profil VPN, ke kterému chcete zůstat trvale připojeni. Síťový provoz bude povolen pouze v případě, že budete připojeni k této síti VPN."</string>
-    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Žádná"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Trvalá síť VPN vyžaduje IP adresu pro server i 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">"Připojení k síti není k dispozici. Zkuste to prosím znovu později."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Chybí certifikát, upravte prosím profil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Systém"</string>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 7dc81ba0937..67bebe6913b 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Animationsskala 5x"</item>
     <item msgid="1069584980746680398">"Animationsskala 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardgrænse"</item>
     <item msgid="4071574792028999443">"Ingen baggrundsprocesser"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index aaa5e6441e3..159d64f1a00 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Baggrund"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vælg baggrund fra"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Drøm"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Når enheden er tilsluttet dockingstationen eller i dvale og oplader"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Når enheden er i dvale og oplader"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Når enheden er tilsluttet dockingstationen"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Deaktiveret"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Valgt drøm"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Hvornår der skal aktiveres"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitet"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Aldrig"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Prøv det!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Aktivér i dvale"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Aktivér, når enheden er tilsluttet dockingstationen"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Skriftstørrelse"</string>
@@ -1029,7 +1021,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-lagringsdata"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kort"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Afinstaller"</string>
-    <string name="install_text" msgid="884360662922471113">"Installer"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Deaktiver"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktivér"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Ryd data"</string>
@@ -1597,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Animationsskala for vindue"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Overgangsanimationsskala"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animatorvarighedsskala"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Behold ikke aktiviteter"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Luk hver aktivitet, så snart brugeren forlader den"</string>
@@ -1700,10 +1691,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Tilføj VPN-profil"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Rediger profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Slet profil"</string>
-    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Always-on VPN"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Vælg en VPN-profil, som der altid skal være forbindelse til. Netværkstrafik tillades kun, når der er forbindelse til denne VPN."</string>
-    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ingen"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Always-on VPN kræver en IP-adresse til både server og 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">"Der er ingen netværksforbindelse. Prøv igen senere."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Der mangler et certifikat. Rediger profilen."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 59abe989d47..10fb68a4a2d 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Animationsmaßstab: 5x"</item>
     <item msgid="1069584980746680398">"Animationsmaßstab: 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardlimit"</item>
     <item msgid="4071574792028999443">"Keine Hintergrundprozesse"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index bd9b4cae2dc..b82b88bcc49 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -688,25 +688,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Hintergrund"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Hintergrund auswählen"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Traum"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Bei angedocktem Gerät oder im Standby-Modus beim Aufladen"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Im Standby-Modus beim Aufladen"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Bei angedocktem Gerät"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Deaktiviert"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Ausgewählter Traum"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Zeitpunkt der Aktivierung"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ohne Aktivität"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nie"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Testen"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Bei Aktivierung des Standby-Modus starten"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Bei angedocktem Gerät starten"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische Helligkeit"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Schriftgröße"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Schriftgröße"</string>
@@ -1030,7 +1022,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-Speicherdaten"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-Karte"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Deinstallieren"</string>
-    <string name="install_text" msgid="884360662922471113">"Installieren"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Deaktivieren"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktivieren"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Daten löschen"</string>
@@ -1598,8 +1591,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Maßstab Fensteranimation"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Maßstab Übergangsanimation"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Maßstab für Animatorzeit"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Aktionen nicht speichern"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Aktivität löschen, sobald der Nutzer diese beendet"</string>
@@ -1701,10 +1692,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"VPN-Profil hinzufügen"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Profil bearbeiten"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Profil löschen"</string>
-    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Durchgehend aktives VPN"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Wählen Sie ein VPN-Profil für eine durchgehende Verbindung aus. Netzwerkverkehr ist nur möglich, wenn eine Verbindung zu diesem VPN besteht."</string>
-    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Keines"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Für ein durchgehend aktives VPN ist eine IP-Adresse für den Server und für das DNS erforderlich."</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">"Es ist keine Netzwerkverbindung verfügbar. Bitte versuchen Sie es später erneut."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Ein Zertifikat fehlt. Bitte ändern Sie das Profil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 5fa56014110..c394858c6a5 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Κλίμακα κινούμενων εικόνων 5x"</item>
     <item msgid="1069584980746680398">"Κλίμακα κινούμενων εικόνων 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Τυπικό όριο"</item>
     <item msgid="4071574792028999443">"Δεν υπάρχουν διεργασίες παρασκηνίου"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 91745ff9913..d82ffb76fee 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -687,25 +687,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>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <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>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <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>
@@ -1029,7 +1021,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Εφαρμογή χώρου αποθήκευσης USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Κάρτα SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Κατάργηση εγκατάστασης"</string>
-    <string name="install_text" msgid="884360662922471113">"Εγκατάσταση"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Απενεργοποίηση"</string>
     <string name="enable_text" msgid="9217362512327828987">"Ενεργοποίηση"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Εκκαθάριση δεδομένων"</string>
@@ -1597,8 +1590,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">"Animator duration scale"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <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>
@@ -1700,10 +1691,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Προσθήκη προφίλ VPN"</string>
     <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_none" msgid="9214462857336483711">"Χωρίς"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Το VPN που έχει ρυθμιστεί να είναι ενεργοποιημένο πάντα απαιτεί μια διεύθυνση IP τόσο για τον διακομιστή όσο και για το 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">"Δεν υπάρχει σύνδεση δικτύου. Δοκιμάστε ξανά αργότερα."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Λείπει ένα πιστοποιητικό. Επεξεργαστείτε το προφίλ."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Σύστημα"</string>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 52ca0a00667..0af57e7e322 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Animation scale 5x"</item>
     <item msgid="1069584980746680398">"Animation scale 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <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 74864fc2bc1..63c37a265a2 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -687,25 +687,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>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <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>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <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>
@@ -1029,7 +1021,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>
@@ -1597,8 +1590,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>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <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>
@@ -1700,10 +1691,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>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index eca5f718329..7ab6588a1d5 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Escala de animación 5x"</item>
     <item msgid="1069584980746680398">"Escala de animación 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Límite estándar"</item>
     <item msgid="4071574792028999443">"No hay procesos de fondo."</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ad0f681f136..0f33492a5f6 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fondo de pantalla"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Elegir fondo de pantalla de"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Sueño"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Cuando se conecte el dispositivo, o cuando se encuentre en suspensión y cargándose"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Cuando el dispositivo se encuentre en suspensión y cargándose"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Cuando se conecte el dispositivo"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Inhabilitado"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Sueño seleccionado"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Tiempo de espera para la activación"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Luego de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nunca"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Pruébalo."</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Iniciar cuando el dispositivo esté en suspensión"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Iniciar cuando se conecte el dispositivo"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamaño de fuente"</string>
@@ -1029,7 +1021,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Datos en el almacenamiento USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Tarjeta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstalar..."</string>
-    <string name="install_text" msgid="884360662922471113">"Instalar"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Inhabilitar"</string>
     <string name="enable_text" msgid="9217362512327828987">"Activar"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Eliminar datos"</string>
@@ -1597,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Ventana de escala de animación"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Transición de escala de animación"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Escala duración animador"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplicaciones"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Eliminar actividades"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destruir todas las actividades en cuanto el usuario la abandona"</string>
@@ -1700,10 +1691,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Agregar perfil VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Modificar perfil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Eliminar perfil"</string>
-    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN activada ininterrumpidamente"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecciona el perfil de la VPN con la que deseas establecer una conexión ininterrumpida. El tráfico de red solo se permitirá cuando se observe una conexión con esta VPN."</string>
-    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ninguna"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"La VPN activada ininterrumpidamente requiere una dirección IP tanto para el servidor como para el 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">"No hay conexión de red. Inténtalo de nuevo más tarde."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"No se encuentra un certificado. Modifica el perfil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistema"</string>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 547255f1abe..beddc8174ef 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Escala de animación 5x"</item>
     <item msgid="1069584980746680398">"Escala de animación 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Límite estándar"</item>
     <item msgid="4071574792028999443">"Sin procesos en segundo plano"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 8afb2932736..0e5df23e741 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fondo de pantalla"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Seleccionar fondo de pantalla de..."</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Dream"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Cuando el dispositivo esté conectado o inactivo y cargando"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Cuando el dispositivo esté inactivo y cargando"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Cuando el dispositivo esté conectado"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Inhabilitado"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Módulo dream seleccionado"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Cuándo activar"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nunca"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Probar"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Iniciar cuando se suspenda el dispositivo"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Iniciar cuando el dispositivo esté conectado"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamaño de fuente"</string>
@@ -1598,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Escala de animación ventana"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Escala de transición-animación"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Escala duración animador"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplicaciones"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Destruir actividades"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destruir actividades cuando el usuario deje de usarlas"</string>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index e43add05b0c..d58b48a92d8 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"5-kordne animatsiooni skaala"</item>
     <item msgid="1069584980746680398">"10-kordne animatsiooni skaala"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardpiir"</item>
     <item msgid="4071574792028999443">"Taustaprotsessideta"</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 7ae802f55ef..7579c223954 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Taustapilt"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Taustapildi valimine:"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Uni"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Kui on dokitud või puhkerežiimis ja laeb"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Kui on puhkerežiimis ja laeb"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Kui on dokitud"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Keelatud"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Valitud uni"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Aktiveerimisaeg"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Pärast seda, kui seade on olnud tegevusetu <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Mitte kunagi"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Proovige"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Käivitu puhkerežiimis"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Käivitu siis, kui seade on dokitud"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaatne eredus"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fondi suurus"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Fondi suurus"</string>
@@ -1598,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Akna animatsiooni skaala"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Ülemineku animats. skaala"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animaatori kestuse skaala"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Rakendused"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ära hoia tegevusi alles"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Kõigi tegev. hävit. kohe, kui kasutaja neist lahk."</string>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 744035d87cc..e1b40cb92e3 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"مقیاس انیمیشن 5 برابر"</item>
     <item msgid="1069584980746680398">"مقیاس انیمیشن 10 برابر"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"حد استاندارد"</item>
     <item msgid="4071574792028999443">"بدون پردازش در پس‌زمینه"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 15e033f9d4f..63c7bf5c621 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -687,25 +687,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>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <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>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <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>
@@ -1598,8 +1590,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>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <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>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index e43f214955a..fb8efd92490 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Animaation mittakaava 5-kertainen"</item>
     <item msgid="1069584980746680398">"Animaation mittakaava 10-kertainen"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Vakioraja"</item>
     <item msgid="4071574792028999443">"Ei taustaprosesseja"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 02f36a8e22e..8f150b0f634 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Taustakuva"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Valitse taustakuva"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Unelma"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Telakoituna tai virransäästötilassa ja ladattessa"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Virransäästötilassa ja ladattessa"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Telakoituna"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Ei käytössä"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Valittu unelma"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Käyttöönottoaika"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Kun laite on ollut käyttämättä <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Ei koskaan"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Kokeile!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Käynnistä virransäästötilassa"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Käynnistä telakoituna"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaattinen kirkkaus"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Kirjasimen koko"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Kirjasinkoko"</string>
@@ -1029,7 +1021,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-tallennustilan tiedot"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kortti"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Poista"</string>
-    <string name="install_text" msgid="884360662922471113">"Asenna"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Poista käytöstä"</string>
     <string name="enable_text" msgid="9217362512327828987">"Ota käyttöön"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Tyhjennä tiedot"</string>
@@ -1597,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Ikkunan animaat. mittak."</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Siirtymän anim.asteikko"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animatorin keston mittakaava"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Sovellukset"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Älä säilytä toimintoja"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Tuhoa kaikki toiminnot, kun käyttäjä poistuu"</string>
@@ -1700,10 +1691,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Lisää VPN-profiili"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Muokkaa profiilia"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Poista profiili"</string>
-    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Aina käytössä oleva VPN"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Valitse VPN-profiili, johon muodostettu yhteys on aina käytössä. Verkkoliikenne sallitaan vain tämän VPN-yhteyden ollessa käytössä."</string>
-    <string name="vpn_lockdown_none" msgid="9214462857336483711">"-"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Aina käytössä oleva VPN edellyttää, että sekä palvelimella että DNS-palvelulla on IP-osoite."</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">"Ei verkkoyhteyttä. Yritä myöhemmin uudelleen."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Varmenne puuttuu. Muokkaa profiilia."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Järjestelmä"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index b55e7742754..3304e326ba1 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -91,7 +91,7 @@
     <item msgid="1634960474403853625">"Déconnecté"</item>
     <item msgid="746097431216080650">"Échec"</item>
     <item msgid="6367044185730295334">"Bloqué"</item>
-    <item msgid="503942654197908005">"Mauvaise connexion évitée momentanément"</item>
+    <item msgid="503942654197908005">"Évite momentanément une mauvaise connexion"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -105,7 +105,7 @@
     <item msgid="197508606402264311">"Déconnecté"</item>
     <item msgid="8578370891960825148">"Échec"</item>
     <item msgid="5660739516542454527">"Bloqué"</item>
-    <item msgid="1805837518286731242">"Mauvaise connexion évitée momentanément"</item>
+    <item msgid="1805837518286731242">"Évite momentanément une mauvaise connexion"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Échelle d\'animation 5x"</item>
     <item msgid="1069584980746680398">"Échelle d\'animation 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite standard"</item>
     <item msgid="4071574792028999443">"Aucun processus en arrière-plan"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d144b222431..ad9bcbddef2 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fond d\'écran"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Sélectionner fond d\'écran dans"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Rêve"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Lorsque l\'appareil est installé sur la station d\'accueil ou lorsqu\'il est en veille et en charge"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Lorsque l\'appareil est en veille et en charge"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Lorsque l\'appareil est installé sur la station d\'accueil"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Désactivé"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Rêve sélectionné"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Délai d\'activation"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Jamais"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Essayer"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Activer lorsque l\'appareil est en veille"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Activer lorsque l\'appareil est installé sur la station d\'accueil"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Taille de la police"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Taille de police"</string>
@@ -1029,7 +1021,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Données sur USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Carte SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Désinstaller"</string>
-    <string name="install_text" msgid="884360662922471113">"Installer"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Désactiver"</string>
     <string name="enable_text" msgid="9217362512327828987">"Activer"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Effacer les données"</string>
@@ -1597,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Échelle animation fenêtres"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Échelle anim. transitions"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Échelle durée animation"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Applications"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ne pas conserver activités"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Supprimer immédiatement les activités abandonnées"</string>
@@ -1700,10 +1691,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Ajouter un profil VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Modifier le profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Supprimer le profil"</string>
-    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN permanent"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Sélectionnez un profil VPN auquel rester connecté en permanence. Le trafic réseau ne sera autorisé que lorsque vous serez connecté à ce VPN."</string>
-    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Aucun"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Le VPN permanent nécessite une adresse IP pour le serveur et le 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">"Aucune connexion réseau. Veuillez réessayer ultérieurement."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Certificat manquant. Veuillez modifier le profil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Système"</string>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index f25e28cc902..63c672d4b89 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"एनिमेशन स्‍केल 5x"</item>
     <item msgid="1069584980746680398">"एनिमेशन स्‍केल 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"मानक सीमा"</item>
     <item msgid="4071574792028999443">"कोई पृष्ठभूमि प्रक्रियाएं नहीं"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index ea6c6adacea..70dc4f1944f 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -687,25 +687,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>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <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>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <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>
@@ -1599,8 +1591,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>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <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>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 144d19a310f..0f87f8b06ac 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Animacija razmjera 5 x"</item>
     <item msgid="1069584980746680398">"Animacija razmjera 10 x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardna granica"</item>
     <item msgid="4071574792028999443">"Nema pozadinskih procesa"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e68a36e35c1..32b5ec27db7 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Pozadinska slika"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Odabir pozadinske slike iz"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"San"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Kada je uređaj na priključnoj stanici ili kada miruje i puni se"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Kada uređaj miruje i puni se"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Kada je uređaj na priključnoj stanici"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Onemogućeno"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Odabrani san"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Kada aktivirati"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> u mirovanju"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nikad"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Isprobajte!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Pokreni pri mirovanju"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Pokreni kada je uređaj na priključnoj stanici"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatska svjetlina"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Veličina fonta"</string>
@@ -1598,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Razmjer animacije prozora"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Animacija prijelaza razmjera"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Razmjer duljine animatora"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplikacije"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Uklanjanje aktivnosti"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Uništite svaku aktivnost čim je korisnik napusti"</string>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index db9238319e5..653f0b172c5 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Animáció léptéke: 5x"</item>
     <item msgid="1069584980746680398">"Animáció léptéke: 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Normál korlátozás"</item>
     <item msgid="4071574792028999443">"Nincsenek háttérfolyamatok"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index bc921ee88c8..39fc2c74752 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Háttérkép"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Válasszon tapétát innen:"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Álom"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Dokkolt vagy alvó állapotban, amikor tölt."</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Alvó állapotban, amikor tölt"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Dokkolt állapotban"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Letiltva"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Kiválasztott álom"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Mikor aktiválódjon"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tétlenség után"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Soha"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Próbálja ki!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Alvó üzemmódban induljon el."</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Dokkolt állapotban induljon el."</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatikus fényerő"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Betűméret"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Betűméret"</string>
@@ -1598,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Ablakanimáció mérete"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Áttűnési animáció mérete"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animáció léptéke"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Alkalmazások"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Törölje a tevékenységeket"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Tevékenységek törlése, amint elhagyják azokat"</string>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 07505cd1489..12f3cd949bd 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Skala animasi 5x"</item>
     <item msgid="1069584980746680398">"Skala animasi 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Batas standar"</item>
     <item msgid="4071574792028999443">"Tanpa proses latar belakang"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 60d8e5bf445..571fc5ab863 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pilih wallpaper dari"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Mimpi"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Saat di dok atau tidur dan mengisi baterai"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Saat tidur dan mengisi baterai"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Saat di dok"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Nonaktif"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Mimpi terpilih"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Waktu pengaktifan"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Setelah menganggur selama <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Tidak akan"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Cobalah!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Mulai saat tidur"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Mulai saat di dok"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan otomatis"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Ukuran font"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Ukuran font"</string>
@@ -1598,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Skala animasi jendela"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Skala animasi transisi"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Skala durasi animator"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Apl"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Jangan simpan kegiatan"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Hancurkan tiap kgiatan setelah ditinggal pengguna"</string>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 089def2f1b6..3ae7071c0cf 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Scala animazione 5x"</item>
     <item msgid="1069584980746680398">"Scala animazione 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite standard"</item>
     <item msgid="4071574792028999443">"Nessun processo in background"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ef2fc03e3f7..6d31699afe0 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Sfondo"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Scegli sfondo da"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Dream"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Quando inserito nel dock o in stand-by e ricarica"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Quando in stand-by e ricarica"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Quando inserito nel dock"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Disattivato"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Sogno selezionato"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Quando attivarlo"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Mai"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Prova!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Attiva in stand-by"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Attiva quando inserito nel dock"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminosità automatica"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Dimensioni carattere"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Dimensioni carattere"</string>
@@ -1029,7 +1021,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dati in archivio USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Scheda SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Disinstalla"</string>
-    <string name="install_text" msgid="884360662922471113">"Installa"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Disattiva"</string>
     <string name="enable_text" msgid="9217362512327828987">"Attiva"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Cancella dati"</string>
@@ -1597,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Scala animazione finestra"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Scala animazione transizione"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Scala durata animatore"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Applicazioni"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Non conservare attività"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Elimina ogni attività appena l\'utente la interrompe"</string>
@@ -1700,10 +1691,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Aggiungi profilo VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Modifica profilo"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Elimina profilo"</string>
-    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN sempre attiva"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Seleziona un profilo VPN a cui rimanere sempre connesso. Il traffico di rete sarà consentito solo quando sei connesso a questa VPN."</string>
-    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Nessuna"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"La VPN sempre attiva richiede un indirizzo IP per server e 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">"Nessuna connessione di rete disponibile. Riprova più tardi."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Manca un certificato. Modifica il profilo."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistema"</string>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 12b466f05a2..e236cc8baba 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"קנה מידה להנפשה 5x"</item>
     <item msgid="1069584980746680398">"קנה מידה להנפשה 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"הגבלת תקן"</item>
     <item msgid="4071574792028999443">"אין תהליכים ברקע"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index a5e6c8ab8f3..d188ce92799 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -687,25 +687,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>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <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>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <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>
@@ -1029,7 +1021,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"נתוני אחסון USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"כרטיס SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"הסר התקנה"</string>
-    <string name="install_text" msgid="884360662922471113">"התקן"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"השבת"</string>
     <string name="enable_text" msgid="9217362512327828987">"הפעל"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"נקה נתונים"</string>
@@ -1597,8 +1590,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>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Google Apps"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"אל תשמור פעילויות"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"השמד כל פעילות ברגע שהמשתמש עוזב אותה"</string>
@@ -1700,10 +1691,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"הוספת פרופיל VPN"</string>
     <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_none" msgid="9214462857336483711">"ללא"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"VPN מופעל תמיד מחייב כתובת IP לשרת ול-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">"אין חיבור לרשת. נסה שוב מאוחר יותר."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"חסר אישור. ערוך את הפרופיל."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"מערכת"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 69cf518bbbb..578d4a7e1c9 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"アニメーションスケール5x"</item>
     <item msgid="1069584980746680398">"アニメーションスケール10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"標準の上限"</item>
     <item msgid="4071574792028999443">"バックグラウンドプロセスを使用しない"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 03480530182..991be5d03e3 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -689,25 +689,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>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <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>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <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>
@@ -1600,8 +1592,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">"Animator再生時間スケール"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <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>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 4f033c1acd3..571d52226db 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"애니메이션 배율 5x"</item>
     <item msgid="1069584980746680398">"애니메이션 배율 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"표준 제한"</item>
     <item msgid="4071574792028999443">"백그라운드 프로세스 없음"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 0fab23750dc..96dde1c481e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -687,25 +687,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>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <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>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <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>
@@ -1598,8 +1590,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">"Animator 길이 배율"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <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>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index fc25369c2e8..39d788a7dd1 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Animacijos mastelis 5 x"</item>
     <item msgid="1069584980746680398">"Animacijos mastelis 10 x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standartinis apribojimas"</item>
     <item msgid="4071574792028999443">"Nėra fono procesų"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index dc91846006b..00aafe68166 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Darbalaukio fonas"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pasirinkti darbalaukio foną iš"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Svajonė"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Kai yra doke arba kai veikia miego režimas ir kraunamas akumuliatorius"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Kai veikia miego režimas ir kraunamas akumuliatorius"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Kai yra doke"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Išjungta"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Pasirinkta svajonė"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Kada aktyvinti"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Kai <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neatliekama jokių veiksmų"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Niekada"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Išbandykite!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Pradėti, kai veikia miego režimas"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Pradėti, kai įrenginys yra doke"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatinis ryškumas"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Šrifto dydis"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Šrifto dydis"</string>
@@ -1598,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Lango animacijos mast."</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Animuoto perėjimo mast."</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator. trukmės skalė"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Programos"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Nesaugoti veiklos"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Sunaikinti visą veiklą, kai naud. iš jos išeina"</string>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index da01ab416af..de786366206 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Animācijas mērogs: 5x"</item>
     <item msgid="1069584980746680398">"Animācijas mērogs: 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standarta ierobežojums"</item>
     <item msgid="4071574792028999443">"Nav fona procesu"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 54357860299..a000cddfa86 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fona tapete"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Fona tapetes izvēle no"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Ekrānsaudzētājs"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Kad ierīce tiek dokota vai ir miega režīmā un notiek uzlāde"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Kad ierīce ir miega režīmā un notiek uzlāde"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Kad ierīce tiek dokota"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Atspējots"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Atlasītais ekrānsaudzētājs"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Aktivizēšanas laiks"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Pēc dīkstāves laika: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nekad"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Izmēģiniet!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Aktivizēt, kad ierīce ir miega režīmā"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Aktivizēt, kad ierīce tiek dokota"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automātisks spilgtums"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fonta lielums"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Fonta lielums"</string>
@@ -1598,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Loga animācijas mērogs"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Pārejas animācijas mērogs"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animācijas ilguma mērogs"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Lietotnes"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Nesaglabāt darbības"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Iznīcināt katru darbību, kad lietotājs to pārtrauc"</string>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 4b7279621cf..257c0b85649 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Skala animasi 5x"</item>
     <item msgid="1069584980746680398">"Skala animasi 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Had standard"</item>
     <item msgid="4071574792028999443">"Tiada proses latar belakang"</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index c6f1283ddaa..1a6e6706040 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Kertas dinding"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pilih kertas dinding dari"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Impian"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Apabila didok atau tidur dan dicas"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Apabila tidur dan dicas"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Apabila didok"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Dilumpuhkan"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Mimpi pilihan"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Bila hendak diaktifkan"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> terbiar melahu"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Tidak sekali-kali"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Cubalah!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Mula pada status tidur"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Bermula apabila didok"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan automatik"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Saiz fon"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Saiz fon"</string>
@@ -1598,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Skala animasi tetingkap"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Skala animasi peralihan"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Skala tempoh juruanimasi"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplikasi"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Jangan simpan aktiviti"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Musnahkn setiap aktviti slps pengguna mengglkannya"</string>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 7f2986ff41b..50d9fe251ce 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Animasjonsskala 5 x"</item>
     <item msgid="1069584980746680398">"Animasjonsskala 10 x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standard grense"</item>
     <item msgid="4071574792028999443">"Ingen bakgrunnsprosesser"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 97aad5dc8f9..0aee698a663 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Bakgrunnsbilde"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Velg bakgrunnsbilde fra"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Drøm"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Når enheten er plassert i dokken eller under lading i hvilemodus"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Når enheten lades i hvilemodus"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Når enheten er plassert i dokken"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Deaktivert"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Valgt drøm"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Aktiveringstidspunkt"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> i uvirksomhet"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Aldri"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Prøv den!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Start når enheten går i hvilemodus"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Start når enheten er plassert i dokken"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Skriftstørrelse"</string>
@@ -1029,7 +1021,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-lagringsvolum for data"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kort"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Avinstaller"</string>
-    <string name="install_text" msgid="884360662922471113">"Installer"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Deaktiver"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktiver"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Fjern data"</string>
@@ -1597,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Animasjonsskala for vindu"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Overgangsanimasjonsskala"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Varighetsskala, animatør"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Apper"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ikke behold aktiviteter"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Fjern hver aktivitet så fort brukeren forlater den"</string>
@@ -1700,10 +1691,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Legg til VPN-profil"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Rediger profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Slett profil"</string>
-    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Alltid på-VPN"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Velg en VPN-profil du vil forbli tilkoblet til. Nettverkstrafikk blir bare tillatt når du er tilkoblet denne VPN-en."</string>
-    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ingen"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Alltid på-VPN krever en IP-adresse for både tjener og 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">"Finner ingen nettverkstilkobling. Prøv på nytt senere."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Et sertifikat mangler. Rediger profilen."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index ce6050b2ce2..efda2d68073 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Animatieschaal 5x"</item>
     <item msgid="1069584980746680398">"Animatieschaal 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standaardlimiet"</item>
     <item msgid="4071574792028999443">"Geen achtergrondprocessen"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9871fdb5159..c0418c58469 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Achtergrond"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Achtergrond kiezen van"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Dromen"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Wanneer gedockt, in slaapstand of tijdens het opladen"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"In de slaapstand en tijdens het opladen"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Wanneer gedockt"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Uitgeschakeld"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Geselecteerde droom"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Wanneer activeren"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nooit"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Probeer het eens!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Starten in slaapstand"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Starten wanneer gedockt"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische helderheid"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Lettergrootte"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Lettergrootte"</string>
@@ -1029,7 +1021,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-opslaggegevens"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kaart"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Verwijderen"</string>
-    <string name="install_text" msgid="884360662922471113">"Installeren"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Uitschakelen"</string>
     <string name="enable_text" msgid="9217362512327828987">"Inschakelen"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Gegevens wissen"</string>
@@ -1597,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Vensteranimatieschaal"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Overgangsanimatieschaal"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Duur van animatieschaal"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Activiteiten niet opslaan"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Activiteit wissen zodra de gebruiker deze verlaat"</string>
@@ -1700,10 +1691,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"VPN-profiel toevoegen"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Profiel bewerken"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Profiel verwijderen"</string>
-    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Always-on VPN"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecteer een VPN-profiel waarmee u altijd verbonden wilt blijven. Netwerkverkeer wordt alleen toegestaan bij verbinding met dit VPN."</string>
-    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Geen"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Voor Always-on VPN is een IP-adres voor zowel de server als DNS vereist."</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">"Er is geen netwerkverbinding. Probeer het later opnieuw."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Er ontbreekt een certificaat. Bewerk het profiel."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Systeem"</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index be8d572d0b1..6de5d4a16e7 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Skala animacji 5x"</item>
     <item msgid="1069584980746680398">"Skala animacji 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardowy limit"</item>
     <item msgid="4071574792028999443">"Brak procesów w tle"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 8d29366233f..8c33a66290f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Wybierz tapetę z..."</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Sen"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Gdy zadokowane lub uśpione i podczas ładowania"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Gdy uśpione i podczas ładowania"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Gdy zadokowane"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Wyłączone"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Wybrany sen"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Włączenie wygaszacza"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nigdy"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Wypróbuj"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Uruchamiaj, gdy uśpione"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Uruchamiaj, gdy zadokowane"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatyczna"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Rozmiar czcionki"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Rozmiar czcionki"</string>
@@ -1029,7 +1021,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dane w pamięci USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Karta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Odinstaluj"</string>
-    <string name="install_text" msgid="884360662922471113">"Zainstaluj"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Dezaktywuj"</string>
     <string name="enable_text" msgid="9217362512327828987">"Włącz"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Wyczyść dane"</string>
@@ -1597,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Skala animacji okna"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Skala animacji przejścia"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Skala długości animacji"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplikacje"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Nie zachowuj działań"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Przerwij każde działanie, gdy użytkownik je porzuci"</string>
@@ -1700,10 +1691,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Dodaj profil VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Edytuj profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Usuń profil"</string>
-    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Zawsze włączona sieć VPN"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Wybierz profil VPN, który będzie zawsze podłączony. Ruch w sieci będzie tylko dopuszczalny podczas połączenia z tą siecią VPN."</string>
-    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Brak"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"W przypadku zawsze włączonej sieci VPN wymagany jest adres IP zarówno dla serwera, jak i dla 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">"Brak połączenia sieciowego. Spróbuj ponownie później."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Brak certyfikatu. Edytuj profil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index f0f8c33baf5..5a41861e289 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Escala de animação 5x"</item>
     <item msgid="1069584980746680398">"Escala de animação 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite padrão"</item>
     <item msgid="4071574792028999443">"Sem processos em segundo plano"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 52c632f6259..249e7e512bd 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Imagem de fundo"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Escolher imagem de fundo de"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Sonho"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Quando ancorado ou em suspensão e a carregar"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Quando em suspensão e a carregar"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Quando ancorado"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Desativado"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Sonho selecionado"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Quando ativar"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inativo"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nunca"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Experimente!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Iniciar quando em suspensão"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Iniciar quando ancorado"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho do tipo de letra"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamanho do tipo de letra"</string>
@@ -1029,7 +1021,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dados de armazenamento USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Cartão SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstalar"</string>
-    <string name="install_text" msgid="884360662922471113">"Instalar"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Desactivar"</string>
     <string name="enable_text" msgid="9217362512327828987">"Activar"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Limpar dados"</string>
@@ -1597,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Escala de anim. da janela"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Escala de anim. de trans."</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Esc. de duração do anim."</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplicações"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Não manter atividades"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destruir atividades assim que o utilizador sair"</string>
@@ -1700,10 +1691,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Adicionar perfil VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Editar perfil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Eliminar perfil"</string>
-    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN sempre ativa"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecione um perfil de VPN para permanecer sempre ligado. O tráfego de rede só será permitido quando ligado a esta VPN."</string>
-    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Nenhuma"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"A VPN sempre ativa requer um endereço IP de servidor e 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">"Não existe ligação à rede. Tente novamente mais tarde."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Falta um certificado. Editar o perfil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistema"</string>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 40aa16c376e..0a137c48b8e 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Escala de animação 5x"</item>
     <item msgid="1069584980746680398">"Escala de animação 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite padrão"</item>
     <item msgid="4071574792028999443">"Sem processos em segundo plano"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 8f2b8498c9e..f00de19610c 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Plano de fundo"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Selecionar plano de fundo de"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Sonho"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Quando encaixado ou em suspensão e carregamento"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Quando em suspensão e carregamento"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Quando encaixado"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Desativada"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Sonho selecionado"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Quando ativar"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inativo"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nunca"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Teste-o!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Iniciar em suspensão"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Iniciar quando encaixado"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamanho da fonte"</string>
@@ -1598,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Escala de anim. da janela"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Escala anim. de transição"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Escala de duração do Animator"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplicativos"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Não manter atividades"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destruir todas as atividades quando o usuário sair"</string>
diff --git a/res/values-rm/arrays.xml b/res/values-rm/arrays.xml
index 824dfad397a..2aec04b81ee 100644
--- a/res/values-rm/arrays.xml
+++ b/res/values-rm/arrays.xml
@@ -177,11 +177,6 @@
     <!-- no translation found for animator_duration_scale_entries:4 (3334024790739189573) -->
     <!-- no translation found for animator_duration_scale_entries:5 (3170120558236848008) -->
     <!-- no translation found for animator_duration_scale_entries:6 (1069584980746680398) -->
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
     <!-- no translation found for app_process_limit_entries:0 (3401625457385943795) -->
     <!-- no translation found for app_process_limit_entries:1 (4071574792028999443) -->
     <!-- no translation found for app_process_limit_entries:2 (4810006996171705398) -->
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index a0d7b555382..adc69546323 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -1020,25 +1020,27 @@
     <skip />
     <!-- no translation found for screensaver_settings_title (4458091032540874366) -->
     <skip />
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
+    <!-- no translation found for screensaver_settings_summary_both (1175671101656240599) -->
     <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
+    <!-- no translation found for screensaver_settings_summary_sleep (7231274537626605107) -->
     <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
+    <!-- no translation found for screensaver_settings_summary_dock (4450616262936082466) -->
     <skip />
     <!-- no translation found for screensaver_settings_summary_off (7019248565878953105) -->
     <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
+    <!-- no translation found for screensaver_component_title (5786117148360329058) -->
     <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
+    <!-- no translation found for screensaver_timeout_title (4882666970355550822) -->
     <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
+    <!-- no translation found for screensaver_timeout_summary (7717201094598701673) -->
     <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
+    <!-- no translation found for screensaver_timeout_zero_summary (1274235565189071582) -->
     <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
+    <!-- no translation found for screensaver_test (3048249263811694128) -->
+    <skip />
+    <!-- no translation found for screensaver_activate_on_sleep_title (5463857907577089065) -->
+    <skip />
+    <!-- no translation found for screensaver_activate_on_dock_title (5594601783697028555) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"Clerezza automatica"</string>
     <!-- no translation found for title_font_size (4405544325522105222) -->
@@ -2439,8 +2441,6 @@
     <skip />
     <!-- no translation found for animator_duration_scale_title (3406722410819934083) -->
     <skip />
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <!-- no translation found for debug_applications_category (4206913653849771549) -->
     <skip />
     <!-- no translation found for immediately_destroy_activities (8366775083630234121) -->
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 9c948ad2f3c..b9ea10f4d0e 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Animaţie la scara 5x"</item>
     <item msgid="1069584980746680398">"Animaţie la scara 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limita standard"</item>
     <item msgid="4071574792028999443">"Nu există procese de fundal"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 100b3ff146d..77a46b2042d 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Imagine de fundal"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Aleg. o imag. de fundal de la"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Vis"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Când dispozitivul este andocat sau în modul inactiv şi se realizează încărcarea"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Când dispozitivul este în modul inactiv şi se realizează încărcarea"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Când dispozitivul este andocat"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Dezactivat"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Visul selectat"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Când se activează"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"După un interval de inactivitate de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Niciodată"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Încercaţi-l!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Porneşte când dispozitivul este în modul inactiv"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Porneşte când dispozitivul este andocat"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminozitate automată"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Dimensiune font"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Dimensiune font"</string>
@@ -1599,8 +1591,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Scara anim. în fereastră"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Scară pt. anim. cu tranz."</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Scară durată Animator"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplicaţii"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Nu păstraţi activităţile"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Opreşte orice activitate imediat ce utilizatorul îl părăseşte"</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index e1d64f44bcf..da052fd235f 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Скорость 5x"</item>
     <item msgid="1069584980746680398">"Скорость 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартное ограничение"</item>
     <item msgid="4071574792028999443">"Без фоновых процессов"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f5d9c8635c1..3c053e25271 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -687,25 +687,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>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <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>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <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>
@@ -797,7 +789,8 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Очистить SD-карту"</string>
     <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>
+    <!-- no translation found for mtp_ptp_mode_summary (3710436114807789270) -->
+    <skip />
     <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>
@@ -1598,8 +1591,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>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <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>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index c492a743427..6b04bed2dbb 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Mierka animácie 5x"</item>
     <item msgid="1069584980746680398">"Mierka animácie 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Štandardný limit"</item>
     <item msgid="4071574792028999443">"Žiadne procesy na pozadí"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 9072a1cb7d8..b7c9cd2ef3f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vybrať tapetu z"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Sen"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Pri vložení do doku alebo pri nabíjaní v režime spánku"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Pri nabíjaní v režime spánku"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Pri vložení do doku"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Zakázané"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Vybratý sen"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Čas aktivácie"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Po nečinnosti <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nikdy"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Vyskúšať"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Spustiť v režime spánku"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Spustiť pri vložení do doku"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veľkosť písma"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Veľkosť písma"</string>
@@ -1598,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Mierka animácie okna"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Mierka animácie premeny"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Mierka dĺžky animácie"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplikácie"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Neuchovávať aktivity"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Zničiť každú aktivitu, hneď ako ju používateľ ukončí"</string>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 797d8639470..0e358f6d17e 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Merilo animacije: 5 x"</item>
     <item msgid="1069584980746680398">"Merilo animacije: 10 x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardna omejitev"</item>
     <item msgid="4071574792028999443">"Ni postopkov v ozadju"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index b87dddf28ba..049ad661704 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Ozadje"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Izberite ozadje iz"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Sanje"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"V stojalu ali v stanju pripravljenosti in se polni"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"V stanju pripravljenosti in se polni"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"V stojalu"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Onemogočeno"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Izbrane sanje"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Kdaj aktivirati"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nedejavnosti"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nikoli"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Poskusite!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Zaženi v stanju pripravljenosti"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Zaženi, ko je v stojalu"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Samodejna svetlost"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Velikost pisave"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Velikost pisave"</string>
@@ -1598,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Merilo animacije okna"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Merilo animacije prehoda"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Lestvica trajanja animacije"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Programi"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ne obdrži dejavnosti"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Uniči vsako dejavnost, ko uporabnik preneha z njo"</string>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 817ce652cab..6652d97f81f 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Размера анимације 5x"</item>
     <item msgid="1069584980746680398">"Размера анимације 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандардно ограничење"</item>
     <item msgid="4071574792028999443">"Без позадинских процеса"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 915fba39bde..6e1a603e057 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -687,25 +687,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>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <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>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <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>
@@ -1598,8 +1590,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">"Animator размера трајања"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <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>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 131b651529a..c6afcbf13db 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Animering i skala 5x"</item>
     <item msgid="1069584980746680398">"Animering i skala 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardgräns"</item>
     <item msgid="4071574792028999443">"Inga bakgrundsprocesser"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 5cd7a12d584..282350a57ee 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Bakgrund"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Välj bakgrund från"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Dröm"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"När enheten dockas eller laddas i viloläge"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"När enheten laddas i viloläge"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"När enheten dockas"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Inaktiverad"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Vald dröm"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Tidsgräns för skärmsläckare"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Efter att ha varit inaktiv i <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Aldrig"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Testa!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Starta i viloläge"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Starta när enheten dockas"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk ljusstyrka"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Teckenstorlek"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Teckenstorlek"</string>
@@ -1029,7 +1021,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Data på USB-lagringsenhet"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kort"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Avinstallera"</string>
-    <string name="install_text" msgid="884360662922471113">"Installera"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Inaktivera"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktivera"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Rensa data"</string>
@@ -1597,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Skala, fönsteranimering"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Skala, övergångsanimering"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Längdskala för Animator"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Appar"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Behåll inte aktiviteter"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Förstör aktiviteter så fort användaren lämnar dem"</string>
@@ -1700,10 +1691,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Lägg till VPN-profil"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Redigera profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Ta bort profil"</string>
-    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Always-on VPN"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Välj en VPN-profil som du alltid vill vara ansluten till. Nätverkstrafik tillåts bara när du är ansluten till detta VPN."</string>
-    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Inga"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Funktionen Always-on VPN kräver en IP-adress för både server och 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">"Det finns ingen nätverksanslutning. Försök igen senare."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Det saknas ett certifikat. Redigera profilen."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 26b76b2575f..04623b34ae0 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Mizani 5x ya uhuishaji"</item>
     <item msgid="1069584980746680398">"Mizani 10x ya uhuishaji"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Kiwango cha wastani"</item>
     <item msgid="4071574792028999443">"Hakuna mchakato wa mandari nyuma"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 5e31a52f268..2dccc321d16 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -679,25 +679,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Mandhari"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Chagua mandhari kutoka"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Ndoto"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Wakati imewekwa kwenye gati au kulala na inachaji"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Wakati inalala au kuchaji"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Wakati kimewekwa kwenye gati"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Imelemazwa"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Ndoto iliyochaguliwa"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Wakati wa kuamilisha"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> uliotumika bila kufanya kitu"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Kamwe"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Ijaribu!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Anza kinapolala"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Anza wakati kimewekwa kwenye gati"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Mwangaza wa kiotomatiki"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Ukubwa wa maandishi"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Ukubwa wa fonti"</string>
@@ -1021,7 +1013,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Hifadhi data ya USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Kadi ya SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Ondoa"</string>
-    <string name="install_text" msgid="884360662922471113">"Sakinisha"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Lemaza"</string>
     <string name="enable_text" msgid="9217362512327828987">"Wezesha"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Futa data"</string>
@@ -1589,8 +1582,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Kipimo cha uhiani wa Window"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Mageuzi ya kipimo cha huiani"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Mizani ya muda wa uhuishaji"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Prog"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Usihifadhi shughuli"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Haribu kila shughuli pindi tu mtumiaji anapoondoka"</string>
@@ -1692,10 +1683,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Ongeza wasifu wa VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Hariri wasifu"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Futa wasifu"</string>
-    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN Iliyowashwa kila mara"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Teua maelezo mafupi ya VPN ambayo yatasalia kuunganishwa kila mara. Trafiki ya mtandao itaruhusiwa tu unapounganishwa kwenye VPN."</string>
-    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Hamna"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Kila mara VPN iliyowashwa inahitaji anwani ya IP kwa seva zote na 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">"Hakuna muunganisho wa mtandao. Tafadhali jaribu tena baadaye."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Cheti fulani hakipo. Tafadhali hariri wasifu."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Mfumo"</string>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 7f9e973c305..6efdda24935 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"ความเร็วภาพเคลื่อนไหว 5 เท่า"</item>
     <item msgid="1069584980746680398">"ความเร็วภาพเคลื่อนไหว 10 เท่า"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"ขีดจำกัดมาตรฐาน"</item>
     <item msgid="4071574792028999443">"ไม่มีกระบวนการพื้นหลัง"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 60c28d78e1d..ab511b4db85 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -687,25 +687,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">"Dream"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <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>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Dream ที่เลือก"</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>
@@ -1598,8 +1590,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>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <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>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 80577ee654c..d305b78659b 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Scale ng animation 5x"</item>
     <item msgid="1069584980746680398">"Scale ng animation 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Karaniwang limitasyon"</item>
     <item msgid="4071574792028999443">"Walang mga proseso sa background"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 8328055feee..82e64c76c5b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pumili ng wallpaper mula sa"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Dream"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Kapag naka-dock o naka-sleep at nagcha-charge"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Kapag naka-sleep at nagcha-charge"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Kapag naka-dock"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Hindi pinagana"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Piniling dream"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Kailan isasaaktibo"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> na ginugol na idle"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Hindi kailanman"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Subukan ito!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Magsimula sa sleep"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Simulan kapag naka-dock"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Awtomatikong pagliwanag"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Laki ng font"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Laki ng font"</string>
@@ -1598,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Scale ng animation window"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Scale ng animation sa paglipat"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Scale tagal ng animator"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Huwag magtago ng mga aktibidad"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Sirain ang bawat aktibidad sa sandaling iwan ito ng user"</string>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 13d7fa73912..29978e73334 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Animasyon ölçeği 5x"</item>
     <item msgid="1069584980746680398">"Animasyon ölçeği 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standart sınır"</item>
     <item msgid="4071574792028999443">"Arka planda işlem yok"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 3658b530f10..e1f3075abd3 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Duvar Kağıdı"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Şuradan duvar kağıdı seçin:"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Rüya"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Yuvasına yerleştirildiğinde veya uyku modunda ve şarj edilirken"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Uyku modunda ve şarj edilirken"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Yuvasına yerleştirildiğinde"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Devre dışı"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Seçili rüya"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Etkinleştirme zamanı"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> boşta kaldıktan sonra"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Hiçbir zaman"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Deneyin!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Uyku modunda başlat"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Yuvasına yerleştirildiğinde başlat"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Otomatik parlaklık"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Yazı tipi boyutu"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Yazı tipi boyutu"</string>
@@ -1029,7 +1021,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB bellek verileri"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD kart"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Kaldır"</string>
-    <string name="install_text" msgid="884360662922471113">"Yükle"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Devre dışı bırak"</string>
     <string name="enable_text" msgid="9217362512327828987">"Etkinleştir"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Verileri temizle"</string>
@@ -1597,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Pencere animasyonu ölçeği"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Geçiş animasyonu ölçeği"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animatör süre ölçeği"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Uygulamalar"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Etkinlikleri saklama"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Kullanıcının ayrıldığı her etkinliği hemen yok et"</string>
@@ -1700,10 +1691,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"VPN profili ekle"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Profili düzenle"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Profili sil"</string>
-    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Her zaman açık VPN"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Her zaman bağlı kalacak bir VPN profili seçin. Ağ trafiğine yalnızca bu VPN\'ye bağlanıldığında izin verilir."</string>
-    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Yok"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Her zaman açık VPN seçeneğinde hem sunucu hem de DNS için bir IP adresi gerekir."</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">"Ağ bağlantısı yok. Lütfen daha sonra tekrar deneyin."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Bir sertifika eksik. Lütfen profili düzenleyin."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistem"</string>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 51f387e93ad..016975c8d23 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Ступінь анімації 5x"</item>
     <item msgid="1069584980746680398">"Ступінь анімації 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартне обмеження"</item>
     <item msgid="4071574792028999443">"Без фонових процесів"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 1a625ed33ed..402bffa9d43 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -687,25 +687,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>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <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>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <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>
@@ -1598,8 +1590,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>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <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>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 18cfadb1016..479c5cc1a86 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Tỷ lệ hình động 5x"</item>
     <item msgid="1069584980746680398">"Tỷ lệ hình động 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Giới hạn tiêu chuẩn"</item>
     <item msgid="4071574792028999443">"Không có quá trình nền"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 5f2c4fb5b6b..8d34abc58f6 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Hình nền"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Chọn hình nền từ"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Mô-đun"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Khi được gắn đế hoặc ở chế độ ngủ và sạc pin"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Khi ở chế độ ngủ và sạc pin"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Khi được gắn đế"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Đã bị tắt"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Mô-đun đã chọn"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Thời điểm kích hoạt"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Sau <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> không hoạt động"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Không bao giờ"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Hãy dùng thử!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Bắt đầu khi ở chế độ ngủ"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Bắt đầu khi được gắn đế"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Độ sáng tự động"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Kích thước phông chữ"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Kích thước phông chữ"</string>
@@ -1598,8 +1590,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Tỷ lệ hình động của cửa sổ"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Tỷ lệ hình động chuyển đổi"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"T.lệ th.lượng tr.tạo h.đ"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Ứng dụng"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Không tiếp tục các hoạt động"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Hủy mọi hoạt động ngay khi người dùng rời khỏi"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 2677b9a50fa..4940c2356c7 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"动画缩放 5x"</item>
     <item msgid="1069584980746680398">"动画缩放 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <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 bda0b426308..bf4280341f9 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -687,25 +687,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>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <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>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <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>
@@ -1598,8 +1590,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>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <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>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index e86a4a6d6cb..7723ee91075 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"動畫比例 5x"</item>
     <item msgid="1069584980746680398">"動畫比例 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"標準限制"</item>
     <item msgid="4071574792028999443">"不執行背景處理程序"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e0cd6dd458a..2ec5259de9e 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -687,25 +687,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">"Dream"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <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>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"選取的 Dream"</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>
@@ -1598,8 +1590,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">"Animator 影片長度比例"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <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>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 5817bf51ccc..f929c736f5a 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -253,11 +253,6 @@
     <item msgid="3170120558236848008">"Isilinganisi sesithombe esinyakazayo 5x"</item>
     <item msgid="1069584980746680398">"Isilinganiso sesithombe esinyakazayo 10x"</item>
   </string-array>
-    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
-    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
-    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
-    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
-    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Isilanganiso esivamile"</item>
     <item msgid="4071574792028999443">"Azikho izinqubo zesizinda"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 89e9eedaeb7..b3c505d15c6 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -687,25 +687,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Iphephadonga"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Khetha iphephalodonga kwi"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"Iphupho"</string>
-    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_sleep (3642352561593337637) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
-    <skip />
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Uma kudokhiwe noma kulelwe futhi ishaja"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Uma ilele futhi ishaja"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Uma kudokhiwe"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Kukhutshaziwe"</string>
-    <!-- no translation found for screensaver_settings_disabled_prompt (2060724968623677666) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_start_dreaming (1695787491111862810) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (9110320844270942351) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_settings (7895367391368911582) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_preview (2690543899036878396) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Iphupho elikhethiwe"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Qlisa nini"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Emva <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> esithithwe kungenziwa lutho"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nhlobo"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Yizame!"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Qala kulelwe"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Qala uma kudokhiwe"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Ukukhanya okuzenzakalelayo"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Usayizi wefonti"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Ubukhulu befonti"</string>
@@ -1030,7 +1022,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Idatha yesitoreji se-USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Ikhadi le-SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Khipha"</string>
-    <string name="install_text" msgid="884360662922471113">"Faka"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Valiwe"</string>
     <string name="enable_text" msgid="9217362512327828987">"Vumela"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Sula idatha"</string>
@@ -1604,8 +1597,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Iwindi yesilinganisi sesithombe esinyakazayo"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Isilinganiso sesithombe soku"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Isilinganiso sobude besikhathi somenzi womfanekiso onyakazayo"</string>
-    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
-    <skip />
     <string name="debug_applications_category" msgid="4206913653849771549">"Izinhlelo zokusebenza"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ungagcini imisibenzi"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Phihliza zonke izenzo ngokushesha ngemva kokuna umsebenzisi awuyeka"</string>
@@ -1707,10 +1698,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Engeza iphrofayela ye-VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Hlela iphrofayela"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Susa iphrofayela"</string>
-    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"I-VPN ehlala ikhanya"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Khetha iphrofayela ye-VPN ukuhlala uxhumekile. I-traffic yenethiwekhi izovunyelwa kuphela uma ixhunyiwe kule-VPN."</string>
-    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Akunalutho"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"I-VPN ehlala ikhanya idinga ikheli le-IP kwisiphakeli ne-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">"Alukho uxhumo lenethiwekhi. Sicela uzame futhi emva kwesikhathi."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Isitifiketi silahlekile. Sicela uhlelo iphrofayela."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Isistimu"</string>