Snap for 10460766 from 4eb7b888ab394100643c6500e06e3b31f1780760 to mainline-healthfitness-releaseaml_hef_341613000 aml_hef_341512030 aml_hef_341415040 aml_hef_341311010 aml_hef_341114030 android14-mainline-healthfitness-release

Change-Id: I6e4636151e37acf2fe2029a54cf9a5cff7c9e38a
author: Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2023-07-08 04:39:55 +0000
committer: Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2023-07-08 04:39:55 +0000
commit: cf95e18ef27a5f5ea53ec5b0bdf0c6b73171fa1b (patch)
tree: 801e5153963a9a347f13082c836e331d5a8e3760
parent: 21e873ecce493c168ac30e72a9e6c9e7630400a9 (diff)
parent: 4eb7b888ab394100643c6500e06e3b31f1780760 (diff)
download: TvSettings-android14-mainline-healthfitness-release.tar.gz
176 files changed, 1358 insertions, 7650 deletions
diff --git a/Settings/res-twopanel/values-ky/strings.xml b/Settings/res-twopanel/values-ky/strings.xml
index e35076cb9..fe2e8c808 100644
--- a/Settings/res-twopanel/values-ky/strings.xml
+++ b/Settings/res-twopanel/values-ky/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="device_pref_category_title" msgid="6900784241621768228">"Система"</string>
+    <string name="device_pref_category_title" msgid="6900784241621768228">"Тутум"</string>
 </resources>
diff --git a/Settings/res/values-af/energy-modes.xml b/Settings/res/values-af/energy-modes.xml
deleted file mode 100644
index a80dc0996..000000000
--- a/Settings/res/values-af/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Noodsaaklike netwerkkenmerke"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Lae energieverbruik"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Skakel netwerkverbinding af wanneer die TV nie gebruik word nie."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Kritieke opdaterings en funksies"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Aanbeveelde netwerkkenmerke"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Geoptimeerde energieverbruik"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Skakel kenmerke aan wat die TV oor die netwerk wakker maak (netwerkbystand)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Voeg kenmerk 1 in]"</item>
-    <item msgid="8724721267222341891">"[Voeg kenmerk 2 in]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Bykomende netwerkkenmerke"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Groter energieverbruik"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Hierdie kenmerk skakel bo en behalwe aanbeveelde kenmerke bykomende kenmerke aan wanneer die TV nie gebruik word nie wat die energieverbruik kan vergroot."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Voeg kenmerk 1 in]"</item>
-    <item msgid="170760143032597722">"[Voeg kenmerk 2 in]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-af/strings.xml b/Settings/res/values-af/strings.xml
index e30b2e1ed..5183cef11 100644
--- a/Settings/res/values-af/strings.xml
+++ b/Settings/res/values-af/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Rugsteun en teruglaai"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Fabrieksterugstelling"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibrering"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Afstel-afteller"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Stel aftellers om TV af te skakel en energie te bespaar"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Krag en energie"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Eko-instellings"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Toestelle"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Kies formate"</string>
@@ -151,41 +151,14 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Gevorderde klankinstellings"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Laat speletjiemodus toe"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Pas by inhoud se dinamiese omvang"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Wanneer jy hierdie opsie aktiveer, sal die stelsel tussen verskillende formate vir dinamiese omvang oorskakel om by die inhoud te pas. Dit kan ’n swart skerm veroorsaak terwyl daar tussen formate oorgeskakel word.\n\nKlik Gevorderde Skerm-instellings vir meer opsies vir dinamiese omvang."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Voorkeur- dinamiese omvang"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Omskakeling wat deur stelsel verkies word"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Laat die stelsel die formaatomskakeling bestuur"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Wanneer hierdie opsie gekies is, sal die stelsel ’n geskikte dinamiese bestek bepaal wat na jou skerm toe gestuur word, en inhoud wanneer nodig na hierdie dinamiese bestek toe omskakel."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Pas altyd by inhoud se formaat"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Verplig omskakeling"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Verplig omskakeling na voorkeurformaat"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Verplig omskakeling na ’n voorkeurformaat. As omskakeling verpligtend gemaak word, kan dit ander instellings in Vertoonmodus of HDR-formaat beïnvloed."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Altyd na SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Altyd na <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Wil jy die HDR-uitvoer verpligtend maak?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Omskakeling na <xliff:g id="HDR_TYPE">%s</xliff:g> sal by verstek verplig word."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Jou skerm sal ’n resolusie van 1080 p teen 60 Hz gebruik. Hierdie opsie is nie met jou skerm versoenbaar terwyl dit ’n resolusie van 4k teen 60 Hz gebruik nie."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision word nie teen die huidige resolusie gesteun nie. Jou skerm se resolusie sal na 1080 p 60 Hz verander word as jy Dolby Vision handmatig aktiveer"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Verander resolusie na 1080 p 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Verplig altyd omskakeling na Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"As Dolby Vision in HDR-formate in die gevorderde vertooninstellings gedeaktiveer is, sal dit geheraktiveer word as omskakeling na Dolby Vision verplig word."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Verplig altyd omskakeling na HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"As HDR10 in HDR-formate in die gevorderde vertooninstellings gedeaktiveer is, sal dit geheraktiveer word as omskakeling na HDR10 verplig word."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Verplig altyd omskakeling na HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"As HLG in HDR-formate in die gevorderde vertooninstellings gedeaktiveer is, sal dit geheraktiveer word as omskakeling na HLG verplig word."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Verplig altyd omskakeling na HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"As HDR10+ in HDR-formate in die gevorderde vertooninstellings gedeaktiveer is, sal dit geheraktiveer word as omskakeling na HDR10+ verplig word."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Verplig altyd omskakeling na SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"As omskakeling na SDR verplig word, sal alle formate in die HDR-formate in gevorderde vertooninstellings gedeaktiveer word."</string>
-    <string name="match_content_frame_rate_title" msgid="153291168560947689">"Ewenaar inhoudraamtempo"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Slegs onopmerklik"</string>
-    <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Wanneer die app dit versoek, sal jou toestel sy uitset laat pas by die oorspronklike raamtempo van die inhoud wat jy kyk, NET as jou TV \'n soomlose oorgang kan uitvoer."</string>
+    <string name="match_content_frame_rate_title" msgid="153291168560947689">"Ewenaar inhoudraamkoers"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Soomloos"</string>
+    <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Wanneer die program dit versoek, sal jou toestel sy uitset laat pas by die oorspronklike raamtempo van die inhoud wat jy kyk, NET as jou TV \'n soomlose oorgang kan uitvoer."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Jou gekoppelde skerm steun nie probleemvrye herlaaitempo-oorgange nie. Hierdie opsie sal geen uitwerking hê nie, tensy jy ’n ander skerm gebruik wat dit wel steun."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Altyd"</string>
-    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"As die app dit versoek, sal jou toestel sy uitset laat pas by die oorspronklike raamtempo van die inhoud wat jy kyk. Dit kan veroorsaak dat jou skerm vir \'n oomblik donker raak wanneer dit by \'n videoterugspeel uit- of ingaan."</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Nie-soomloos"</string>
+    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"As die program dit versoek, sal jou toestel sy uitset laat pas by die oorspronklike raamtempo van die inhoud wat jy kyk. Dit kan veroorsaak dat jou skerm vir \'n oomblik donker raak wanneer dit by \'n videoterugspeel uit- of ingaan."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Nooit"</string>
-    <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Selfs wanneer die app dit versoek, sal jou toestel nooit probeer om sy uitset te laat pas by die oorspronklike raamtempo van die inhoud wat jy kyk nie."</string>
+    <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Selfs wanneer die program dit versoek, sal jou toestel nooit probeer om sy uitset te laat pas by die oorspronklike raamtempo van die inhoud wat jy kyk nie."</string>
     <string name="font_scale_settings_title" msgid="4114019544800225980">"Teksskalering"</string>
     <string name="font_scale_item_detail" msgid="1558315053348778805">"Skaleer na <xliff:g id="SCALE">%1$d</xliff:g>%%"</string>
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Voorbeeldteks"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Verander resolusie na %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Kies OK om %1$s van nou af te gebruik."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision word nie by %1$s gesteun nie, en sal in “Gevorderde skerminstellings” gedeaktiveer word"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Hierdie modus ondersteun: %1$s\nOp sommige TV’s sal jy dalk Gevorderde HDMI moet aanskakel om meer HDR-formate te aktiveer. Gaan jou TV-instellings na om te kyk of dit gesteun word."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Hierdie modus ondersteun %1$s. Op sommige TV’s sal jy dalk Gevorderde HDMI moet aanskakel om meer HDR-formate te aktiveer. Gaan jou TV-instellings na om te kyk of dit gesteun word."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Kanselleer"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Moet gekaste data uitgevee word?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Sal gekaste data vir alle programme uitvee."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -300,7 +273,7 @@
     <string name="no_device_admins" msgid="4628974717150185625">"Geen toesteladministrateurprogramme beskikbaar nie"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="7678529948487939871">"Gedeaktiveer deur administrateur"</string>
     <string name="disabled_by_administrator_summary" msgid="3420979957115426764">"Nie beskikbaar nie"</string>
-    <string name="manage_device_admin" msgid="5714217234035017983">"Toesteladministrasie-apps"</string>
+    <string name="manage_device_admin" msgid="5714217234035017983">"Toesteladministrasieprogramme"</string>
     <string name="number_of_device_admins_none" msgid="2734299122299837459">"Geen aktiewe programme nie"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="108190334043671416">"Gedeaktiveer deur administrateur, enkripsiebeleid of eiebewysberging"</string>
     <string name="enterprise_privacy_settings" msgid="8226765895133003202">"Inligting oor bestuurde toestel"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Hierdie toestel word deur jou organisasie bestuur."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Hierdie toestel word deur <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> bestuur."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Kom meer te wete"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kameraprogram}other{Kameraprogramme}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Kalenderprogram"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Bevestig asseblief om te verhoed dat die skerm afskakel terwyl jy kyk, wat moontlik tot verhoogde energiegebruik kan lei."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Wanneer toestel onaktief is"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Wanneer gebruiker kyk"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Skakel outomaties af"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Skakel outomaties af terwyl dit onaktief is"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Skakel outomaties af terwyl jy kyk"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Skakel TV outomaties af"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Skakel TV outomaties af wanneer dit onaktief is"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Skakel TV outomaties af terwyl jy kyk"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"“Wanneer onaktief”-afteller moet korter wees as “Kyktyd”-afteller"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"“Kyktyd”-afteller moet langer wees as “Wanneer onaktief”-afteller"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Beperk netwerkverbinding in bystandmodus"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Aanskakelgedrag"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Stel terug"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Ethernet-saambindkode"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Energiemodusse"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Verbeter energiedoeltreffendheid wanneer TV nie gebruik word nie"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Aktiveer:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Let daarop dat hierdie modus die toestel se kragverbruik kan vergroot."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Aktiveer “<xliff:g id="ENERGYMODENAME">%s</xliff:g>”"</string>
 </resources>
diff --git a/Settings/res/values-am/energy-modes.xml b/Settings/res/values-am/energy-modes.xml
deleted file mode 100644
index dce8004c4..000000000
--- a/Settings/res/values-am/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"መሰረታዊ የአውታረ መረብ ባህሪያት"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ዝቅተኛ የኃይል አጠቃቀም"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"ቲቪው ጥቅም ላይ በማይሆንበት ጊዜ የአውታረ መረብ ግንኙነትን ያጥፉ።"</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"ወሳኝ ዝማኔዎች እና ተግባራት"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"የሚመከሩ የአውታረ መረብ ባህሪያት"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"የተባ የኃይል አጠቃቀም"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ቲቪውን በአውታረ መረብ ላይ የሚያነቁ ባህሪያትን ያበራል (በአውታረ መረብ የተገናኘ መጠባበቅ)"</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"ተጨማሪ የአውታረ መረብ ባህሪያት"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"የጨመረ የኃይል አጠቃቀም"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"ከሚመከሩ ባህሪያት በተጨማሪ ይህ አማራጭ ቲቪው ጥቅም ላይ በማሆንበት ጊዜ የኃይል አጠቃቀምን ሊጨምር በሚችል መልኩ ተጨማሪ ባህሪያትን ያበራል።"</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-am/strings.xml b/Settings/res/values-am/strings.xml
index aab8826eb..6382ead8d 100644
--- a/Settings/res/values-am/strings.xml
+++ b/Settings/res/values-am/strings.xml
@@ -100,7 +100,7 @@
     <string name="all_apps_installed" msgid="8217778476185598971">"የተጫኑ መተግበሪያዎች"</string>
     <string name="all_apps_other" msgid="4420174882983813158">"የስርዓት መተግበሪያዎች"</string>
     <string name="all_apps_disabled" msgid="2776041242863791053">"የተሰናከሉ መተግበሪያዎች"</string>
-    <string name="device_daydream" msgid="2631191946958113220">"የማያ ገፅ ማቆያ"</string>
+    <string name="device_daydream" msgid="2631191946958113220">"የማያ ገጽ ማቆያ"</string>
     <string name="device_display" msgid="244634591698925025">"ማሳያ"</string>
     <string name="device_display_sound" msgid="7399153506435649193">"ማሳያ እና ድምፅ"</string>
     <string name="device_sound" msgid="8616320533559404963">"ድምፅ"</string>
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"ምትኬ ያስቀምጡ እና ወደነበረበት ይመልሱ"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"የፋብሪካ ውሂብን ዳግም አስጀምር"</string>
     <string name="device_calibration" msgid="2907914144048739705">"መዘወግ"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"ሰዓት ቆጣሪን ያጥፉ"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"ቲቪን ለማጥፋት እና ኃይል ለመቆጠብ ሰዓት ቆጣሪዎችን ያቀናብሩ"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"ጉልበት እና ኃይል"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"ለተፈጥሮ ተስማሚ ቅንብሮች"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"መሣሪያዎች"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"ቅርጸቶችን ይምረጡ"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"የላቀ ድምፅ ቅንብሮች"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"የጨዋታ ሁነታን ይፍቀዱ"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"የይዘት ተለዋዋጭ ክልልን አዛምድ"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"ይህን አማራጭ ሲያነቁ ስርዓቱ ከይዘቱ ጋር ለመመሳሰል በተለያዩ ተለዋዋጭ የክልል ቅርጸቶች መካከል ይቀያየራል። ይህ ቅርጸት በሚቀያየርበት ጊዜ ጥቁር ማያ ገፅ ሊያስከትል ይችላል።\n\nለተጨማሪ ተለዋዋጭ የክልል አማራጮች የላቀ የማሳያ ቅንብሮችን ጠቅ ያድርጉ።"</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"ተመራጭ ተለዋዋጭ ክልል"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"በሥርዓቱ-የሚመረጥ ልወጣ"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"ሥርዓቱ የቅርጸት ልወጣውን እንዲያስተዳድር ያስችለዋል"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"ይህ አማራጭ ሲመረጥ ሥርዓቱ ወደ የእርስዎ ማሳያ እንዲላክ እና ይዘትን ወደዚህ ተለዋዋጭ ክልል እንደተፈለገው እንዲለውጥ ተስማሚ ተለዋዋጭ ክልል ይወስናል።"</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"ሁልጊዜ ከይዘቱ ቅርጸት ጋር ይመሳሰላል"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"ልወጣን አስገድድ"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"ልወጣን ወደ ተመራጭ ቅርጸት ያስገድደዋል"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"ልወጣን ወደ ተመራጭ ቅርጸት አስገድድ ልወጣን ማስገደድ በማሳያ ሁነታ ወይም በኤችዲአር ቅርጸት ውስጥ ሌሎች ቅንብሮች ላይ ተጽዕኖ ሊያሳድር ይችላል።"</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"ሁልጊዜ ወደ ኤስዲአር"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"ሁልጊዜ ወደ <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"የኤችዲአር ውጽዓትን ማስገደድ ይፈልጋሉ?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"በነባሪ ልወጣው ወደ <xliff:g id="HDR_TYPE">%s</xliff:g> እንዲሄድ ይገደዳል።"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"ማሳያዎ 1080ፒ 60ኸርዝ ጥራት ላይ ያሄዳል። አማራጩ በ4ኪ 60 ኸርዝ ጥራት በሚያሄድበት ጊዜ ከእርስዎ ማሳያ ጋር ተኳዃኝ አይደለም።"</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision አሁን ባለው ጥራት አይደገፍም። Dolby Visionን እራስዎ ካነቁት የማሳያዎ ጥራት ወደ 1080ፒ 60 ኸርዝ ይቀየራል።"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"ጥራት ወደ 1080ፒ 60 ኸርዝ ይቀየር?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"ልወጣን ሁልጊዜ ወደ Dolby Vision ያስገድዱ"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Dolby Vision በላቁ የማሳያ ቅንብሮች ውስጥ በኤችዲአር ቅርጸቶች ከተሰናከለ ወደ Dolby Vision ልወጣን ማስገደድ እንደገና ያነቃዋል።"</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"ልወጣን ሁልጊዜ ወደ ኤችዲአር10 ያስገድዱ"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"ኤችዲአር10 በላቁ የማሳያ ቅንብሮች ውስጥ በኤችዲአር ቅርጸቶች ከተሰናከለ ወደ ኤችዲአር10 ልወጣን ማስገደድ እንደገና ያነቃዋል።"</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"ልወጣን ሁልጊዜ ወደ ኤችኤልጂ ያስገድዱ"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"ኤችኤልጂ በላቁ የማሳያ ቅንብሮች ውስጥ በኤችዲአር ቅርጸቶች ከተሰናከለ ወደ ኤችኤልጂ ልወጣን ማስገደድ እንደገና ያነቃዋል።"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"ልወጣን ሁልጊዜ ወደ ኤችዲአር10+ ያስገድዱ"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"ኤችዲአር10+ በላቁ የማሳያ ቅንብሮች ውስጥ በኤችዲአር ቅርጸቶች ከተሰናከለ ወደ ኤችዲአር10+ ልወጣን ማስገደድ እንደገና ያነቃዋል።"</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"ልወጣን ሁልጊዜ ወደ ኤስዲአር ያስገድዱ"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"ወደ ኤስዲአር ልወጣን ማስገደድ በኤችዲአር ቅርጸቶች በላቁ የማሳያ ቅንብሮች ውስጥ ያሉትን ሁሉንም ቅርጸቶች ያሰናክላል።"</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"የተዛማጅ ይዘት የክፈፍ ፍጥነት"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"እንከን-አልባ-ብቻ"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"እንከን-አልባ"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"መተግበሪያው ከጠየቀ የእርስዎ ቲቪ እንከን-አልባ ሽግግርን ማከናወን የሚችል ሲሆን ብቻ የእርስዎ መሣሪያ ውጽዓቱን እየተመለከቱት ካለው የይዘት የመጀመሪያው ክፈፍ ፍጥነት ጋር ያዛምደዋል።"</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"የተገናኘው ማሳያዎ እንከን አልባ የዕድሳት ፍጥነት ሽግግሮችን አይደግፍም። ይህን አማራጭ ወደሚደግፍ ማሳያ እስካልቀየሩ ድረስ አማራጩ ምንም ተጽዕኖ አይኖረውም።"</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"ሁልጊዜ"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"እንከን የለሽ"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"መተግበሪያው ከጠየቀ የእርስዎ መሣሪያ ውጽዓቱን እየተመለከቱት ካለው የይዘት የመጀመሪያው ክፈፍ ፍጥነት ጋር ያዛምደዋል። ይህ ከቪዲዮ መልሶ ማጫዎቻ ሲወጡ ወይም ሲገቡ ማያ ገጽዎ ለአንድ ሰከንድ ባዶ እንዲሄድ ሊያደርግ ይችላል።"</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"በጭራሽ"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"መተግበሪያው ቢጠይቅም እንኳ የእርስዎ መሣሪያ በጭራሽ ውጽዓቱን እየተመለከቱት ካለው የይዘት የመጀመሪያው ክፈፍ ፍጥነት ጋር ለማዛመድ አይሞክርም።"</string>
@@ -216,13 +189,13 @@
     <string name="resolution_selection_auto_title" msgid="4738671207331027385">"ራስ-ሰር"</string>
     <string name="resolution_selection_dialog_title" msgid="4029798035133645272">"ጥራት ተቀይሯል"</string>
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"ጥራት ወደ %1$s ይለወጥ?"</string>
-    <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"ከአሁን በኋላ %1$s ለመጠቀም እሺን ይምረጡ።"</string>
+    <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"ከአሁን በኋላ %1$sን ለመጠቀም እሺን ይምረጡ።"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision %1$s ላይ አይደገፍም እና «በላቁ የማሳያ ቅንብሮች» ውስጥ ይሰናከላል"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"ይህ ሁነታ የሚከተለውን ይደግፋል፦ %1$s\nበአንዳንድ ቲቪዎች ላይ ተጨማሪ ኤችዲአር ቅርጸቶችን ለማንቃት የተሻሻለ ኤችዲኤምአይን ማብራት ሊኖርብዎት ይችላል። ይህ የሚደገፍ መሆኑን ለማየት የእርስዎን ቲቪ ቅንብሮች ይፈትሹ።"</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"ይህ ሁነታ %1$sን ይደግፋል። በአንዳንድ ቲቪዎች ላይ ተጨማሪ ኤችዲአር ቅርጸቶችን ለማንቃት የተሻሻለ ኤችዲኤምአይን ማብራት ሊኖርብዎት ይችላል። ይህ የሚደገፍ መሆኑን ለማየት የእርስዎን ቲቪ ቅንብሮች ይፈትሹ።"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"ይቅር"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"እሺ"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"ኸርዝ"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> ኸርዝ)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> ኸርዝ)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"የተሸጎጠ ውሂብ ይጽዳ?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"ይሄ የተሸጎጡ የሁሉም መተግበሪያዎች ውሂብ ያጸዳል።"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -286,7 +259,7 @@
     <string name="system_keyboard" msgid="1514460705385401872">"የቁልፍ ሰሌዳ"</string>
     <string name="system_keyboard_autofill" msgid="8530944165814838255">"ቁልፍ ሰሌዳ እና ራስ-ሙላ"</string>
     <string name="system_autofill" msgid="6983989261108020046">"ራስ-ሙላ"</string>
-    <string name="system_home" msgid="2149349845791104094">"መነሻ ማያ ገፅ"</string>
+    <string name="system_home" msgid="2149349845791104094">"መነሻ ማያ ገጽ"</string>
     <string name="system_search" msgid="3170169128257586925">"ፍለጋ"</string>
     <string name="system_google" msgid="945985164023885276">"Google"</string>
     <string name="system_security" msgid="1012999639810957132">"ደህንነት እና ገደቦች"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"ይህ መሣሪያ በእርስዎ ድርጅት የሚተዳደር ነው።"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"ይህ መሣሪያ በ<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> የሚተዳደር ነው።"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">"፣"</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"የበለጠ መረዳት"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{የካሜራ መተግበሪያ}one{የካሜራ መተግበሪያዎች}other{የካሜራ መተግበሪያዎች}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"የቀን መቁጠሪያ መተግበሪያ"</string>
@@ -440,7 +414,7 @@
     <string name="wifi_setting_other_options_add_network" msgid="6490215784178866978">"አዲስ አውታረ መረብ አክል"</string>
     <string name="wifi_setting_other_options_add_network_via_easyconnect" msgid="2869989555950644533">"ፈጣን መገናኘት"</string>
     <string name="wifi_setting_other_options_add_network_via_easyconnect_info_summary" msgid="4564538591168691865">"ፈጣን መገናኘት በስልክዎ ላይ የQR ኮድን በመቃኘት በፍጥነት ከእርስዎ WiFi ጋር እንዲገናኙ ይረዱዎታል።"</string>
-    <string name="security_type" msgid="2297615092250075696">"የደህንነት ዓይነት"</string>
+    <string name="security_type" msgid="2297615092250075696">"የደህንነት አይነት"</string>
     <string name="other_network" msgid="5299289104661858596">"ሌላ አውታረ መረብ…"</string>
     <string name="skip_network" msgid="3095529090560000692">"ዝለል"</string>
     <string name="wifi_security_type_none" msgid="7001835819813531253">"ምንም"</string>
@@ -667,10 +641,10 @@
     <string name="location_history_desc" msgid="926674012916014270">"ለዚህ መለያ የአካባቢ ታሪክ ሲበራ Google የመሣሪያዎ አካባቢ ውሂብ ሌሎች መተግበሪያዎች እንዲጠቀሙበት ሊያከማቸው ይችላል።\n\nለምሳሌ፣ Google ካርታዎች አቅጣጫዎችን ሊሰጡዎት ይችላል፣ እና Google Now ስለመጓጓዣ ትራፊክ መረጃ ሊሰጠዎት ይችላል።\n\nየአካባቢን ታሪክ በማንኛውም ጊዜ ማጥፋት ይችላሉ፣ ነገር ግን ይህን ማድረግ አይሰርዘውም። የአካባቢ ታሪክዎን ለመመልከት እና ለማቀናበር maps.google.com/locationhistoryን ይጎብኙ።"</string>
     <string name="delete_location_history_title" msgid="707559064715633152">"የአካባቢ ታሪክን ሰርዝ"</string>
     <string name="delete_location_history_desc" msgid="4035229731487113147">"ይሄ ሁሉንም የዚህ Google መለያ የአካባቢ ታሪክ ከዚህ መሣሪያ ያስወግደዋል። ይህን ስረዛ ሊቀለብሱት አይችሉም። Google Nowን ጨምሮ አንዳንድ መተግበሪያዎች መስራት ያቆማሉ።"</string>
-    <string name="accessibility_screen_readers_category_title" msgid="7742526514873922018">"የማያ ገፅ አንባቢዎች"</string>
+    <string name="accessibility_screen_readers_category_title" msgid="7742526514873922018">"የማያ ገጽ አንባቢዎች"</string>
     <string name="accessibility_display_category_title" msgid="593444602101558017">"ማሳያ"</string>
     <string name="accessibility_interaction_controls_category_title" msgid="5290687835178852745">"የመስተጋብር መቆጣጠሪያዎች"</string>
-    <string name="accessibility_audio_and_onscreen_text_category_title" msgid="113841605896486212">"ኦዲዮ እና የማያ ገፅ ላይ ጽሑፍ"</string>
+    <string name="accessibility_audio_and_onscreen_text_category_title" msgid="113841605896486212">"ኦዲዮ እና የማያ ገጽ ላይ ጽሑፍ"</string>
     <string name="accessibility_experimental_category_title" msgid="3401773834179170206">"የሙከራ"</string>
     <string name="accessibility_services_category_title" msgid="8813843874978910442">"አገልግሎቶች"</string>
     <string name="accessibility_service_settings" msgid="3251334786870932423">"የአገልግሎት ቅንብሮች"</string>
@@ -713,7 +687,7 @@
     <string name="captions_customoptions" msgid="7691004663572161126">"ብጁ አማራጮች"</string>
     <string name="captions_fontfamily" msgid="1026632786438880997">"የቅርጸ-ቁምፊ ቤተሰብ"</string>
     <string name="captions_textcolor" msgid="1566679779609140317">"የጽሁፍ ቀለም"</string>
-    <string name="captions_edgetype" msgid="4875636291904824401">"የጠርዝ ዓይነት"</string>
+    <string name="captions_edgetype" msgid="4875636291904824401">"የጠርዝ አይነት"</string>
     <string name="captions_edgecolor" msgid="2779925179084237336">"የጠርዝ ቀለም"</string>
     <string name="captions_backgroundshow" msgid="1080183686470477645">"በስተጀርባን አሳይ"</string>
     <string name="captions_backgroundcolor" msgid="2056944109914399253">"የጀርባ ቀለም"</string>
@@ -758,7 +732,7 @@
     <string name="system_monitoring" msgid="7997260748312620855">"መከታተል"</string>
     <string name="system_apps" msgid="8481888654606868074">"መተግበሪያዎች"</string>
     <string name="system_stay_awake" msgid="5935117574414511413">"ነቅተህ ቆይ"</string>
-    <string name="keep_screen_on_summary" msgid="4680661166009970792">"ማያ ገፅ በጭራሽ አያንቀላፋም"</string>
+    <string name="keep_screen_on_summary" msgid="4680661166009970792">"ማያ ገጽ በጭራሽ አያንቀላፋም"</string>
     <string name="system_hdcp_checking" msgid="3757586362130048838">"የHDCP ማረጋገጥ"</string>
     <string name="system_hdmi_optimization" msgid="4122753440620724144">"የHDMI ማመቻቸት"</string>
     <string name="system_reboot_confirm" msgid="7035370306447878560">"አሁን ድጋሚ ይጀመር?"</string>
@@ -803,7 +777,7 @@
     <string name="system_desc_show_hardware_layer" msgid="3483713991865249527">"የሃርድዌር ንብርብሮች ሲዘምኑ አረንጓዴ አብራ"</string>
     <string name="system_desc_show_gpu_overdraw" msgid="74019834911598588">"ከምርጡ ወደ መጥፎው፦ ሰማያዊ፣ አረንጓዴ፣ ፈዘዝ ያለ ቀይ፣ ቀይ"</string>
     <string name="system_desc_show_surface_updates" msgid="4018685547515133353">"የመስኮት ወለሎች ሲዘምኑ መላ መስኮቱን አብለጭልጭ"</string>
-    <string name="system_desc_strict_mode_enabled" msgid="1974896408481676324">"መተግበሪያዎች ረጅም ክንውኖች በዋናው ክር ላይ ሲያካሂዱ ማያ ገፅ ላይ አሳይ"</string>
+    <string name="system_desc_strict_mode_enabled" msgid="1974896408481676324">"መተግበሪያዎች ረጅም ክንውኖች በዋናው ክር ላይ ሲያካሂዱ ማያ ገጽ ላይ አሳይ"</string>
     <string name="system_desc_profile_gpu_rendering" msgid="1594070211030991">"ለማዘጋጀት የወሰደው ጊዜ በadb shell dumpsys gfxinfo ለካ"</string>
     <string name="security_unknown_sources_title" msgid="2012801664240314305">"ያልታወቁ ምንጮች"</string>
     <string name="security_unknown_sources_desc" msgid="7196715598352173267">"ከPlay መደብር ውጭ የሚመጡ መተግበሪያዎች እንዲጫኑ ፍቀድ"</string>
@@ -829,7 +803,7 @@
     <item msgid="1290233583371556415">"የእነማ ልኬት 10x"</item>
   </string-array>
     <string name="track_frame_time_off" msgid="8845064783618702239">"ጠፍቷል"</string>
-    <string name="track_frame_time_bars" msgid="5841531515222229632">"በማያ ገፅ ላይ እንደ አሞሌዎች"</string>
+    <string name="track_frame_time_bars" msgid="5841531515222229632">"በማያ ገጽ ላይ እንደ አሞሌዎች"</string>
     <string name="app_process_limit_standard" msgid="6069948528843313888">"መደበኛ ወሰን"</string>
     <string name="app_process_limit_zero" msgid="4094665021909774994">"ምንም የጀርባ ሂደቶች የሉም"</string>
     <string name="app_process_limit_one" msgid="4509089015775863726">"ቢበዛ 1 ሂደት"</string>
@@ -946,10 +920,10 @@
     <string name="settings_on" msgid="7734010120323404333">"በርቷል"</string>
     <string name="settings_off" msgid="4060451657850476369">"ጠፍቷል"</string>
     <string name="device_daydreams_none" msgid="3405655350757277348">"ማያ ገጽን አጥፋ"</string>
-    <string name="device_daydreams_select" msgid="7203264446482623438">"የማያ ገፅ ማቆያ"</string>
+    <string name="device_daydreams_select" msgid="7203264446482623438">"የማያ ገጽ ማቆያ"</string>
     <string name="device_daydreams_test" msgid="7828275397550076567">"አሁን ጀምር"</string>
     <string name="device_daydreams_sleep" msgid="6847770718407377357">"መቼ እንደሚጀመር"</string>
-    <string name="device_daydreams_sleep_description" msgid="6237610484915504587">"ማያ ገፅ ማቆያ ከዚህ እንቅስቃሴ-አልባ ጊዜ በኋላ ይጀመራል። ምንም ማያ ገፅ ማቆያ ካልተመረጠ ማሳያው ይጠፋል።"</string>
+    <string name="device_daydreams_sleep_description" msgid="6237610484915504587">"ማያ ገጽ ማቆያ ከዚህ እንቅስቃሴ-አልባ ጊዜ በኋላ ይጀመራል። ምንም ማያ ገጽ ማቆያ ካልተመረጠ ማሳያው ይጠፋል።"</string>
     <string name="device_daydreams_sleep_summary" msgid="3081688734381995693">"ከ<xliff:g id="SLEEP_DESCRIPTION">%1$s</xliff:g> እንቅስቃሴ-አልባነት በኋላ"</string>
     <string name="device_energy_saver_screen_off" msgid="6908468996426629480">"ማሳያን አጥፋ"</string>
     <!-- no translation found for device_energy_saver_timeout_description (3206609135199137514) -->
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"በማየት ላይ ሳሉ ማሳያው እንዳይጠፋ ለመከላከል እባክዎ ያረጋግጡ፣ ይህ የበለጠ የኃይል ፍጆታ ሊኖረው ይችላል።"</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"ንቁ በማይሆንበት ጊዜ"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"በሚመለከቱበት ጊዜ"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"በራስ-ሰር አጥፋ"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"በሚቦዝንበት ጊዜ በራስ-ሰር አጥፋ"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"በሚመለከቱበት ጊዜ በራስ-ሰር አጥፋ"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"ቲቪን በራስ-ሰር አጥፋ"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"እንቅስቃሴ-አልባ ሲሆን ቲቪን በራስ-ሰር አጥፋ"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"በምልከታ ጊዜ ቲቪን በራስ-ሰር አጥፋ"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"«ገቢር ባልሆነ ጊዜ ላይ» ያለው የሰዓት ቆጣሪ «በመመልከት ጊዜ ላይ» ካለው የሰዓት ቆጣሪ ያነሰ መሆን አለበት"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"«በመመልከት ጊዜ ላይ» ያለው የሰዓት ቆጣሪ ከ«ገቢር ባልሆነ ጊዜ ላይ» ካለው የሰዓት ቆጣሪ በላይ መሆን አለበት"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"የአውታረ መረብ ግንኙነትን በተጠባባቂነት ፍቀድ"</string>
@@ -1074,7 +1048,7 @@
     <string name="disabled_by_policy_title_outgoing_calls" msgid="8642280178608881544">"መደወል አልተፈቀደም"</string>
     <string name="disabled_by_policy_title_sms" msgid="5721045390560951358">"ኤስኤምኤስ አልተፈቀደም"</string>
     <string name="disabled_by_policy_title_camera" msgid="6576557964422257426">"ካሜራ አልተፈቀደም"</string>
-    <string name="disabled_by_policy_title_screen_capture" msgid="5774035841010091253">"ቅጽበታዊ ገፅ እይታ አልተፈቀደም"</string>
+    <string name="disabled_by_policy_title_screen_capture" msgid="5774035841010091253">"ቅጽበታዊ ገጽ እይታ አልተፈቀደም"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="6500185610058872758">"ይህን መተግበሪያ መክፈት አልተቻለም"</string>
     <string name="default_admin_support_msg" msgid="7913455019068370350">"ጥያቄዎች ካለዎት የእርስዎን የአይቲ አስተዳዳሪ ያነጋግሩ"</string>
     <string name="admin_support_more_info" msgid="9053232166115098434">"ተጨማሪ ዝርዝሮች"</string>
@@ -1110,17 +1084,12 @@
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"ሰርጦች፣ ውጫዊ ግብዓቶች"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"ሰርጦች"</string>
     <string name="external_inputs_settings_title" msgid="8937038060355986380">"ውጫዊ ግቤቶች"</string>
-    <string name="display_and_sound_vendor_summary" msgid="7661072343315403110">"ሥዕል፣ ማያ ገፅ፣ ድምፅ"</string>
+    <string name="display_and_sound_vendor_summary" msgid="7661072343315403110">"ሥዕል፣ ማያ ገጽ፣ ድምፅ"</string>
     <string name="picture_settings_title" msgid="7643193630924322697">"ሥዕል"</string>
-    <string name="screen_settings_title" msgid="7806908869190824434">"ማያ ገፅ"</string>
+    <string name="screen_settings_title" msgid="7806908869190824434">"ማያ ገጽ"</string>
     <string name="sound_settings_title" msgid="9149367966117889465">"ድምፅ"</string>
     <string name="power_and_energy" msgid="4638182439670702556">"ኃይል እና ጉልበት"</string>
     <string name="power_on_behavior" msgid="927607372303160716">"የኃይል ማብራት ባህሪ"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"ዳግም አስጀምር"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"የኤተርኔት ማጣመሪያ ኮድ"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"የኃይል ሁነታዎች"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"ቲቪው ጥቅም ላይ በማይሆንበት ጊዜ የኃይል ውጤታማነትን ያሻሽሉ"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"ይህን ያነቃል፦"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ይህ ሁነታ የመሣሪያው ኃይል አጠቃቀምን ሊጨምር እንደሚችል ያስታውሱ።"</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"«<xliff:g id="ENERGYMODENAME">%s</xliff:g>» ይንቃ"</string>
 </resources>
diff --git a/Settings/res/values-ar/energy-modes.xml b/Settings/res/values-ar/energy-modes.xml
deleted file mode 100644
index dc03631bb..000000000
--- a/Settings/res/values-ar/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"الميزات الأساسية للشبكة"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"الاستخدام المنخفض للطاقة"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"إيقاف الاتصال بالشبكة عندما يكون التلفزيون غير مستخدَم"</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"التحديثات والوظائف المهمة"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"الميزات المقترَحة للشبكة"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"الاستخدام المحسَّن للطاقة"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"تفعيل الميزات التي تعمل على تنشيط التلفزيون من خلال الشبكة (وضع الاستعداد المتصل بالشبكة)"</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"الميزات الإضافية للشبكة"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"الاستخدام العالي للطاقة"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"بالإضافة إلى الميزات المقترَحة، يفعِّل هذا الخيار الميزات الإضافية عندما يكون التلفزيون غير مستخدَم، مما قد يؤدي إلى زيادة استهلاك الطاقة."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-ar/strings.xml b/Settings/res/values-ar/strings.xml
index 8ed6519f7..df5944872 100644
--- a/Settings/res/values-ar/strings.xml
+++ b/Settings/res/values-ar/strings.xml
@@ -41,7 +41,7 @@
     <string name="hotwording_summary" msgid="2170375928302175449">"التواصل مع \"مساعد Google\" في أي وقت"</string>
     <string name="header_category_device" msgid="3023893663454705969">"الجهاز"</string>
     <string name="header_category_preferences" msgid="3738388885555798797">"الإعدادات المفضّلة"</string>
-    <string name="header_category_accessories" msgid="6479803330480847199">"جهاز التحكم عن بُعد والملحقات"</string>
+    <string name="header_category_accessories" msgid="6479803330480847199">"وحدة التحكم عن بُعد والأجهزة الملحقة"</string>
     <string name="header_category_personal" msgid="7880053929985150368">"شخصي"</string>
     <string name="connect_to_network" msgid="4133686359319492392">"الاتصال بالشبكة"</string>
     <string name="add_an_account" msgid="2601275122685226096">"إضافة حساب"</string>
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"الاحتفاظ بنسخة احتياطية والاستعادة"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"إعادة الضبط على الإعدادات الأصلية"</string>
     <string name="device_calibration" msgid="2907914144048739705">"المعايرة"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"موقّت الإيقاف"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"ضبط الموقّتات لإيقاف التلفزيون وتوفير الطاقة"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"التشغيل والطاقة"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"إعدادات وضع درجات الحرارة الاقتصادية"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"الأجهزة"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"اختيار الصيغ"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"إعدادات الصوت المتقدمة"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"السماح بوضع الألعاب"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"مطابقة النطاق الديناميكي للمحتوى"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"عند تفعيل هذا الخيار، سينتقل النظام بين تنسيقات النطاق الديناميكي المختلفة لمطابقة المحتوى. قد يتسبب هذا في ظهور شاشة سوداء أثناء تبديل التنسيق.\n\nانقر على \"إعدادات العرض المتقدمة\" لمزيد من خيارات النطاق الديناميكي."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"النطاق الديناميكي المفضّل"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"التحويل إلى النطاق الديناميكي الذي يفضّله النظام"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"يسمح هذا الخيار للنظام بإدارة تنسيق التحويل."</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"عند تحديد هذا الخيار، سيحدِّد النظام النطاق الديناميكي المناسب لإرساله إلى شاشتك وسيتم تحويل المحتوى إلى هذا النطاق الديناميكي حسب الحاجة."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"تتم مطابقة تنسيق المحتوى دائمًا."</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"فرض التحويل"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"يعمل هذا الخيار على فرض التحويل إلى التنسيق الذي تفضّله."</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"يتم فرض التحويل إلى التنسيق الذي تفضّله. قد يؤثّر فرض التحويل في الإعدادات الأخرى في \"وضع العرض\" أو \"تنسيق النطاق العالي الديناميكية\"."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"التحويل إلى النطاق العادي الديناميكية (SDR) دومًا"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"التحويل إلى \"<xliff:g id="HDR_TYPE">%s</xliff:g>\" دومًا"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"هل تريد فرض تشغيل إخراج النطاق العالي الديناميكية (HDR)؟"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"سيتم فرض التحويل تلقائيًا إلى \"<xliff:g id="HDR_TYPE">%s</xliff:g>\"."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"سيتم تشغيل شاشتك بدقة 1080p و60 هرتز. لا يتوافق هذا الخيار مع شاشتك عند تشغيلها بدقة 4K و60 هرتز."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"لا يُسمح باستخدام تقنية Dolby Vision مع درجة الدقة الحالية. في حال تفعيل Dolby Vision يدويًا، سيتم تغيير درجة دقة الشاشة إلى 1080p و60 هرتز."</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"هل تريد تغيير درجة الدقة إلى 1080p و60 هرتز؟"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"فرض التحويل إلى تقنية Dolby Vision دائمًا"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"إذا كانت تقنية Dolby Vision غير مفعَّلة في تنسيقات النطاق العالي الديناميكية (HDR) ضمن \"إعدادات العرض المتقدّمة\"، سيؤدي فرض التحويل إلى تقنية Dolby Vision إلى إعادة تفعيلها."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"فرض التحويل إلى تقنية HDR10 دائمًا"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"إذا كانت تقنية HDR10 غير مفعَّلة في تنسيقات النطاق العالي الديناميكية (HDR) ضمن \"إعدادات العرض المتقدّمة\"، سيؤدي فرض التحويل إلى تقنية HDR10 إلى إعادة تفعيلها."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"فرض التحويل إلى تقنية HLG دائمًا"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"إذا كانت تقنية HLG غير مفعَّلة في تنسيقات النطاق العالي الديناميكية (HDR) ضمن \"إعدادات العرض المتقدّمة\"، سيؤدي فرض التحويل إلى تقنية HLG إلى إعادة تفعيلها."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"فرض التحويل إلى تقنية HDR10+‎ دائمًا"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"إذا كانت تقنية HDR10+‎ غير مفعَّلة في تنسيقات النطاق العالي الديناميكية (HDR) ضمن \"إعدادات العرض المتقدّمة\"، سيؤدي فرض التحويل إلى تقنية HDR10+‎ إلى إعادة تفعيلها."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"فرض التحويل إلى النطاق العادي الديناميكية (SDR) دائمًا"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"سيؤدي فرض التحويل إلى النطاق العادي الديناميكية (SDR) إلى إيقاف جميع تنسيقات النطاق العالي الديناميكية (HDR) ضمن \"إعدادات العرض المتقدّمة\"."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"مطابقة عدد اللقطات في الثانية للمحتوى"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"الانتقال السلس فقط"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"انتقال سلس"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"بناءً على طلب التطبيق وشريطة توفّر إمكانية الانتقال السلس في التلفزيون الخاص بك، ستتطابق مخرجات جهازك مع العدد الأصلي للقطات في الثانية الذي يظهر به ما تشاهده من محتوى."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"لا تتيح الشاشة المتصلة الانتقالات السلِسة لمعدّل التحديث. لن يكون لهذا الخيار أي تأثير إلا في حال استخدام شاشة متوافقة معه."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"دائمًا"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"انتقال غير سلس"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"ستتطابق مخرجات جهازك مع العدد الأصلي للقطات في الثانية الذي يظهر به ما تشاهده من محتوى إذا طلب التطبيق ذلك. وقد يؤدي ذلك إلى ظهور شاشة فارغة لفترة قصيرة عند الدخول إلى وضع تشغيل فيديو أو الخروج منه."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"أبدًا"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"لن تتطابق مخرجات جهازك أبدًا مع العدد الأصلي للقطات في الثانية الذي يظهر به ما تشاهده من محتوى حتى إذا طلب التطبيق ذلك."</string>
@@ -214,15 +187,15 @@
     <string name="hdr_enabled_format_info_clicked" msgid="1466675962665861040">"لإيقاف صيغة، غيِّر إعدادات اختيار الصيغ إلى \"يدوي\"."</string>
     <string name="resolution_selection_title" msgid="2873993320284587853">"درجة الدقة"</string>
     <string name="resolution_selection_auto_title" msgid="4738671207331027385">"تلقائي"</string>
-    <string name="resolution_selection_dialog_title" msgid="4029798035133645272">"تم تغيير درجة الدقة"</string>
+    <string name="resolution_selection_dialog_title" msgid="4029798035133645272">"تم تغيير درجة الدقة."</string>
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"هل تريد تغيير درجة الدقة إلى ‏%1$s؟"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"اختَر \"حسنًا\" لاستخدام %1$s من الآن فصاعدًا."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"تقنية Dolby Vision غير متاحة في ‏%1$s وسيتم إيقافها في \"إعدادات العرض المتقدّمة\"."</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"يتوافق هذا الوضع مع: %1$s\nفي بعض أجهزة التلفزيون، قد تحتاج إلى تفعيل خيار \"منفذ HDMI المحسَّن\" لتفعيل المزيد من صيغ النطاق العالي الديناميكية (HDR). يُرجى الانتقال إلى إعدادات التلفزيون لمعرفة ما إذا كان هذا الخيار متاحًا."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"يتوافق هذا الوضع مع ‏%1$s. في بعض أجهزة التلفزيون، قد تحتاج إلى تفعيل خيار \"منفذ HDMI المحسَّن\" لتفعيل المزيد من صيغ النطاق العالي الديناميكية (HDR). يُرجى الانتقال إلى إعدادات التلفزيون لمعرفة ما إذا كان هذا الخيار متاحًا."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"إلغاء"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"حسنًا"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"هرتز"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> هرتز)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> هرتز)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"هل تريد محو البيانات المؤقتة؟"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"يؤدي ذلك إلى محو البيانات المؤقتة لكل التطبيقات."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"تتولى مؤسستك إدارة هذا الجهاز."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"تتم إدارة هذا الجهاز بواسطة <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">"،"</string>
+    <string name="space_separator" msgid="4169645647388594972">" U+2060"</string>
     <string name="learn_more" msgid="820336467414665686">"مزيد من المعلومات"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{تطبيق الكاميرا}zero{تطبيقات الكاميرا}two{تطبيقا الكاميرا}few{تطبيقات الكاميرا}many{تطبيقات الكاميرا}other{تطبيقات الكاميرا}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"تطبيق التقويم"</string>
@@ -696,7 +670,7 @@
     <string name="palette_color_purple" msgid="2123828754639683555">"بنفسجي"</string>
     <string name="palette_color_gray" msgid="4014534773994261194">"رمادي"</string>
     <string name="accessibility_shortcut" msgid="5856158637840030531">"اختصار \"سهولة الاستخدام\""</string>
-    <string name="accessibility_shortcut_enable" msgid="6603542432267329986">"تفعيل اختصار تسهيل الاستخدام"</string>
+    <string name="accessibility_shortcut_enable" msgid="6603542432267329986">"تفعيل اختصار \"سهولة الاستخدام\""</string>
     <string name="accessibility_shortcut_service" msgid="2053250146891420311">"خدمة الاختصار"</string>
     <string name="accessibility_shortcut_description" msgid="2050424178481510046">"عند تفعيل الاختصار، سيؤدّي الضغط على زر الرجوع وزر الاتجاه للأسفل معًا لمدة 3 ثوانٍ إلى بدء ميزة من ميزات \"سهولة الاستخدام\"."</string>
     <string name="accessibility_captions" msgid="3411554568812306549">"الترجمة والشرح"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"يُرجى التأكُّد من منع إيقاف العرض أثناء المشاهدة، الأمر الذي قد يؤدي إلى احتمال استهلاك المزيد من الطاقة."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"في حال عدم النشاط"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"أثناء المشاهدة"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"الإيقاف تلقائيًا"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"الإيقاف تلقائيًا في حال عدم النشاط"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"الإيقاف تلقائيًا أثناء مشاهدة المحتوى"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"إيقاف التلفزيون تلقائيًا"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"إيقاف التلفزيون تلقائيًا في حال عدم نشاطه"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"إيقاف التلفزيون تلقائيًا أثناء المشاهدة"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"يجب أن تكون مدّة موقّت \"في حال عدم النشاط\" أقصر من موقّت \"أثناء المشاهدة\"."</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"يجب أن تكون مدّة موقّت \"أثناء المشاهدة\" أطول من موقّت \"في حال عدم النشاط\"."</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"تقييد الاتصال بالشبكة في وضع الاستعداد"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"سلوك التلفزيون عندما يكون قيد التشغيل"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"إعادة الضبط"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"رمز إقران شبكة إيثرنت"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"أوضاع استهلاك الطاقة"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"تحسين استهلاك الطاقة عندما يكون التلفزيون غير مستخدَم"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"يفعِّل هذا الوضع الميزات التالية:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ملاحظة: قد يؤدي استخدام هذا الوضع إلى زيادة استهلاك طاقة الجهاز."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"تفعيل وضع \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/Settings/res/values-as/energy-modes.xml b/Settings/res/values-as/energy-modes.xml
deleted file mode 100644
index b418063c8..000000000
--- a/Settings/res/values-as/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"অত্যাৱশ্যকীয় নেটৱৰ্ক সুবিধাসমূহ"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"কম শক্তিৰ ব্যৱহাৰ"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"টিভি ব্যৱহাৰ নকৰা সময়ত নেটৱৰ্ক সংযোগ অফ কৰক।"</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"গুৰুত্বপূৰ্ণ আপডে’ট আৰু ফাংশ্বনসমূহ"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"চুপাৰিছ কৰা নেটৱৰ্ক সুবিধাসমূহ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"শক্তিৰ ব্যৱহাৰ অপ্টিমাইজ কৰা হৈছে"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"নেটৱৰ্ক (ষ্টেণ্ডবাই ম’ডত ৰখা নেটৱৰ্ক)ৰ জৰিয়তে টিভি সক্ৰিয় কৰা সুবিধাসমূহ অন কৰক।"</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"অতিৰিক্ত নেটৱৰ্ক সুবিধাসমূহ"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"শক্তিৰ ব্যৱহাৰ বৃদ্ধি হৈছে"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"চুপাৰিছ কৰা সুবিধা সমূহৰ উপৰিও, এই বিকল্পটোৱে টিভি ব্যৱহাৰ নকৰা সময়তো অতিৰিক্ত সুবিধাসমূহ অন কৰে যাৰ ফলত শক্তিৰ ব্যৱহাৰ বৃদ্ধি হ’ব পাৰে।"</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-as/strings.xml b/Settings/res/values-as/strings.xml
index 4abc60a90..94a54ad0d 100644
--- a/Settings/res/values-as/strings.xml
+++ b/Settings/res/values-as/strings.xml
@@ -51,7 +51,7 @@
     <string name="accounts_slice_summary" msgid="1571012157154521119">"মিডিয়া সেৱা, Assistant, Payments"</string>
     <string name="connectivity_network_category_title" msgid="8226264889892008114">"নেটৱৰ্ক আৰু ইণ্টাৰনেট"</string>
     <string name="sound_category_title" msgid="7899816751041939518">"ধ্বনি"</string>
-    <string name="applications_category_title" msgid="7112019490898586223">"এপ্‌সমূহ"</string>
+    <string name="applications_category_title" msgid="7112019490898586223">"এপসমূহ"</string>
     <string name="device_pref_category_title" msgid="8292572846154873762">"ডিভাইচৰ অগ্ৰাধিকাৰ"</string>
     <string name="accessibility_category_title" msgid="1552664829936369592">"সাধ্য সুবিধা"</string>
     <string name="remotes_and_accessories_category_title" msgid="4795119810430255047">"ৰিম’ট আৰু সহায়ক সঁজুলিসমূহ"</string>
@@ -66,7 +66,7 @@
     <string name="privacy_category_summary" msgid="3534434883380511043">"অৱস্থান, ব্যৱহাৰ আৰু ডায়েগন’ষ্টিক্স, বিজ্ঞাপন"</string>
     <string name="add_account" msgid="7386223854837017129">"একাউণ্ট যোগ কৰক"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"একাউণ্ট আঁতৰাওক"</string>
-    <string name="account_sync" msgid="4315295293211313989">"ছিংক কৰা এপ্‌বোৰ বাছনি কৰক"</string>
+    <string name="account_sync" msgid="4315295293211313989">"ছিংক কৰা এপবোৰ বাছনি কৰক"</string>
     <string name="sync_now" msgid="4335217984374620551">"এতিয়া ছিংক কৰক"</string>
     <string name="sync_in_progress" msgid="8081367667406185785">"ছিংক কৰি থকা হৈছে…"</string>
     <string name="last_synced" msgid="8371967816955123864">"অন্তিমবাৰ ছিংক কৰা সময় <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -90,16 +90,16 @@
     <string name="wifi_setting_enable_wifi" msgid="5276730445393952969">"ৱাই-ফাই"</string>
     <string name="connectivity_hint_message" msgid="5638304246522516583">"নেটৱৰ্কৰ লগত সংযোগ কৰক"</string>
     <string name="connectivity_network_diagnostics" msgid="4396132865849151854">"নেটৱর্কৰ ডায়েগনষ্টিক্স"</string>
-    <string name="apps_recently_used_category_title" msgid="7877660412428813933">"অলপতে খোলা এপ্‌সমূহ"</string>
+    <string name="apps_recently_used_category_title" msgid="7877660412428813933">"অলপতে খোলা এপসমূহ"</string>
     <string name="apps_see_all_apps" msgid="2002886135933443688">"সকলো এপ্ চাওক"</string>
     <string name="apps_permissions_category_title" msgid="8099660060701465267">"অনুমতিসমূহ"</string>
     <string name="overlay_security_slice_title" msgid="4895032817538300187"></string>
     <string name="update_slice_title" msgid="6553763903108611747"></string>
     <string name="all_apps_title" msgid="3717294436135280133">"সকলো এপ্"</string>
-    <string name="all_apps_show_system_apps" msgid="1260688031005374302">"ছিষ্টেম এপ্‌সমূহ দেখুৱাওক"</string>
-    <string name="all_apps_installed" msgid="8217778476185598971">"ইনষ্টল কৰা এপ্‌সমূহ"</string>
-    <string name="all_apps_other" msgid="4420174882983813158">"ছিষ্টেম এপ্‌সমূহ"</string>
-    <string name="all_apps_disabled" msgid="2776041242863791053">"নিষ্ক্ৰিয় কৰি ৰখা এপ্‌সমূহ"</string>
+    <string name="all_apps_show_system_apps" msgid="1260688031005374302">"ছিষ্টেম এপসমূহ দেখুৱাওক"</string>
+    <string name="all_apps_installed" msgid="8217778476185598971">"ইনষ্টল কৰা এপসমূহ"</string>
+    <string name="all_apps_other" msgid="4420174882983813158">"ছিষ্টেম এপসমূহ"</string>
+    <string name="all_apps_disabled" msgid="2776041242863791053">"নিষ্ক্ৰিয় কৰি ৰখা এপসমূহ"</string>
     <string name="device_daydream" msgid="2631191946958113220">"স্ক্ৰীন ছেভাৰ"</string>
     <string name="device_display" msgid="244634591698925025">"ডিছপ্লে’"</string>
     <string name="device_display_sound" msgid="7399153506435649193">"ডিছপ্লে’ আৰু ধ্বনি"</string>
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"বেকআপ আৰু পুনঃস্থাপন"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"ফেক্টৰী ডেটা ৰিছেট"</string>
     <string name="device_calibration" msgid="2907914144048739705">"ক্ৰমাংকণ"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"অফ হোৱাৰ টাইমাৰ"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"টিভি অফ কৰিবলৈ আৰু শক্তি ৰাহি কৰিবলৈ টাইমাৰ ছেট কৰক"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"ক্ষমতা আৰু শক্তি"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"ইক’ৰ ছেটিং"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"ডিভাইচ"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"ফৰমেটসমূহ বাছনি কৰক"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"উন্নত ধ্বনি ছেটিংসমূহ"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"গে’ম ম’ডৰ অনুমতি দিয়ক"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"সমলৰ গতিশীল পৰিসৰ মিলাওক"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"এই বিকল্পটো সক্ষম কৰি থকাৰ সময়ত, সমলটো মিলাবলৈ ছিষ্টেমটো ভিন্ন গতিশীল পৰিসৰৰ ফৰ্মেটৰ মাজত সালসলনি হ’ব। ফৰ্মেট সলনি হৈ থকাৰ সময়ত এখন ক’লা স্ক্ৰীন ওলাব পাৰে।\n\nগতিশীল পৰিসৰৰ অধিক বিকল্প পাবলৈ উচ্চখাপৰ ডিছপ্লে’ৰ ছেটিঙত ক্লিক কৰক।"</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"অগ্ৰাধিকাৰপ্ৰাপ্ত গতিশীল পৰিসৰ"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"ছিষ্টেমে অগ্ৰাধিকাৰ দিয়া ৰূপান্তৰণ"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"ছিষ্টেমক ফৰ্মেটৰ ৰূপান্তৰণ পৰিচালনা কৰিবলৈ দিয়ে"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"যেতিয়া এই বিকল্পটো বাছনি কৰা হয়, তেতিয়া ছিষ্টেমে আপোনাৰ ডিছপ্লে’লৈ পঠিয়াবলৈ এটা উপযুক্ত গতিশীল পৰিসৰ নিৰ্ধাৰণ কৰিব আৰু প্ৰয়োজন অনুসৰি এই গতিশীল পৰিসৰলৈ সমল ৰূপান্তৰ কৰিব।"</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"সদায় সমলৰ ফৰ্মেটৰ সৈতে মিল খায়"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"বলপূৰ্বক ৰূপান্তৰণ"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"বলপূৰ্বকভাৱে অগ্ৰাধিকাৰপ্ৰাপ্ত ফৰ্মেটলৈ ৰূপান্তৰ কৰে"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"বলপূৰ্বকভাৱে অগ্ৰাধিকাৰপ্ৰাপ্ত ফৰ্মেটলৈ ৰূপান্তৰ কৰক। বলপূৰ্বকভাৱে ৰূপান্তৰ কৰিলে ডিছপ্লে’ ম’ড অথবা HDR ফৰ্মেটত আন ছেটিং প্ৰভাৱিত হ’ব পাৰে।"</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"সদায় SDRলৈ"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"সদায় <xliff:g id="HDR_TYPE">%s</xliff:g>লৈ"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"আপুনি HDR আউটপুট বলবৎ কৰিব বিচাৰেনে?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"ডিফ’ল্ট হিচাপে <xliff:g id="HDR_TYPE">%s</xliff:g>লৈ বলপূৰ্বকভাৱে ৰূপান্তৰণ কৰা হ’ব।"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"আপোনাৰ ডিছপ্লে’ ১০৮০পি ৬০হাৰ্টজ ৰিজ’লিউশ্বনত চলিব। ৪কে ৬০হাৰ্টজ ৰিজ’লিউশ্বনত চলি থাকোঁতে এই বিকল্পটো আপোনাৰ ডিছপ্লে’ৰ সৈতে সমিল নহয়।"</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"বৰ্তমানৰ ৰিজ’লিউশ্বনত Dolby Vision সমৰ্থিত নহয়। যদি আপুনি মেনুৱেলী Dolby Vision সক্ষম কৰে, তেন্তে আপোনৰ ডিছপ্লে’ৰ ৰিজ’লিউশ্বন ১০৮০ পিক্সেল ৬০ হাৰ্টজলৈ সলনি হ’ব"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"ৰিজ’লিউশ্বন ১০৮০ পিক্সেল ৬০ হাৰ্টজলৈ সলনি কৰিবনে?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"সদায় বলপূৰ্বকভাৱে ড’ল্‌বী ভিজনলৈ ৰূপান্তৰ কৰক"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"যদি উচ্চখাপৰ ডিছপ্লে’ৰ ছেটিঙত HDR ফৰ্মেটসমূহত ড’ল্‌বী ভিজন অক্ষম কৰা হয়, তেন্তে বলপূৰ্বকভাৱে ড’ল্‌বী ভিজনলৈ ৰূপান্তৰ কৰাটোৱে এইটো পুনৰ সক্ষম কৰিব।"</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"সদায় বলপূৰ্বকভাৱে HDR10লৈ ৰূপান্তৰ কৰক"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"যদি উচ্চখাপৰ ডিছপ্লে’ৰ ছেটিঙত HDR ফৰ্মেটসমূহত HDR10 অক্ষম কৰা হয়, তেন্তে বলপূৰ্বকভাৱে HDR10লৈ ৰূপান্তৰ কৰাটোৱে এইটো পুনৰ সক্ষম কৰিব।"</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"সদায় বলপূৰ্বকভাৱে HLGলৈ ৰূপান্তৰ কৰক"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"যদি উচ্চখাপৰ ডিছপ্লে’ৰ ছেটিঙত HDR ফৰ্মেটসমূহত HLG অক্ষম কৰা হয়, তেন্তে বলপূৰ্বকভাৱে HLGলৈ ৰূপান্তৰ কৰাটোৱে এইটো পুনৰ সক্ষম কৰিব।"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"সদায় বলপূৰ্বকভাৱে HDR10+লৈ ৰূপান্তৰ কৰক"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"যদি উচ্চখাপৰ ডিছপ্লে’ৰ ছেটিঙত HDR ফৰ্মেটসমূহত HDR10+ অক্ষম কৰা হয়, তেন্তে বলপূৰ্বকভাৱে HDR10+লৈ ৰূপান্তৰ কৰাটোৱে এইটো পুনৰ সক্ষম কৰিব।"</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"সদায় বলপূৰ্বকভাৱে SDRলৈ ৰূপান্তৰ কৰক"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"বলপূৰ্বকভাৱে SDRলৈ ৰূপান্তৰ কৰাটোৱে উচ্চখাপৰ ডিছপ্লে’ৰ ছেটিঙত HDR ফৰ্মেটসমূহত আটাইবোৰ ফৰ্মেট অক্ষম কৰিব।"</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"সমলৰ ফ্ৰে\'মৰ হাৰ মিলাওক"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"কেৱল বাধাহীন"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"বাধাহীন"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"এপ্‌টোৱে ইয়াৰ বাবে অনুৰোধ কৰিলে, আপোনাৰ ডিভাইচটোৱে আপুনি চাই থকা সমলৰ মূল ফ্ৰে’মৰ হাৰৰ সৈতে ইয়াৰ আউটপুট মিলাব, এনে তেতিয়াহে হ’ব যেতিয়া আপোনাৰ টিভিটোৱে এটা বাধাহীন পৰিৱৰ্তন সম্পাদন কৰিব পাৰিব।"</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"আপোনাৰ সংযুক্ত ডিছপ্লে’খনে বাধাহীন ৰিফ্ৰে’শ্বৰ হাৰৰ ট্ৰানজিশ্বনসমূহ সমৰ্থন নকৰে। আপুনি এইটো সমৰ্থন কৰা এখন ডিছপ্লে’লৈ সলনি নকৰালৈকে এই বিকল্পটোৰ কোনো প্ৰভাৱ নাথাকিব।"</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"সদায়"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"বাধাহীন নহয়"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"এপ্‌টোৱে ইয়াৰ বাবে অনুৰোধ কৰিলে, আপোনাৰ ডিভাইচটোৱে আপুনি চাই থকা সমলৰ মূল ফ্ৰে’মৰ হাৰৰ সৈতে ইয়াৰ আউটপুট মিলাব। ইয়াৰ ফলত এটা ভিডিঅ’ প্লে’বেক আৰম্ভ কৰোঁতে অথবা তাৰপৰা বাহিৰ হওঁতে এক ছেকেণ্ডৰ বাবে আপোনাৰ স্ক্ৰীনখনত একো নোহোৱা হৈ পৰিব পাৰে।"</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"কেতিয়াও নহয়"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"এপ্‌টোৱে ইয়াৰ বাবে অনুৰোধ কৰিলেও আপোনাৰ ডিভাইচটোৱে কেতিয়াও আপুনি চাই থকা সমলৰ মূল ফ্ৰে’মৰ হাৰৰ সৈতে ইয়াৰ আউটপুট মিলাবলৈ চেষ্টা নকৰে।"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"ৰিজ’লিউশ্বন %1$sলৈ সলনি কৰিবনে?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"এতিয়াৰ পৰা %1$s ব্যৱহাৰ কৰিবলৈ ঠিক আছে বাছনি কৰক।"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$sত Dolby Vision সমৰ্থিত নহয় আৰু সেইটো \"উচ্চখাপৰ ডিছপ্লে’ৰ ছেটিঙ\"ত অক্ষম কৰা হ’ব"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"এই ম\'ডটোৱে সমর্থন কৰে:%1$s\nআপুনি কিছুমান টিভিত অধিক HDR ফৰ্মেট সক্ষম কৰিবলৈ উন্নত HDMI অন কৰিব লগা হ’ব পাৰে। এইটো সমৰ্থিত হয়নে নহয় চাবলৈ আপোনাৰ টিভিৰ ছেটিং পৰীক্ষা কৰক।"</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"এই ম’ডটোৱে %1$s সমৰ্থন কৰে। আপুনি কিছুমান টিভিত অধিক HDR ফৰ্মেট সক্ষম কৰিবলৈ উন্নত HDMI অন কৰিব লগা হ’ব পাৰে। এইটো সমৰ্থিত হয়নে নহয় চাবলৈ আপোনাৰ টিভিৰ ছেটিং পৰীক্ষা কৰক।"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"বাতিল কৰক"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ঠিক আছে"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"হাৰ্টজ"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> হাৰ্টজ)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> হাৰ্টজ)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"কেশ্ব কৰা ডেটা মচিবনে?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"এই কাৰ্যই সকলো এপৰ কেশ্ব ডেটা পৰিষ্কাৰ কৰিব।"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -300,7 +273,7 @@
     <string name="no_device_admins" msgid="4628974717150185625">"কোনো ডিভাইচ প্ৰশাসকৰ এপ্ উপলব্ধ নাই"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="7678529948487939871">"প্ৰশাসকৰ দ্বাৰা অক্ষম কৰা হৈছে"</string>
     <string name="disabled_by_administrator_summary" msgid="3420979957115426764">"উপলব্ধ নহয়"</string>
-    <string name="manage_device_admin" msgid="5714217234035017983">"ডিভাইচৰ প্ৰশাসকৰ এপ্‌সমূহ"</string>
+    <string name="manage_device_admin" msgid="5714217234035017983">"ডিভাইচৰ প্ৰশাসকৰ এপসমূহ"</string>
     <string name="number_of_device_admins_none" msgid="2734299122299837459">"কোনো সক্ৰিয় এপ্ নাই"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="108190334043671416">"প্ৰশাসক, এনক্ৰিপশ্বন নীতি বা ক্ৰেডেনশ্বিয়েল ষ্ট’ৰেজৰ দ্বাৰা অক্ষম কৰা হৈছে"</string>
     <string name="enterprise_privacy_settings" msgid="8226765895133003202">"পৰিচালিত ডিভাইচৰ তথ্য"</string>
@@ -323,7 +296,7 @@
     <string name="enterprise_privacy_location_access" msgid="8978502415647245748">"অৱস্থানৰ অনুমতিসমূহ"</string>
     <string name="enterprise_privacy_microphone_access" msgid="3746238027890585248">"মাইক্ৰ\'ফোনত অনুমতি"</string>
     <string name="enterprise_privacy_camera_access" msgid="6258493631976121930">"কেমেৰাৰ অনুমতিসমূহ"</string>
-    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="5538330175901952288">"ডিফ\'ল্ট এপ্‌সমূহ"</string>
+    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="5538330175901952288">"ডিফ\'ল্ট এপসমূহ"</string>
     <string name="enterprise_privacy_number_packages" msgid="6256222390430349008">"{count,plural, =1{# টা এপ্}one{# টা এপ্}other{# টা এপ্}}"</string>
     <string name="enterprise_privacy_input_method" msgid="5814752394251833058">"ডিফ\'ল্ট কীব\'ৰ্ড"</string>
     <string name="enterprise_privacy_input_method_name" msgid="1088874503312671318">"<xliff:g id="APP_LABEL">%s</xliff:g>লৈ ছেট কৰা হৈছে"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"এই ডিভাইচটো আপোনাৰ প্ৰতিষ্ঠানৰ দ্বাৰা পৰিচালিত৷"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"এই ডিভাইচটো <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>ৰ দ্বাৰা পৰিচালিত।"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"অধিক জানক"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{কেমেৰা এপ্}one{কেমেৰা এপ্}other{কেমেৰা এপ্}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"কেলণ্ডাৰ এপ্"</string>
@@ -524,7 +498,7 @@
     <string name="storage_available" msgid="8860901789290434209">"উপলব্ধ"</string>
     <string name="storage_size" msgid="5517261387579171381">"মূঠ ঠাই: <xliff:g id="TOTAL_SPACE">%1$s</xliff:g>"</string>
     <string name="storage_calculating_size" msgid="5716281278843281044">"গণনা কৰি থকা হৈছে…"</string>
-    <string name="storage_apps_usage" msgid="8659915575274468924">"এপ্‌সমূহ"</string>
+    <string name="storage_apps_usage" msgid="8659915575274468924">"এপসমূহ"</string>
     <string name="storage_downloads_usage" msgid="8429196848359517158">"ডাউনল\'ডসমূহ"</string>
     <string name="storage_dcim_usage" msgid="1890098882753254745">"ফট’ আৰু ভিডিঅ’"</string>
     <string name="storage_music_usage" msgid="5362871290115089474">"অডিঅ’"</string>
@@ -575,10 +549,10 @@
     <string name="storage_wizard_migrate_progress_title" msgid="2623480667090826800">"ডেটাবোৰ <xliff:g id="NAME">%1$s</xliff:g>লৈ স্থানান্তৰ কৰি থকা হৈছে…"</string>
     <string name="storage_wizard_migrate_progress_description" msgid="4023358325977284145">"এই কাম সম্পূৰ্ণ হ\'বলৈ কিছু সময় লাগিব পাৰে। অনুগ্ৰহ কৰি ড্ৰাইভটো নেৰুৱাব।\nস্থানান্তৰ কৰি থকাৰ সময়ত কিছুমান এপে ভালদৰে কাম নকৰিব পাৰে।"</string>
     <string name="storage_wizard_format_slow_title" msgid="7640229918512394316">"এই ড্ৰাইভটো হয়টো মন্থৰ"</string>
-    <string name="storage_wizard_format_slow_summary" msgid="3674023258060474037">"আপুনি অব্যাহত ৰাখিব পাৰে, কিন্তু ইয়ালৈ স্থানান্তৰ কৰা এপ্‌বোৰ বন্ধ হৈ পৰিব পাৰে আৰু ডেটা স্থানান্তৰ কৰাৰ বাবে বহু বেছি সময় লাগিব পাৰে। উন্নত প্ৰদৰ্শনৰ বাবে এটা ক্ষিপ্ৰতৰ ড্ৰাইভ ব্যৱহাৰ কৰক।"</string>
+    <string name="storage_wizard_format_slow_summary" msgid="3674023258060474037">"আপুনি অব্যাহত ৰাখিব পাৰে, কিন্তু ইয়ালৈ স্থানান্তৰ কৰা এপবোৰ বন্ধ হৈ পৰিব পাৰে আৰু ডেটা স্থানান্তৰ কৰাৰ বাবে বহু বেছি সময় লাগিব পাৰে। উন্নত প্ৰদৰ্শনৰ বাবে এটা ক্ষিপ্ৰতৰ ড্ৰাইভ ব্যৱহাৰ কৰক।"</string>
     <string name="storage_wizard_format_action" msgid="3275676687226857170">"ফৰ্মেট কৰক"</string>
     <string name="storage_wizard_backup_apps_action" msgid="1402199004931596519">"এপসমূহৰ বেক আপ লওক"</string>
-    <string name="storage_wizard_back_up_apps_title" msgid="6225663573896846937">"<xliff:g id="NAME">%1$s</xliff:g>ত সঞ্চিত এপ্‌সমূহ"</string>
+    <string name="storage_wizard_back_up_apps_title" msgid="6225663573896846937">"<xliff:g id="NAME">%1$s</xliff:g>ত সঞ্চিত এপসমূহ"</string>
     <string name="storage_wizard_back_up_apps_and_data_title" msgid="7763611380573099978">"<xliff:g id="NAME">%1$s</xliff:g>ত সঞ্চিত হৈ থকা এপ্ আৰু ডাটাবোৰ"</string>
     <string name="storage_wizard_back_up_apps_space_available" msgid="5741521038349239359">"<xliff:g id="SIZE">%1$s</xliff:g> উপলব্ধ"</string>
     <string name="storage_wizard_eject_private_title" msgid="1336088625197134497">"ডিভাইচৰ ষ্ট’ৰেজ এৰুৱাওক"</string>
@@ -762,7 +736,7 @@
     <string name="system_hdcp_checking" msgid="3757586362130048838">"HDCP পৰীক্ষণ"</string>
     <string name="system_hdmi_optimization" msgid="4122753440620724144">"HDMI অপ্টিমাইজেশ্বন"</string>
     <string name="system_reboot_confirm" msgid="7035370306447878560">"এতিয়া ৰিষ্টার্ট কৰিবনে?"</string>
-    <string name="system_desc_reboot_confirm" msgid="1567738857421128179">"এই ছেটিং আপডে’ট কৰিবলৈ, আপোনাৰ ডিভাইচটো পুনৰ আৰম্ভ কৰিব লাগিব"</string>
+    <string name="system_desc_reboot_confirm" msgid="1567738857421128179">"এই ছেটিং আপডেইট কৰিবলৈ, আপোনাৰ ডিভাইচটো পুনৰ আৰম্ভ কৰিব লাগিব"</string>
     <string name="system_never_check" msgid="2860070727606369055">"কেতিয়াও পৰীক্ষা নকৰিব"</string>
     <string name="system_check_for_drm_content_only" msgid="6667617772587997533">"কেৱল ডিআৰএম সমলৰ বাবে পৰীক্ষা কৰক"</string>
     <string name="system_always_check" msgid="384870282800221580">"সদায় পৰীক্ষা কৰক"</string>
@@ -782,7 +756,7 @@
     <string name="system_show_gpu_view_updates" msgid="1625918928089365222">"জিপিইউ দৰ্শনৰ আপডেইটসমূহ দেখুৱাওক"</string>
     <string name="system_show_hardware_layer" msgid="5833664339844452290">"হাৰ্ডৱেৰ লেয়াৰ দেখুৱাওক"</string>
     <string name="system_show_gpu_overdraw" msgid="5073007513540516704">"জিপিইউ অভাৰড্ৰ\' দেখুৱাওক"</string>
-    <string name="system_show_surface_updates" msgid="7680759813613585278">"পৃষ্ঠভাগৰ আপডে’ট দেখুৱাওক"</string>
+    <string name="system_show_surface_updates" msgid="7680759813613585278">"পৃষ্ঠভাগৰ আপডেইট দেখুৱাওক"</string>
     <string name="system_window_animation_scale" msgid="685477540250939659">"ৱিণ্ড\' এনিমেশ্বন স্কেল"</string>
     <string name="system_transition_animation_scale" msgid="7266380208347453619">"ট্ৰাঞ্জিশ্বন এনিমেশ্বন স্কেল"</string>
     <string name="system_animator_duration_scale" msgid="3829445237130423625">"এনিমেটৰ ব্যৱধানৰ স্কেল"</string>
@@ -802,7 +776,7 @@
     <string name="system_desc_show_gpu_view_updates" msgid="9088343415389734854">"জিপিইউৰ জৰিয়তে অঁকাৰ সময়ত ৱিণ্ড’ৰ ভিতৰত ফ্লাশ্ব দৰ্শন"</string>
     <string name="system_desc_show_hardware_layer" msgid="3483713991865249527">"আপডে\'ট হওঁতে হাৰ্ডৱেৰ লেয়াৰ সেউজীয়া ৰঙেৰে ফ্লাশ্ব কৰক"</string>
     <string name="system_desc_show_gpu_overdraw" msgid="74019834911598588">"উৎকৃষ্টৰ পৰা নিকৃষ্টলৈ: নীলা, সেউজীয়া, পাতল ৰঙা, ৰঙা"</string>
-    <string name="system_desc_show_surface_updates" msgid="4018685547515133353">"আপডে’ট হওতে গোটেই ৱিণ্ড পৃষ্ঠাসমূহ ফ্লাশ্ব কৰক"</string>
+    <string name="system_desc_show_surface_updates" msgid="4018685547515133353">"আপডেইট হওতে গোটেই ৱিণ্ড পৃষ্ঠাসমূহ ফ্লাশ্ব কৰক"</string>
     <string name="system_desc_strict_mode_enabled" msgid="1974896408481676324">"যেতিয়া এপসমূহে মুখ্য থ্ৰেডত দীঘলীয়া কাৰ্যকলাপ চলাই, তেতিয়া স্ক্ৰীন ফ্লাশ্ব কৰক"</string>
     <string name="system_desc_profile_gpu_rendering" msgid="1594070211030991">"adb shell dumpsys gfxinfoত ৰেণ্ডাৰিং সময় জোখক"</string>
     <string name="security_unknown_sources_title" msgid="2012801664240314305">"অজ্ঞাত উৎসবোৰ"</string>
@@ -894,7 +868,7 @@
     <string name="restricted_profile_delete_title" msgid="7153982195273379506">"সীমিত প্ৰ\'ফাইল মচক"</string>
     <string name="restricted_profile_create_title" msgid="700322590579894058">"সীমিত প্ৰ’ফাইল সৃষ্টি কৰক"</string>
     <string name="restricted_profile_configure_title" msgid="3327502517511010296">"ছেটিংসমূহ"</string>
-    <string name="restricted_profile_configure_apps_title" msgid="2244201859522056827">"অনুমতিপ্ৰাপ্ত এপ্‌বোৰ"</string>
+    <string name="restricted_profile_configure_apps_title" msgid="2244201859522056827">"অনুমতিপ্ৰাপ্ত এপবোৰ"</string>
     <string name="restricted_profile_allowed" msgid="970921490464867884">"অনুমতি দিয়া হৈছে"</string>
     <string name="restricted_profile_not_allowed" msgid="8184983064118036268">"অনুমতি দিয়া হোৱা নাই"</string>
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"নিজৰ উপযোগিতা অনুসৰি কৰা অৱৰোধসমূহ"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"কিবা চাই থকাৰ সময়ত ডিছপ্লে’খন অফ হৈ যোৱাটো বন্ধ কৰিবলৈ নিশ্চিত কৰক, যিয়ে অধিক শক্তি খৰচ কৰাৰ সম্ভাৱনা আছে।"</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"নিষ্ক্ৰিয় হৈ থাকোঁতে"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"চাই থাকোঁতে"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"স্বয়ংক্ৰিয়ভাৱে বন্ধ কৰক"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"নিষ্ক্ৰিয় হৈ থাকিলে স্বয়ংক্ৰিয়ভাৱে বন্ধ কৰক"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"চাই থাকোঁতে স্বয়ংক্ৰিয়ভাৱে বন্ধ কৰক"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"টিভিটো স্বয়ংক্ৰিয়ভাৱে বন্ধ হোৱাৰ সুবিধা"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"নিষ্ক্ৰিয় হৈ থাকোঁতে টিভিটো স্বয়ংক্ৰিয়ভাৱে বন্ধ হোৱাৰ সুবিধাটো ছেট কৰক"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"চাই থাকোঁতে টিভিটো স্বয়ংক্ৰিয়ভাৱে বন্ধ হোৱাৰ সুবিধাটো ছেট কৰক"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"নিষ্ক্ৰিয় হৈ থকা সময়\"ৰ টাইমাৰ \"চাই থকা সময়\"ৰ টাইমাৰতকৈ কম সময়ৰ হ’বই লাগিব"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"চাই থকা সময়\"ৰ টাইমাৰ \"নিষ্ক্ৰিয় হৈ থকা সময়\"ৰ টাইমাৰতকৈ দীঘলীয়া সময়ৰ হ’বই লাগিব"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"ষ্টেণ্ডবাই ম’ডত নেটৱৰ্কৰ সংযোগ সীমিত কৰক"</string>
@@ -1029,7 +1003,7 @@
     <string name="directory_on_volume" msgid="5628089584970521703">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
     <string name="system_alert_window_settings" msgid="5790572489650085051">"অন্য এপৰ ওপৰত দেখুৱায়"</string>
     <string name="permit_draw_overlay" msgid="5312730681030266735">"অন্য এপৰ ওপৰত দেখুৱাবলৈ অনুমতি দিয়ক"</string>
-    <string name="allow_overlay_description" msgid="5152329837278240259">"আপুনি ব্যৱহাৰ কৰি থকা অইন এপৰ ওপৰত দেখুৱাবলৈ এই এপ্‌টোক অনুমতি দিয়ক। ই আপুনি ব্যৱহাৰ কৰি থকা এপ্‌সমূহ চলাত ব্যাঘাত জন্মাব পাৰে বা সেইবিলাকে স্ক্ৰীনত কেনেধৰণে দেখা দিয়ে বা আচৰণ কৰে তাক সলনি কৰিব পাৰে।"</string>
+    <string name="allow_overlay_description" msgid="5152329837278240259">"আপুনি ব্যৱহাৰ কৰি থকা অইন এপৰ ওপৰত দেখুৱাবলৈ এই এপ্‌টোক অনুমতি দিয়ক। ই আপুনি ব্যৱহাৰ কৰি থকা এপসমূহ চলাত ব্যাঘাত জন্মাব পাৰে বা সেইবিলাকে স্ক্ৰীনত কেনেধৰণে দেখা দিয়ে বা আচৰণ কৰে তাক সলনি কৰিব পাৰে।"</string>
     <string name="write_system_settings" msgid="4284654265954461890">"ছিষ্টেমৰ ছেটিংসমূহ সংশোধন কৰক"</string>
     <string name="write_settings_title" msgid="2361816483383105754">"ছিষ্টেম ছেটিংসমূহ সংশোধন কৰিব পাৰে"</string>
     <string name="write_settings_description" msgid="7382397926674265937">"এই অনুমতিয়ে কোনো এপক ছিষ্টেম ছেটিংসমূহ সলনি কৰিবলৈ সুবিধা দিব।"</string>
@@ -1086,7 +1060,7 @@
     <string name="remove_device_admin" msgid="2623866073546295104">"এই ডিভাইচ প্ৰশাসক এপ্‌টো অক্ষম কৰক"</string>
     <string name="uninstall_device_admin" msgid="6301368408620948266">"এপ্ আনইনষ্টল কৰক"</string>
     <string name="remove_and_uninstall_device_admin" msgid="1504351551194915633">"নিষ্ক্ৰিয় আৰু আনইনষ্টল কৰক"</string>
-    <string name="select_device_admin_msg" msgid="8475934459999710332">"ডিভাইচৰ প্ৰশাসকৰ এপ্‌সমূহ"</string>
+    <string name="select_device_admin_msg" msgid="8475934459999710332">"ডিভাইচৰ প্ৰশাসকৰ এপসমূহ"</string>
     <string name="add_device_admin_msg" msgid="5390773166682603421">"এই ডিভাইচ প্ৰশাসক এপ্‌টো সক্ৰিয় কৰেনে?"</string>
     <string name="add_device_admin" msgid="5078281377915844544">"এই ডিভাইচ এডমিন এপ্‌টো সক্ৰিয় কৰক"</string>
     <string name="device_admin_warning" msgid="7399916080685200660">"এই এপ্‌টো সক্ৰিয় কৰিলে ই <xliff:g id="APP_NAME">%1$s</xliff:g> তলৰ কামবিলাক কৰিবলৈ সক্ষম হ\'ব:"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"আৰম্ভ হওঁতে প্ৰদৰ্শিত হোৱা কাৰ্যকলাপ"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"ৰিছেট কৰক"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"ইথাৰনেট পেয়াৰ কৰাৰ ক’ড"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"শক্তি ম’ড"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"টিভি ব্যৱহাৰ নকৰা সময়ত শক্তিৰ সামৰ্থ্য উন্নত কৰক"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"সক্ষম কৰা সুবিধাসমূহ:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"মন কৰিব যে এই ম’ডটোৰ ফলত ডিভাইচটোৱে অধিক শক্তি ব্যয় কৰিব পাৰে।"</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" সক্ষম কৰক"</string>
 </resources>
diff --git a/Settings/res/values-az/energy-modes.xml b/Settings/res/values-az/energy-modes.xml
deleted file mode 100644
index 4a47e73e7..000000000
--- a/Settings/res/values-az/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Vacib şəbəkə funksiyaları"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Aşağı enerji istifadəsi"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"TV istifadə edilmədikdə şəbəkə bağlantısını söndürün."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Vacib güncəllənmə və funksiyalar"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Tövsiyə edilən şəbəkə funksiyaları"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimallaşdırılmış enerji istifadəsi"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Şəbəkə vasitəsilə TV-ni işə salan funksiyaları aktiv edir (şəbəkə gözləmə rejimi)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Əlavə şəbəkə funksiyaları"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Artan enerji istifadəsi"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Tövsiyə olunan funksiyalardan əlavə, bu seçim TV istifadə edilmədikdə enerji istehlakını artıran əlavə funksiyaları aktiv edir."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-az/strings.xml b/Settings/res/values-az/strings.xml
index 87965f562..76bd68d96 100644
--- a/Settings/res/values-az/strings.xml
+++ b/Settings/res/values-az/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Yedək və Bərpa"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Data zavod sıfırlaması"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibrləmə"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Söndürmə taymeri"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"TV-ni söndürmək və enerjiyə qənaət etmək üçün taymer ayarlayın"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Güc və Enerji"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Eko ayarları"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Cihazlar"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Format seçin"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Qabaqcıl səs ayarları"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Oyun rejiminə icazə verin"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Kontentin dinamik diapazonunu uyğunlaşdırın"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Bu seçimi aktivləşdirdikdə sistem kontentə uyğunlaşmaq üçün müxtəlif dinamik diapazon formatları arasında keçid edəcək. Format dəyişdirilərkən ekranın qaralmasına səbəb ola bilər.\n\nDigər dinamik diapazon seçimləri üçün Təkmil Displey ayarlarına klikləyin."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Tərcih edilən dinamik diapazon"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Sistem tərəfindən tərcih edilən çevirmə"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Sistemə format çevirməsini idarə etmək imkanı verir"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Bu seçim edildikdə sistem displeyə göndəriləcək uyğun dinamik diapazonu müəyyən edəcək və lazım olduqda kontenti bu dinamik diapazona çevirəcək."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Həmişə kontentin formatına uyğun gəlir"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Məcburi çevirmə"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Tərcih edilən formata məcburi çevirir"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Tərcih edilən formata məcburi çevirmə. Məcburi çevirmə Displey Rejimi və ya HDR Formatındakı ayarlara təsir edə bilər."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Həmişə SDR seçiminə"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Həmişə <xliff:g id="HDR_TYPE">%s</xliff:g> seçiminə"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"HDR çıxışı məcburi tətbiq edilsin?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Defolt olaraq <xliff:g id="HDR_TYPE">%s</xliff:g> seçiminə məcburi çevriləcək."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Displey 1080p 60Hz ayırdetmə dəqiqliyi ilə işləyəcək. 4k 60Hz ayırdetmə dəqiqliyi tətbiq edildikdə bu seçim displey ilə uyğun olmur."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision cari ayırdetmə dəqiqliyində dəstəklənmir. Dolby Vision-ı əl ilə aktivləşdirsəniz, displeyin ayırdetmə dəqiqliyi 1080p 60Hz olaraq dəyişdiriləcək"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Ayırdetmə dəqiqliyi 1080p 60Hz olaraq dəyişdirilsin?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Həmişə Dolby Vision-a məcburi çevirin"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Dolby Vision qabaqcıl displey ayarlarında HDR formatları üçün deaktiv edilibsə, Dolby Vision-a məcburi çevirmə onu yenidən aktivləşdirəcək."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Həmişə HDR10 formatına məcburi çevirin"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"HDR10 qabaqcıl displey ayarlarında HDR formatları üçün deaktiv edilibsə, HDR10 formatına məcburi çevirmə onu yenidən aktivləşdirəcək."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Həmişə HLG formatına məcburi çevirin"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"HLG qabaqcıl displey ayarlarında HDR formatları üçün deaktiv edilibsə, HLG formatına məcburi çevirmə onu yenidən aktivləşdirəcək."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Həmişə HDR10+ formatına məcburi çevirin"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"HDR10+ qabaqcıl displey ayarlarında HDR formatları üçün deaktiv edilibsə, HDR10+ formatına məcburi çevirmə onu yenidən aktivləşdirəcək."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Həmişə SDR formatına məcburi çevirin"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"SDR formatına məcburi çevirdikdə qabaqcıl displey ayarlarında HDR formatları üçün bütün formatlar deaktiv ediləcək."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Kontentin kadr tezliyini uyğunlaşdırın"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Yalnız problemsiz"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Ardıcıl"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Tətbiq tələb etsə, YALNIZ TV-də ardıcıl keçid imkanı olduğu halda cihazınız təmin etdiyi nəticəni izlədiyiniz məzmunun orijinal kadr sürətinə uyğunlaşdıracaq."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Qoşulmuş displeyiniz fasiləsiz yeniləmə dərəcəsi keçidlərini dəstəkləmir. Onu dəstəkləyən ekrana keçməyincə bu seçim heç bir təsir göstərməyəcək."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Həmişə"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Qeyri-ardıcıl"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Tətbiq tələb etsə, cihazınız təmin etdiyi nəticəni izlədiyiniz məzmunun orijinal kadr sürətinə uyğunlaşdıracaq. Bu, video oxutmadan çıxarkən və ya daxil olarkən ekranınızda bir saniyə görüntü olmamasına səbəb ola bilər."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Heç vaxt"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Tətbiq tələb etsə də, cihazınız heç vaxt təmin etdiyi nəticəni izlədiyiniz məzmunun orijinal kadr sürətinə uyğunlaşdırmağa çalışmayacaq."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Ayırdetmə dəqiqliyi %1$s olaraq dəyişdirilsin?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Bundan sonra %1$s istifadə etmək üçün OK seçin"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision %1$s rejimində dəstəklənmir və \"Qabaqcıl Displey Ayarları\"nda deaktiv ediləcək"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Bu rejim dəstəkləyir: %1$s\nBəzi TV-lərdə digər HDR formatlarını aktivləşdirmək üçün Təkmil HDMI aktiv edilməlidir. Dəstəkləndiyini müəyyənləşdirmək üçün TV ayarlarını yoxlayın."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Bu rejim %1$s növünü dəstəkləyir. Bəzi TV\'lərdə daha çox HDR formatını aktivləşdirmək üçün qabaqcıl HDMI\'ı aktiv etməli ola bilərsiniz. Bunun dəstəklənib-dəstəklənmədiyini görmək üçün TV ayarlarınızı yoxlayın."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Ləğv edin"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hs"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hs)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hs)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Keşlənmiş data silinsin?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Bu, bütün tətbiqlər üçün keşlənmiş verilənləri siləcək."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Bu cihaz təşkilatınız tərəfindən idarə olunur."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Bu cihaz <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tərəfindən idarə olunur."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Ətraflı məlumat"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kamera tətbiqi}other{Kamera tətbiqləri}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Təqvim tətbiqi"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"İzləyərkən ekranın sönməməsini təsdiq edin, bu da enerji sərfiyyatının artmasına səbəb ola bilər."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Fəaliyyətsiz olduqda"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"İzləyərkən"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Avtomatik söndürülsün"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Qeyri-aktiv olduqda avtomatik söndürülsün"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"İzləyərkən avtomatik söndürülsün"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"TV-ni avtomatik söndürün"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Fəaliyyətsiz olduqda TV-ni avtomatik söndürün"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"İzləyərkən TV-ni avtomatik söndürün"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"Qeyri-aktiv olduqda\" taymeri \"İzləyərkən\" taymerindən daha qısa olmalıdır"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"İzləyərkən\" taymeri \"Qeyri-aktiv olduqda\" taymerindən daha uzun olmalıdır"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Gözləmə rejimində şəbəkə bağlantısını məhdudlaşdırın"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Aktiv edildikdə davranış"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Sıfırlayın"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Ethernet qoşulma kodu"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Enerji rejimləri"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"TV istifadə edilmədikdə enerji səmərəliliyinin təkmilləşdirilməsi"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Aktivləşdirir:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Bu rejim cihazın enerji sərfiyyatını artıra bilər."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" rejiminin aktivləşdirilməsi"</string>
 </resources>
diff --git a/Settings/res/values-b+sr+Latn/energy-modes.xml b/Settings/res/values-b+sr+Latn/energy-modes.xml
deleted file mode 100644
index 5385afb16..000000000
--- a/Settings/res/values-b+sr+Latn/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Osnovne mrežne funkcije"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Mala potrošnja energije"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Isključite mrežnu vezu kada se TV ne koristi."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Važna ažuriranja i funkcije"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Preporučene mrežne funkcije"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimizovana potrošnja energije"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Uključuje funkcije koje bude TV preko mreže (režim mirovanja na mreži)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Umetnite funkciju 1]"</item>
-    <item msgid="8724721267222341891">"[Umetnite funkciju 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Dodatne mrežne funkcije"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Povećana potrošnja energije"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Pored preporučenih funkcija, ova opcija uključuje dodatne funkcije kada se TV ne koristi koje mogu da povećaju potrošnju energije."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Umetnite funkciju 1]"</item>
-    <item msgid="170760143032597722">"[Umetnite funkciju 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-b+sr+Latn/strings.xml b/Settings/res/values-b+sr+Latn/strings.xml
index 22104b84f..14be21620 100644
--- a/Settings/res/values-b+sr+Latn/strings.xml
+++ b/Settings/res/values-b+sr+Latn/strings.xml
@@ -67,7 +67,7 @@
     <string name="add_account" msgid="7386223854837017129">"Dodaj nalog"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Uklanjanje naloga"</string>
     <string name="account_sync" msgid="4315295293211313989">"Izaberite sinhronizovane aplikacije"</string>
-    <string name="sync_now" msgid="4335217984374620551">"Sinhronizuj"</string>
+    <string name="sync_now" msgid="4335217984374620551">"Sinhronizuj odmah"</string>
     <string name="sync_in_progress" msgid="8081367667406185785">"Sinhronizovanje…"</string>
     <string name="last_synced" msgid="8371967816955123864">"Poslednji put sinhronizovano <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="sync_disabled" msgid="6652778349371079140">"Onemogućeno je"</string>
@@ -75,7 +75,7 @@
     <string name="account_remove_failed" msgid="5654411101098531690">"Nije moguće ukloniti nalog"</string>
     <!-- no translation found for sync_item_title (5884138264243772176) -->
     <skip />
-    <string name="sync_one_time_sync" msgid="1665961083810584134">"Sinhronizuj<xliff:g id="LAST_SYNC_TIME">
+    <string name="sync_one_time_sync" msgid="1665961083810584134">"Sinhronizuj odmah<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_failed" msgid="2998289556481804047">"Sinhronizacija nije uspela"</string>
     <string name="sync_active" msgid="1621239982176888680">"Sinhronizacija je aktivna"</string>
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Pravljenje rezervne kopije i vraćanje"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Resetovanje na fabrička podešavanja"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibracija"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Tajmer za isključivanje"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Podesite tajmere za isključivanje TV-a i uštedu energije"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Napajanje i energija"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Eko podešavanja"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Uređaji"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Izaberite formate"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Napredna podešavanja zvuka"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Dozvoli režim za igre"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Koristi isti dinamički opseg sadržaja"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Kada omogućite ovu opciju, sistem će menjati format dinamičkog opsega radi podudaranja sa sadržajem. To može da izazove crni ekran tokom promene formata.\n\nKliknite na Napredna podešavanja ekrana za više opcija dinamičkog opsega."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Željeni dinamički opseg"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Sistemska konverzija"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Omogućava sistemu da upravlja konverzijom formata"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Kada je ova opcija izabrana, sistem određuje odgovarajući dinamički opseg koji će poslati na ekran i prema potrebi će konvertovati sadržaj u taj dinamički opseg."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Uvek se podudara s formatom sadržaja"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Nametni konverziju"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Nameće se konverzija u željeni format"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Nameće konverziju u željeni format. Nametanje konverzije može da utiče na druga podešavanja u režim prikaza ili HDR format."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Uvek u SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Uvek u <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Želite da nametnete HDR izlaz?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Podrazumevano nametnuće se konverzija u <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Rezolucija ekrana biće 1080 piksela na 60 Hz. Ta opcija nije kompatibilna sa vašim ekranom rezolucije 4K na 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision nije podržan pri aktuelnoj rezoluciji. Ako ručno omogućite Dolby Vision, rezolucija ekrana će se promeniti u 1080 piksela na 60 Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Želite da promenite rezoluciju u 1080 piksela na 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Uvek obavljaj prinudnu konverziju u Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Ako je Dolby Vision onemogućen u HDR formatima u Naprednim podešavanjima ekrana, prinudna konverzija u Dolby Vision će ga ponovo omogućiti."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Uvek obavljaj prinudnu konverziju u HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Ako je HDR10 onemogućen u HDR formatima u Naprednim podešavanjima ekrana, prinudna konverzija u HDR10 će ga ponovo omogućiti."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Uvek obavljaj prinudnu konverziju u HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Ako je HLG onemogućen u HDR formatima u Naprednim podešavanjima ekrana, prinudna konverzija u HLG će ga ponovo omogućiti."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Uvek obavljaj prinudnu konverziju u HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Ako je HDR10+ onemogućen u HDR formatima u Naprednim podešavanjima ekrana, prinudna konverzija u HDR10+ će ga ponovo omogućiti."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Uvek obavljaj prinudnu konverziju u SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Prinudna konverzija u SDR će onemogućiti sve formate u HDR formatima u Naprednim podešavanjima ekrana."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Koristi brzinu kadrova sadržaja"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Samo neprimetno"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Neprimetno"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Ako aplikacija to traži, uređaj će usklađivati brzinu kadrova sadržaja koji prikazuje sa originalnom brzinom kadrova sadržaja koji gledate SAMO pod uslovom da TV može da obavi neprimetan prelaz."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Povezani ekran ne podržava neprimetne promene učestalosti osvežavanja. Ova opcija neće imati efekta ako ne pređete na ekran koji je podržava."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Uvek"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Nije neprimetno"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Ako aplikacija to traži, uređaj će usklađivati brzinu kadrova sadržaja koji prikazuje sa originalnom brzinom kadrova sadržaja koji gledate. Zbog toga će ekran možda nakratko biti prazan kada zaustavljate ili počinjete reprodukciju videa."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Nikad"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Čak i ako aplikacija to traži, uređaj nikada neće pokušavati da uskladi brzinu kadrova sadržaja koji prikazuje sa originalnom brzinom kadrova sadržaja koji gledate."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Želite da promenite rezoluciju u %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Izaberite Potvrdi da biste koristili %1$s od sada."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolbi Vision nije podržan na %1$s i biće onemogućen u „Naprednim podešavanjima prikaza“"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Ovaj režim podržava: %1$s\nNa nekim televizorima ćete možda morati da uključite poboljšan HDMI da biste omogućili više HDR formata. Proverite podešavanja TV-a da biste videli da li je to podržano."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Ovaj režim podržava %1$s. Na nekim televizorima ćete možda morati da uključite poboljšan HDMI da biste omogućili više HDR formata. Proverite podešavanja TV-a da biste videli da li je to podržano."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Otkaži"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Potvrdi"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Želite li da obrišete keširane podatke?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Biće obrisani keširani podaci za sve aplikacije."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Ovim uređajem upravlja organizacija."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Ovim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Saznajte više"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplikacija za kameru}one{Aplikacije za kameru}few{Aplikacije za kameru}other{Aplikacije za kameru}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplikacija Kalendar"</string>
@@ -757,7 +731,7 @@
     <string name="system_drawing" msgid="5802739024643871942">"Crtanje"</string>
     <string name="system_monitoring" msgid="7997260748312620855">"Nadgledanje"</string>
     <string name="system_apps" msgid="8481888654606868074">"Aplikacije"</string>
-    <string name="system_stay_awake" msgid="5935117574414511413">"Ne gasi ekran"</string>
+    <string name="system_stay_awake" msgid="5935117574414511413">"Ne zaključavaj"</string>
     <string name="keep_screen_on_summary" msgid="4680661166009970792">"Ekran nikada neće biti u režimu spavanja"</string>
     <string name="system_hdcp_checking" msgid="3757586362130048838">"HDCP provera"</string>
     <string name="system_hdmi_optimization" msgid="4122753440620724144">"HDMI optimizacija"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Potvrdite da biste sprečili da se ekran isključuje dok gledate, što može da izazove povećanu potrošnju energije."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Tokom neaktivnosti"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Tokom gledanja"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Automatski isključi"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Automatski isključi tokom neaktivnosti"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Automatski isključi tokom gledanja"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Automatski isključi TV"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Automatsko isključivanje TV-a pri neaktivnosti"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Automatsko isključivanje TV-a pri gledanju"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Tajmer „Tokom neaktivnosti“ mora da bude kraći od tajmera „Tokom gledanja“"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Tajmer „Tokom gledanja“ mora da bude duži od tajmera „Tokom neaktivnosti“"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Ograniči mrežnu vezu u režimu mirovanja"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Ponašanje pri uključivanju"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Resetuj"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Kôd za uparivanje za eternet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Režimi potrošnje energije"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Poboljšajte efikasnost energije kada se TV ne koristi"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Omogućava:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Imajte na umu da ovaj režim može da poveća potrošnju energije na uređaju."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Omogućite režim <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
 </resources>
diff --git a/Settings/res/values-be/energy-modes.xml b/Settings/res/values-be/energy-modes.xml
deleted file mode 100644
index 4472e275d..000000000
--- a/Settings/res/values-be/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Неабходныя функцыі сеткі"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Нізкае спажыванне энергіі"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Выключаць падключэнне да сеткі, калі тэлевізар не выкарыстоўваецца."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Важныя абнаўленні і функцыі"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Рэкамендаваныя функцыі сеткі"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Аптымізаванае спажыванне энергіі"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Уключае функцыі, якія абуджаюць тэлевізар па сетцы (рэжым чакання праз сетку)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Дадатковыя функцыі сеткі"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Павышанае спажыванне энергіі"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Акрамя рэкамендаваных функцый, гэты параметр уключае дадатковыя функцыі, калі тэлевізар не выкарыстоўваецца, што можа павялічыць спажыванне энергіі."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-be/strings.xml b/Settings/res/values-be/strings.xml
index c985c2de0..f6b5c2152 100644
--- a/Settings/res/values-be/strings.xml
+++ b/Settings/res/values-be/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Рэзервовае капіраванне і аднаўленне"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Скід да заводскіх налад"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Каліброўка"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Таймер выключэння"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Наладзьце таймеры для выключэння тэлевізара і эканоміі энергіі"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Сілкаванне і энергія"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Налады экарэжыму"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Прылады"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Выбар фарматаў"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Пашыраныя налады гуку"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Дазволіць рэжым гульні"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Прыводзіць у адпаведнасць з дынамічным дыяпазонам змесціва"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Калі гэты параметр уключаны, сістэма пераключае фарматы дынамічнага дыяпазону ў адпаведнасці са змесцівам. Падчас змены фармату можа паказвацца чорны экран.\n\nНацісніце \"Пашыраныя налады дысплэя\", каб перайсці ў дадатковыя налады дынамічнага дыяпазону."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Прыярытэтны дынамічны дыяпазон"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Прыярытэтная ў сістэме размова"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Дазвольце сістэме кіраваць фарматам размовы"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Калі выбраны гэты параметр, сістэма будзе выяўляць устойлівы дынамічны дыяпазон для адпраўкі на ваш дысплэй і, пры неабходнасці, пераўтвараць змесціва ў гэты дынамічны дыяпазон."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Заўсёды падбірае фармат змесціва"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Прымусова перавесці размову"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Прымусова пераводзіць размову ў прыярытэтны фармат"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Прымусова пераводзіць размову ў прыярытэтны фармат. Прымусовы перавод размовы можа закрануць іншыя налады ў рэжыме дысплэя ці фармаце HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Заўсёды ў SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Заўсёды ў <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Прымусова перавесці ў фармат HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Стандартна размова будзе прымусова адкрывацца ў <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Ваш дысплэй будзе мець раздзяляльнасць 1080p 60 Гц. Гэты параметр несумяшчальны з вашым дысплэем пры выкарыстанні раздзяляльнасці 4k 60 Гц."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision не падтрымліваецца ў бягучай раздзяляльнасці. Калі вы ўключыце Dolby Vision уручную, раздзяляльнасць экрана будзе зменена на 1080p 60 Гц"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Змяніць раздзяляльнасць на 1080p 60 Гц?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Заўсёды прымусова задаваць фармат Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Калі фармат Dolby Vision адключаны ў Фарматах HDR у пашыраных наладах дысплэя, прымусовае задаванне фармату Dolby Vision зноў уключыць яго."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Заўсёды прымусова задаваць фармат HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Калі фармат HDR10 адключаны ў Фарматах HDR у пашыраных наладах дысплэя, прымусовае задаванне фармату HDR10 зноў уключыць яго."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Заўсёды прымусова задаваць фармат HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Калі фармат HLG адключаны ў Фарматах HDR у пашыраных наладах дысплэя, прымусовае задаванне фармату HLG зноў уключыць яго."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Заўсёды прымусова задаваць фармат HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Калі фармат HDR10+ адключаны ў Фарматах HDR у пашыраных наладах дысплэя, прымусовае задаванне фармату HDR10+ зноў уключыць яго."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Заўсёды прымусова задаваць фармат SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Прымусовае задаванне фармату SDR адключыць усе фарматы ў Фарматах HDR у пашыраных наладах дысплэя."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Узгадняць з частатой кадраў змесціва"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Бесперапынна"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Плаўнасць з\'яўляецца абавязковай"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Калі праграма адправіць адпаведны запыт, прылада будзе суадносіць выходны сігнал з зыходнай частатой кадраў змесціва, якое вы праглядаеце, ТОЛЬКІ пры ўмове, што на экране тэлевізара будзе забяспечана плаўнасць рухаў."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Падключаны дысплэй не падтрымлівае плаўную змену частаты абнаўлення. Каб гэты параметр працаваў, перайдзіце на дысплэй, які яго падтрымлівае."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Заўсёды"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Плаўнасць не з\'яўляецца абавязковай"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Калі праграма адправіць адпаведны запыт, прылада будзе суадносіць выходны сігнал з зыходнай частатой кадраў змесціва, якое вы праглядаеце. У выніку экран можа на секунду пагаснуць, калі вы будзеце ўключаць ці выключаць прайграванне відэа."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Ніколі"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Нават калі праграма адправіць адпаведны запыт, прылада ніколі не будзе імкнуцца суадносіць выходны сігнал з зыходнай частатой кадраў змесціва, якое вы праглядаеце."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Змяніць раздзяляльнасць на %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Выберыце ОК, каб адразу ж выкарыстоўваць %1$s."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision не падтрымліваецца ў рэжыме %1$s і будзе адключаны ў пашыраных наладах дысплэя"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Гэты рэжым падтрымлівае: %1$s\nНа некаторых тэлевізарах можа спатрэбіцца ўключыць палепшаны HDMI, каб выкарыстоўваць больш фарматаў HDR. Даведацца, якія фарматы падтрымліваюцца, можна ў наладах тэлевізара."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Гэты рэжым падтрымлівае %1$s. На некаторых тэлевізарах можа спатрэбіцца ўключыць палепшаны HDMI, каб выкарыстоўваць больш фарматаў HDR. Даведацца, якія фарматы падтрымліваюцца, можна ў наладах тэлевізара."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Скасаваць"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ОК"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Гц"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Гц)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Гц)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Ачысціць кэшаваныя даныя?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Гэта ачысціць кэшаваныя даныя для ўсіх праграм."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -263,7 +236,7 @@
     <string name="bluetooth_known_devices_category" msgid="6895470515631452961">"Аксесуары"</string>
     <string name="bluetooth_official_remote_category" msgid="5817814488268307170">"Дыстанцыйнае кіраванне"</string>
     <string name="bluetooth_official_remote_entry_title" msgid="6699700335229570038">"Налады пульта дыстанцыйнага кіравання"</string>
-    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"Наладзіць кнопкі пульта ДК"</string>
+    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"Наладзіць кнопкі пульта кіравання"</string>
     <string name="bluetooth_ir_entry_subtitle" msgid="4606207128353416151">"Кіраванне гучнасцю, сілкаваннем, уваходнымі сігналамі на тэлевізарах, рэсіверах і гукавых панэлях"</string>
     <string name="bluetooth_connect_action_title" msgid="7715342395313781643">"Падключыць"</string>
     <string name="bluetooth_connect_confirm" msgid="4769958536295137386">"Падключыцца да %1$s"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Гэта прылада знаходзіцца пад кіраваннем вашай арганізацыі."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Гэта прылада знаходзіцца пад кіраваннем <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Даведацца больш"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Праграма \"Камера\"}one{Праграмы \"Камера\"}few{Праграмы \"Камера\"}many{Праграмы \"Камера\"}other{Праграмы \"Камера\"}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Праграма \"Каляндар\""</string>
@@ -355,7 +329,7 @@
     <string name="app_names_concatenation_template_2" msgid="5297284354915830297">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="4932774380339466733">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="tutorials" msgid="7880770425872110455">"Кіраўніцтвы"</string>
-    <string name="about_system_update" msgid="7421264399111367755">"Абнаўленне сістэмы"</string>
+    <string name="about_system_update" msgid="7421264399111367755">"Абнаўленні сістэмы"</string>
     <string name="system_update_description" msgid="998883510488461766">"У выніку праграмнае забеспячэнне сістэмы будзе абноўлена да апошняй версіі. Ваша прылада будзе перазапушчана."</string>
     <string name="system_update_content_description" msgid="5702888187682876466">"Абнаўленне сістэмы. У выніку гэтага дзеяння праграмнае забеспячэнне сістэмы будзе абноўлена да апошняй версіі. Ваша прылада будзе перазапушчана."</string>
     <string name="about_preference" msgid="9112690446998150670">"Інфармацыя"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Пацвердзіце, каб папярэдзіць выключэнне дысплэя ў час прагляду. Гэта можа павялічыць спажыванне энергіі."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"У час бяздзейнасці"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"У час прагляду"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Выключаць аўтаматычна"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Выключаць аўтаматычна, калі прылада не актыўная"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Выключаць аўтаматычна на час прагляду"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Аўтаматычна выключаць тэлевізар"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Аўтаматычна выключаць тэлевізар падчас бяздзеяння"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Аўтаматычна выключаць тэлевізар падчас прагляду"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Працягласць перыяду \"У неактыўным стане\" павінна быць меньшай за працягласць \"Часу прагляду\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Працягласць \"Часу прагляду\" павінна быць большай за працягласць перыяду \"У неактыўным стане\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Абмежаваць падключэнне да сеткі ў рэжыме чакання"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Налады ўключэння"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Скінуць"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Код спалучэння ппраз Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Рэжымы спажывання энергіі"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Павысіць эфектыўнасць спажывання энергіі, калі тэлевізар не выкарыстоўваецца"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Уключае:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Улічвайце, што гэты рэжым можа павялічыць спажыванне энергіі прыладай."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Уключыць рэжым \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/Settings/res/values-bg/energy-modes.xml b/Settings/res/values-bg/energy-modes.xml
deleted file mode 100644
index 5eddee9d8..000000000
--- a/Settings/res/values-bg/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Основни мрежови функции"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Ниска консумация на енергия"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Изключване на връзката с мрежата, когато телевизорът не се използва."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Важни актуализации и функции"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Препоръчителни мрежови функции"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Оптимизирана консумация на енергия"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Включва функции, които активират телевизора през мрежата (режим на готовност с връзка с мрежата)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Допълнителни мрежови функции"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Повишена консумация на енергия"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Освен препоръчителните функции тази опция задейства и допълнителни такива, когато телевизорът не се използва, което може да доведе до по-висока консумация на енергия."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-bg/strings.xml b/Settings/res/values-bg/strings.xml
index 550ccde75..2b0e82630 100644
--- a/Settings/res/values-bg/strings.xml
+++ b/Settings/res/values-bg/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Резервно копие и възстановяване"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Възстановяване на фабричните настройки"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Калибриране"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Таймер за изключване"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Задайте таймери за изключване на телевизора и пестете електроенергия"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Включване и захранване"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Настройки за икономичния режим"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Устройства"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Избиране на формати"</string>
@@ -151,39 +151,12 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"CEC за HDMI"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Разширени настройки за звука"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Разрешаване на режима на игра"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Намиране на съответствие на динамичния обхват на съдържанието"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Когато активирате тази опция, системата ще премине през различните формати за динамичен обхват, за да намери съответствие за съдържанието. По време на превключването екранът може да стане черен.\n\nЗа още опции за динамичен обхват кликнете върху разширените настройки за дисплея."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Предпочитан динамичен обхват"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Предпочитано от системата преобразуване"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Преобразуването на формата да се управлява от системата"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Когато е избрана тази опция, системата ще определя подходящ динамичен обхват за сигнала към екрана ви и при необходимост ще преобразува съдържанието към този динамичен обхват."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Винаги съответства на формата на съдържанието"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Принудително преобразуване"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Принудително преобразуване към предпочитания формат"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Принудително преобразуване към предпочитан формат. Принудителното преобразуване може да засегне други настройки в „Режим на показване“ или в секцията за HDR форматите."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Винаги към SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Винаги към <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Искате ли принудително да се зададе изходящ HDR формат?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"По подразбиране преобразуването принудително ще бъде към <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Екранът ви ще работи с разделителна способност 1080p (60 Hz). Тази опция не е съвместима с екрана ви, когато работи с разделителна способност 4K (60 Hz)."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Режимът Dolby Vision не се поддържа при текущата разделителна способност. Ако го активирате ръчно, разделителната способност на екрана ви ще бъде променена на 1080p (60 Hz)"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Искате ли да промените разделителната способност на 1080p (60 Hz)?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Винаги да се преобразува в Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Ако форматът Dolby Vision е деактивиран в списъка с HDR формати в разширените настройки за дисплея, той ще бъде активиран при принудително преобразуване в Dolby Vision."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Винаги да се преобразува в HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Ако форматът HDR10 е деактивиран в списъка с HDR формати в разширените настройки за дисплея, той ще бъде активиран при принудително преобразуване в HDR10."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Принудително преобразуване в HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Ако форматът HLG е деактивиран в списъка с HDR формати в разширените настройки за дисплея, той ще бъде активиран при принудително преобразуване в HLG."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Винаги да се преобразува в HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Ако форматът HDR10+ е деактивиран в списъка с HDR формати в разширените настройки за дисплея, той ще бъде активиран при принудително преобразуване в HDR10+."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Винаги да се преобразува в SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Принудителното преобразуване в SDR ще деактивира всички HDR формати в разширените настройки за дисплея."</string>
-    <string name="match_content_frame_rate_title" msgid="153291168560947689">"Съответствие със скоростта на кадрите на съдържанието"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Изцяло без прекъсвания"</string>
+    <string name="match_content_frame_rate_title" msgid="153291168560947689">"Намиране на съответствие на скоростта на кадрите на съдърж."</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Безпроблемно"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Ако приложението поиска това, устройството ви ще намери съответствие между изхода си и оригиналната скорост на кадрите на съдържанието, което гледате, САМО ако телевизорът ви може да извърши безпроблемен преход."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Свързаният ви екран не поддържа функцията за автоматична промяна на честотата на опресняване. Тя няма да има ефект, освен ако не преминете към екран, който я поддържа."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Винаги"</string>
-    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Ако прилож. поиска това, у-вото ви ще намери съответствие между изходните си данни и оригиналната скорост на кадрите на съдърж., което гледате. Екранът може да остане празен за секунда при приключ./стартиране на възпроизвеждането на видеосъдържание."</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Небезпроблемно"</string>
+    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Ако прилож. поиска това, у-вото ви ще намери съответствие между изхода си и оригиналната скорост на кадрите на съдърж., което гледате. Възможно е екранът ви да остане празен за секунда при приключ./стартиране на възпроизвеждането на видеосъдържание."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Никога"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Дори ако приложението поиска това, устройството ви никога няма да опита да намери съответствие между изхода си и оригиналната скорост на кадрите на съдържанието, което гледате."</string>
     <string name="font_scale_settings_title" msgid="4114019544800225980">"Промяна на мащаба на текста"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Искате ли да промените разделителната способност на %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Изберете OK, за да използвате %1$s занапред."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Режимът Dolby Vision не се поддържа при %1$s и ще бъде деактивиран в „Разширени настройки за дисплея“"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Този режим поддържа: %1$s\nНа някои телевизори може да се наложи да включите подобрения HDMI режим, за да активирате още HDR формати. Проверете дали той се поддържа в настройките на телевизора."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Този режим поддържа %1$s. На някои телевизори може да се наложи да включите подобрения HDMI режим, за да активирате още HDR формати. Проверете дали той се поддържа в настройките на телевизора."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Отказ"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Да се изчистят ли кешираните данни?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Това ще изчисти кешираните данни за всички прил."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Това устройство се управлява от организацията ви."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Това устройство се управлява от <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Научете повече"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Приложение за камера}other{Приложения за камера}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Приложение за календар"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Моля, потвърдете, за да предотвратите изключването на екрана, докато гледате, което може да доведе до по-голям разход на енергия."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"При неактивност"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"При гледане"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Автоматично изключване"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Автоматично изключване при неактивност"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Автоматично изключване при гледане"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Автоматично изключване на телевизора"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Автоматично изключване на телевизора при неактивност"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Автоматично изключване на телевизора при гледане"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Времето на таймера „При неактивност“ трябва да бъде по-кратко от това на таймера „При гледане“"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Времето на таймера „При гледане“ трябва да бъде по-дълго от това на таймера „При неактивност“"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Огранич. на връзката с мрежата в режим на готовност"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Поведение при включване"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Нулиране"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Код за сдвояване с Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Енергийни режими"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Подобряване на енергийната ефективност, когато телевизорът не се използва"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Активира:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Имайте предвид, че този режим може да увеличи консумацията на енергия на устройството."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Активиране на „<xliff:g id="ENERGYMODENAME">%s</xliff:g>“"</string>
 </resources>
diff --git a/Settings/res/values-bn/energy-modes.xml b/Settings/res/values-bn/energy-modes.xml
deleted file mode 100644
index d67b9a003..000000000
--- a/Settings/res/values-bn/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"প্রয়োজনীয় নেটওয়ার্ক ফিচার"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"কম শক্তি খরচ"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"টিভি ব্যবহার না হলে নেটওয়ার্ক কানেকশন বন্ধ করুন।"</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"গুরুত্বপূর্ণ আপডেট এবং ফাংশন"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"প্রস্তাবিত নেটওয়ার্ক ফিচার"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"অপ্টিমাইজ করা শক্তি খরচ"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"নেটওয়ার্কে টিভি চালু করে এমন ফিচারগুলি চালু করে (স্ট্যান্ডবাই মোড)।"</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"অতিরিক্ত নেটওয়ার্কের ফিচার"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"শক্তির ব্যবহার বৃদ্ধি"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"প্রস্তাবিত ফিচার ছাড়াও, এই বিকল্পটি অতিরিক্ত ফিচার চালু করে যখন টিভি ব্যবহার করা হয় না, যা পাওয়ার খরচ বাড়াতে পারে।"</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-bn/strings.xml b/Settings/res/values-bn/strings.xml
index 64c9d8d3e..04db710cb 100644
--- a/Settings/res/values-bn/strings.xml
+++ b/Settings/res/values-bn/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"ব্যাক-আপ নিন ও ফিরিয়ে আনুন"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"ফ্যাক্টরি ডেটা রিসেট করুন"</string>
     <string name="device_calibration" msgid="2907914144048739705">"ক্রমাঙ্কন"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"বন্ধ করার টাইমার"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"টিভি বন্ধ ও এনার্জি সাশ্রয় করতে টাইমার সেট করুন"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"পাওয়ার &amp; বিদ্যুৎ"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"ইকো সেটিংস"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"ডিভাইস"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"ফর্ম্যাট বেছে নিন"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"উন্নত সাউন্ড সেটিংস"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"গেম মোডে অনুমতি দিন"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"কন্টেন্ট ডায়নামিক রেঞ্জ ম্যাচ করুন"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"এই বিকল্প চালু করলে, কন্টেন্টের সাথে মানানসই ফলাফল দেখানোর জন্য সিস্টেমটি বিভিন্ন ডায়নামিক রেঞ্জ ফর্ম্যাটের মধ্যে পরিবর্তিত হবে। কোনও ফর্ম্যাটে পরিবর্তন করার সময়, সিস্টেমের স্ক্রিন কালো হয়ে যেতে পারে।\n\nডায়নামিক রেঞ্জের আরও বিকল্প দেখতে, \'অ্যাডভান্স ডিসপ্লে\' সেটিংসে ক্লিক করুন।"</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"পছন্দের ডায়নামিক রেঞ্জ"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"সিস্টেমের সাথে মানানসই কনভার্সন"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"সিস্টেমকে ফর্ম্যাট কনভার্সন ম্যানেজ করতে দিন"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"এই বিকল্পটি বেছে নেওয়া হলে, সিস্টেমটি আপনার ডিসপ্লেতে পাঠানোর জন্য উপযুক্ত ডায়নামিক রেঞ্জ নির্ধারণ করবে এবং প্রয়োজন অনুসারে এই ডায়নামিক রেঞ্জে কন্টেন্ট কনভার্ট করবে।"</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"সবসময় কন্টেন্ট ফর্ম্যাটের সাথে ম্যাচ করে"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"কনভার্সন চালু করা"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"পছন্দের ফর্ম্যাটে কনভার্সন চালু করা"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"পছন্দের ফর্ম্যাটে কনভার্সন চালু করা। কনভার্সন চালু করা হলে, \'ডিসপ্লে মোড\' বা HDR ফর্ম্যাটে অন্যান্য সেটিংসে প্রভাব ফেলতে পারে।"</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"সবসময়ে SDR-এ"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"সবসময় <xliff:g id="HDR_TYPE">%s</xliff:g>-এ"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"আপনি কি HDR আউটপুট চালু করতে চান?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"সাধারণত, কনভার্সন <xliff:g id="HDR_TYPE">%s</xliff:g>-এ চালু করা হয়।"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"আপনার ডিসপ্লে 1080p 60Hz রেজোলিউশনে চলবে। 4k 60Hz রেজোলিউশনে চলাকালীন এই বিকল্পটি আপনার ডিসপ্লের সাথে সামঞ্জস্যপূর্ণ নয়।"</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"বর্তমান রেজোলিউশনে Dolby Vision কাজ করে না। ম্যানুয়ালি Dolby Vision চালু করলে, আপনার ডিসপ্লের রেজোলিউশন পরিবর্তিত হয়ে ১০৮০পিক্সেল ৬০হার্জ হবে"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"রেজোলিউশন পরিবর্তন করে ১০৮০পিক্সেল ৬০হার্জ করতে চান?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"সবসময় Dolby ভিশনে কনভার্সন চালু করা"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"অ্যাডভান্সড ডিসপ্লে সেটিংসে HDR ফর্ম্যাটে Dolby ভিশন বন্ধ করা থাকলে, Dolby ভিশনে কনভার্সন এটিকে আবার চালু করবে।"</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"HDR10-এ সবসময় কনভার্সন চালু করা"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"অ্যাডভান্সড ডিসপ্লে সেটিংসে HDR ফর্ম্যাটে HDR10 বন্ধ করা থাকলে, HDR10-এ কনভার্সন এটিকে আবার চালু করবে।"</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"HLG-এ সবসময় কনভার্সন চালু করা"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"অ্যাডভান্সড ডিসপ্লে সেটিংসে HDR ফর্ম্যাটে HLG বন্ধ করা থাকলে, HLG-এ কনভার্সন এটিকে আবার চালু করবে।"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"HDR10+-এ সবসময় কনভার্সন চালু করা"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"অ্যাডভান্সড ডিসপ্লে সেটিংসে HDR ফর্ম্যাটে HDR10+ বন্ধ করা থাকলে, HDR10+-এ কনভার্সন এটিকে আবার চালু করবে।"</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"SDR-এ সবসময় কনভার্সন চালু করা"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"SDR-এ কনভার্সন চালু করলে উন্নত ডিসপ্লে সেটিংসে সমস্ত HDR ফর্ম্যাট বন্ধ করবে।"</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"মিলে যাওয়া কন্টেন্টের ফ্রেম রেট"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"ডিফল্ট পছন্দ"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"নিরবচ্ছিন্ন"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"অ্যাপ অনুরোধ করলে, আপনি যে কন্টেন্ট দেখছেন তার প্রকৃত ফ্রেম রেটের সঙ্গে এর আউটপুট মেলানোর চেষ্টা ডিভাইস করবে, শুধুমাত্র যদি আপনার টিভি নিরবচ্ছিন্ন ট্রানজ্যাকশন করতে পারে।"</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"আপনার কানেক্ট করা ডিসপ্লেতে \'সিমলেস রিফ্রেশ রেট ট্রানজিশন\' বিকল্প কাজ করে না। কাজ করে এমন কোনও ডিসপ্লের সাথে কানেক্ট না করা পর্যন্ত এই বিকল্পের কোনও প্রভাব থাকবে না।"</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"সবসময়"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"নিরবচ্ছিন্ন নয়"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"অ্যাপ অনুরোধ করলে, আপনি যে কন্টেন্ট দেখছেন তার প্রকৃত ফ্রেম রেটের সঙ্গে এর আউটপুট মেলানোর চেষ্টা ডিভাইস করবে। এর ফলে চালু বা কোনও ভিডিও প্লেব্যাকে ঢুকলে আপনার স্ক্রিন এক সেকেন্ডের জন্য ফাঁকা হয়ে যেতে পারে।"</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"কখনই নয়"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"এমনকি অ্যাপও যদি অনুরোধ করে তাও, আপনি যে কন্টেন্ট দেখছেন কখনও তার প্রকৃত ফ্রেম রেটের সঙ্গে এর আউটপুট মেলানোর চেষ্টা ডিভাইস করবে না।"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"%1$s-এ রেজোলিউশন পরিবর্তন করবেন?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"এখন থেকে %1$s ব্যবহার করার জন্য \'ঠিক আছে\' বিকল্প বেছে নিন।"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s-এ Dolby Vision কাজ করে না এবং \"উন্নত ডিসপ্লে সেটিংস\" থেকে তা বন্ধ করে দেওয়া হবে"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"%1$s: এই মোডে কাজ করবে\nকিছু টিভিতে, আরও HDR ফর্ম্যাট চালু করতে, আপনাকে উন্নত HDMI চালু করতে হতে পারে। এটি কাজ করবে কিনা তা দেখতে, আপনার টিভির সেটিংস চেক করুন।"</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"%1$s এই মোডে কাজ করে। কিছু টিভিতে, আরও HDR ফর্ম্যাট চালু করতে, আপনাকে উন্নত HDMI চালু করতে হতে পারে। এটি কাজ করবে কিনা তা দেখতে, আপনার টিভি সেটিংস চেক করুন।"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"বাতিল করুন"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ঠিক আছে"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"ক্যাশে করা ডেটা সাফ করবেন?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"এটি সব অ্যাপ্লিকেশানগুলি থেকে ক্যাশে করা ডেটা সাফ করে দেবে।"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -263,7 +236,7 @@
     <string name="bluetooth_known_devices_category" msgid="6895470515631452961">"অ্যাক্সেসরি"</string>
     <string name="bluetooth_official_remote_category" msgid="5817814488268307170">"রিমোট কন্ট্রোল"</string>
     <string name="bluetooth_official_remote_entry_title" msgid="6699700335229570038">"রিমোট কন্ট্রোল সেটিংস"</string>
-    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"রিমোটের বোতাম সেট-আপ করুন"</string>
+    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"রিমোটের বোতাম সেটআপ করুন"</string>
     <string name="bluetooth_ir_entry_subtitle" msgid="4606207128353416151">"ভলিউম, পাওয়ার, টিভির ইনপুট, রিসিভার ও সাউন্ডবার কন্ট্রোল করুন"</string>
     <string name="bluetooth_connect_action_title" msgid="7715342395313781643">"কানেক্ট করুন"</string>
     <string name="bluetooth_connect_confirm" msgid="4769958536295137386">"%1$s-এ কানেক্ট করুন"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"আপনার প্রতিষ্ঠান এই ডিভাইসটি পরিচালনা করে।"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"এই ডিভাইসটি <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> দ্বারা পরিচালিত।"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"আরও জানুন"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{ক্যামেরা অ্যাপ}one{ক্যামেরা অ্যাপ}other{ক্যামেরা অ্যাপ}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"ক্যালেন্ডার অ্যাপ"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"দেখার সময় ডিসপ্লে যাতে বন্ধ না হয়ে যায় তা নিশ্চিত করুন, এর জন্য ব্যাটারি বেশি খরচ হওয়ার সম্ভাবনা আছে।"</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"অ্যাক্টিভ না থাকার সময়"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"দেখার সময়"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"অটোমেটিক বন্ধ হয়ে যায়"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"চালু না থাকলে অটোমেটিক বন্ধ হয়ে যায়"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"দেখার সময় অটোমেটিক বন্ধ হয়ে যায়"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"টিভি অটোমেটিক বন্ধ করুন"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"কিছুক্ষণ অ্যাক্টিভ না থাকলে টিভি অটোমেটিক বন্ধ করা"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"দেখার সময় টিভি অটোমেটিক বন্ধ করা"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"বন্ধ থাকার সময়\" টাইমার অবশ্যই \"দেখার সময়\" টাইমারের চেয়ে কম হওয়া উচিত"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"দেখার সময়\" টাইমার অবশ্যই \"বন্ধ থাকার সময়\" টাইমারের চেয়ে দীর্ঘ হওয়া উচিত"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"\'স্ট্যান্ডবাই\' মোডে নেটওয়ার্ক কানেকশন সীমিত করা"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"চালু হওয়ার সময় যা যা হবে"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"রিসেট করুন"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"ইথারনেট পেয়ারিং কোড"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"পাওয়ার মোড"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"টিভি ব্যবহার না হলে পাওয়ার দক্ষতা উন্নত করুন"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"চালু করে:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"মনে রাখবেন যে এই মোড ডিভাইসের শক্তি খরচ বাড়াতে পারে।"</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" চালু করুন"</string>
 </resources>
diff --git a/Settings/res/values-bs/energy-modes.xml b/Settings/res/values-bs/energy-modes.xml
deleted file mode 100644
index f570b036a..000000000
--- a/Settings/res/values-bs/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Osnovne funkcije mreže"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Niska potrošnja energije"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Isključite mrežnu vezu kada se TV ne koristi."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Ključna ažuriranja i funkcije"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Preporučene funkcije mreže"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimizirana potrošnja energije"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Uključuje funkcije koje bude TV putem mreže (mreža u stanju mirovanja)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Umetni funkciju 1]"</item>
-    <item msgid="8724721267222341891">"[Umetni funkciju 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Dodatne funkcije mreže"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Povećana potrošnja energije"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Uz preporučene funkcije ova opcija uključuje dodatne funkcije kada se TV ne koristi, koje mogu povećati potrošnju energije."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Umetni funkciju 1]"</item>
-    <item msgid="170760143032597722">"[Umetni funkciju 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-bs/strings.xml b/Settings/res/values-bs/strings.xml
index 3e069fd5f..45c488c6a 100644
--- a/Settings/res/values-bs/strings.xml
+++ b/Settings/res/values-bs/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Sigurnosna kopija i vraćanje"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Vraćanje na fabričke postavke"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibracija"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Tajmer za isključivanje"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Postavite tajmere za isključivanje TV-a i uštedite energiju"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Napajanje i energija"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Eko postavke"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Uređaji"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Odabir formata"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Napredne postavke zvuka"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Dozvolite način rada za igre"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Prilagodi dinamičkom rasponu sadržaja"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Kada omogućite ovu opciju, sistem će izmjenjivati različite formate dinamičkog raspona da se podudara sa sadržajem. Ovo može uzrokovati crni ekran tokom promjene formata.\n\nKliknite na Napredne postavke ekrana za više opcija dinamičkog raspona."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Preferirani dinamički raspon"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Konverzija prema preferenciji sistema"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Omogućava sistemu da upravlja konverzijom formata"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Kada je ova opcija odabrana, sistem će utvrditi prikladni dinamički raspon koji će se slati na ekran i konvertirati sadržaj u ovaj dinamički raspon prema potrebi."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Uvijek se podudara s formatom sadržaja"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Prisilno izvrši konverziju"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Prisilno izvršava konverziju u željeni format"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Prisilno izvršite konverziju u željeni format. Prisilno izvršenje konverzije može uticati na druge postavke u Načinu rada ekrana ili Formatu HDR-a."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Uvijek u standardni dinamički raspon (Standard Dynamic Range, SDR)"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Uvijek u <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Želite li prisilno aktivirati izlaz visokog dinamičkog raspona (High Dynamic Range, HDR)?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Prema zadanim postavkama konverzija će se prisilno izvršiti u <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Ekran će raditi u rezoluciji od 1080 p na 60 Hz. Ova opcija nije kompatibilna s ekranom kada radi u rezoluciji 4K na 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision nije podržan u trenutnoj rezoluciji. Ako ručno omogućite Dolby Vision, rezolucija ekrana će se promijeniti u 1080 p 60 Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Promijeniti rezoluciju u 1080 p 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Uvijek nametni konverziju u Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Ako je Dolby Vision onemogućen u HDR formatima u Naprednim postavkama ekrana, nametanje konverzije u Dolby Vision će ga ponovo omogućiti."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Uvijek nametni konverziju u HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Ako je HDR10 onemogućen u HDR formatima u Naprednim postavkama ekrana, nametanje konverzije u HDR10 će ga ponovo omogućiti."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Uvijek nametni konverziju u HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Ako je HLG onemogućen u HDR formatima u Naprednim postavkama ekrana, nametanje konverzije u HLG će ga ponovo omogućiti."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Uvijek nametni konverziju u HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Ako je HDR10+ onemogućen u HDR formatima u Naprednim postavkama ekrana, nametanje konverzije u HDR10+ će ga ponovo omogućiti."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Uvijek nametni konverziju u SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Nametanje konverzije u SDR će onemogućiti sve formate u HDR formatima u Naprednim postavkama ekrana."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Podudaranje s brojem slika u sekundi sadržaja"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Samo bez prekida"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Bez prekida"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Ako to aplikacija bude zahtijevala, vaš uređaj će prilagoditi izlaz originalnom broju slika u sekundi za sadržaj koji gledate SAMO ako vaš TV može izvršiti prijelaz bez prekida."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Vaš povezani ekran ne podržava prijelaze između učestalosti osvježavanja bez prekida. Ova opcija se neće primijeniti dok se ne prebacite na ekran koji je podržava."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Uvijek"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"S prekidima"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Ako to aplikacija bude zahtijevala, vaš uređaj će prilagoditi izlaz originalnom broju slika u sekundi za sadržaj koji gledate. Zbog toga se vaš ekran može isključiti na sekundu prilikom izlaza ili pristupanja reprodukciji videozapisa."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Nikada"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Čak i ako aplikacija to bude zahtijevala, uređaj nikad neće pokušati prilagoditi izlaz originalnom broju slika u sekundi za sadržaj koji gledate."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Promijeniti rezoluciju u %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Odaberite Uredu da ubuduće koristite %1$s."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision nije podržan na %1$s i onemogućit će se u meniju \"Napredne postavke ekrana\""</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Ovaj način rada podržava: %1$s\nna nekim TV-ima možda ćete morati uključiti Poboljšani HDMI da omogućite više HDR formata. Provjerite postavke TV-a da vidite je li ovo podržano."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Ovaj način rada podržava %1$s. Na nekim TV-ima ćete možda morati uključiti Poboljšani HDMI da omogućite više HDR formata. Provjerite postavke TV-a da vidite je li ovo podržano."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Otkaži"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Uredu"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Želite li obrisati keširane podatke?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Ovim će se obrisati keširani podaci za sve aplikacije."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -263,7 +236,7 @@
     <string name="bluetooth_known_devices_category" msgid="6895470515631452961">"Periferni uređaji"</string>
     <string name="bluetooth_official_remote_category" msgid="5817814488268307170">"Daljinski upravljač"</string>
     <string name="bluetooth_official_remote_entry_title" msgid="6699700335229570038">"Postavke daljinskog upravljača"</string>
-    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"Postavljanje dugmadi daljinskog upravljača"</string>
+    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"Postavite dugmad daljinskog upravljača"</string>
     <string name="bluetooth_ir_entry_subtitle" msgid="4606207128353416151">"Kontrolirajte jačinu zvuka, uključivanje, ulaz na TV-ima, prijemnicima i soundbar zvučnicima"</string>
     <string name="bluetooth_connect_action_title" msgid="7715342395313781643">"Poveži"</string>
     <string name="bluetooth_connect_confirm" msgid="4769958536295137386">"Povezivanje s uređajem %1$s"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Ovim uređajem upravlja vaša organizacija."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Ovim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Saznajte više"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplikacija za kameru}one{Aplikacije za kameru}few{Aplikacije za kameru}other{Aplikacije za kameru}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplikacija za kalendar"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Potvrdite kako biste spriječili da se ekran isključi tokom gledanja, što može povećati potrošnju energije."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Tokom neaktivnosti"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Tokom gledanja"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Automatski isključi"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Automatski isključi kad je neaktivno"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Automatski isključi tokom gledanja"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Automatski isključite TV"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Automatski isključite TV kada nije aktivan"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Automatski isključite TV kada gledate"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Tajmer \"Tokom gledanja\" mora kraće trajati od tajmera \"Kada je ne neaktivno\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Tajmer \"Tokom gledanja\" mora duže trajati od tajmera \"Tokom neaktivnosti\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Ograniči mrežnu vezu u stanju mirovanja"</string>
@@ -1039,7 +1013,7 @@
     <string name="permit_manage_external_storage" msgid="1776899171934627417">"Dozvoli pristup za upravljanje svim fajlovima"</string>
     <string name="allow_manage_external_storage_description" msgid="4288250228151617611">"Dozvolite ovoj aplikaciji da čita, mijenja i briše sve fajlove na ovom uređaju ili svim povezanim uređajima za pohranu. Ako to dozvolite, aplikacija može pristupati fajlovima bez vašeg znanja."</string>
     <string name="picture_in_picture_title" msgid="2636935591386702348">"Slika u slici"</string>
-    <string name="picture_in_picture_app_detail_switch" msgid="3688997906817583854">"Dozvoli sliku u slici"</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="3688997906817583854">"Dozvoli način rada slike u slici"</string>
     <string name="picture_in_picture_empty_text" msgid="4370198922852736600">"Nijedna instalirana aplikacija ne podržava način rada slike u slici"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="3296649114939705896">"Dozvolite aplikacijama da kreiraju prozor u načinu rada Slika u slici dok je aplikacija otvorena ili nakon što je napustite (npr. da nastavite gledati videozapis). Ovaj prozor se prikazuje preko drugih aplikacija koje koristite."</string>
     <string name="alarms_and_reminders_description" msgid="4063972350154624500">"Dozvolite aplikacijama da postavljaju alarme i zakazuju vremenski osjetljive radnje. Ovim će se omogućiti aplikacijama da rade u pozadini, čime se može povećati potrošnja energije.\n\nAko je ovo odobrenje isključeno, postojeći alarmi i događaji zasnovani na vremenu koje je aplikacija zakazala neće funkcionirati."</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Ponašanje prilikom uključivanja"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Vraćanje na zadano"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Kôd za uparivanje za Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Načini korištenja energije"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Poboljšajte energetsku učinkovitost kada se TV ne koristi"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Omogućava:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Imajte na umu da ovaj način rada može povećati potrošnju energije uređaja."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Omogućite \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/Settings/res/values-ca/energy-modes.xml b/Settings/res/values-ca/energy-modes.xml
deleted file mode 100644
index c62e4f6d5..000000000
--- a/Settings/res/values-ca/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Funcions de xarxa essencials"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Consum energètic baix"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Desactiva la connexió a la xarxa quan el televisor no es fa servir."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Actualitzacions i funcions importants"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Funcions de xarxa recomanades"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Consum energètic optimitzat"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Activa funcions que activen el televisor a través de la xarxa (mode d\'espera en xarxa)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Funcions de xarxa addicionals"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Augment del consum energètic"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"A més de les funcions recomanades, aquesta opció activa funcions addicionals que poden augmentar el consum energètic quan el televisor no es fa servir."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-ca/strings.xml b/Settings/res/values-ca/strings.xml
index ee5948103..b9a85593b 100644
--- a/Settings/res/values-ca/strings.xml
+++ b/Settings/res/values-ca/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Còpia de seguretat i restauració"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Restabliment de les dades de fàbrica"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Calibratge"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Temporitzador d\'apagament"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Configura temporitzadors per apagar el televisor i estalviar energia"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Potència i energia"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Configuració ecològica"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Dispositius"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Selecciona els formats"</string>
@@ -151,39 +151,12 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Configuració avançada del so"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Permet el mode de joc"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Iguala amb el rang dinàmic del contingut"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"En activar aquesta opció, el sistema canviarà entre els diferents formats de rang dinàmic per igualar-lo amb el del contingut. És possible que la pantalla es torni negra durant el canvi de format.\n\nFes clic a Configuració avançada de la pantalla per a més opcions de rang dinàmic."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Rang dinàmic preferit"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Conversió preferida pel sistema"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Permet que el sistema gestioni la conversió del format"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"En seleccionar aquesta opció, el sistema determinarà un rang dinàmic adequat perquè s\'enviï a la teva pantalla i converteixi el contingut en aquest rang dinàmic segons calgui."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Sempre coincideix amb el format del contingut"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Força la conversió"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Força la conversió a un format preferit"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Força la conversió a un format preferit. Aquesta acció pot afectar altres opcions de configuració del mode de visualització o del format HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Sempre a SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Sempre a <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Vols forçar la sortida HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"De manera predeterminada, la conversió es forçarà a <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"La pantalla s\'executarà amb una resolució de 1080p a 60Hz. Aquesta opció no és compatible amb la teva pantalla quan s\'executa amb una resolució de 4K a 60Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision no s\'admet amb la resolució actual. Si actives Dolby Vision manualment, es canviarà a una resolució de pantalla de 1080p a 60 Hz."</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Vols canviar a una resolució de 1080p a 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Força sempre la conversió a Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Si Dolby Vision no està activat als formats HDR de la configuració avançada de la pantalla, forçant la conversió a Dolby Vision es tornarà a activar."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Força sempre la conversió a HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Si HDR10 no està activat als formats HDR de la configuració avançada de la pantalla, forçant la conversió a HDR10 es tornarà a activar."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Força sempre la conversió a HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Si HLG no està activat als formats HDR de la configuració avançada de la pantalla, forçant la conversió a HLG es tornarà a activar."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Força sempre la conversió a HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Si HDR10+ no està activat als formats HDR de la configuració avançada de la pantalla, forçant la conversió a HDR10+ es tornarà a activar."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Força sempre la conversió a SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Si forces la conversió a SDR, es desactivaran tots els formats als formats HDR de la configuració avançada de la pantalla."</string>
-    <string name="match_content_frame_rate_title" msgid="153291168560947689">"Fes coincidir amb els FPS del contingut"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Només transicions fluides"</string>
+    <string name="match_content_frame_rate_title" msgid="153291168560947689">"Adapta als fotogrames per segon del contingut"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Transició continua"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Si l\'aplicació ho sol·licita, el dispositiu mostrarà el contingut que estàs mirant amb els fotogrames per segon del vídeo original, NOMÉS si el televisor pot efectuar una transició continua."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"La pantalla connectada no admet transicions amb una freqüència d\'actualització sense interrupcions. Aquesta opció no tindrà efecte tret que canviïs a una pantalla compatible."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Sempre"</string>
-    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Si l\'aplicació ho sol·licita, el dispositiu farà coincidir la sortida amb els fotogrames per segon originals del contingut que estàs mirant. Això pot provocar que la pantalla es quedi en blanc un segon en entrar a la reproducció d\'un vídeo o sortir-ne."</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Transició no continua"</string>
+    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Si l\'aplicació ho sol·licita, el dispositiu mostrarà el contingut que estàs mirant amb els fotogrames per segon del vídeo original. Això pot provocar que la pantalla es quedi en blanc un segon en entrar a la reproducció d\'un vídeo o sortir-ne."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Mai"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Encara que l\'aplicació ho sol·liciti, el dispositiu mai no provarà de mostrar el contingut que estàs mirant amb els fotogrames per segon del vídeo original."</string>
     <string name="font_scale_settings_title" msgid="4114019544800225980">"Ajust del text"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Vols canviar la resolució a %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Selecciona D\'acord per utilitzar %1$s a partir d\'ara."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision no s\'admet a %1$s i es desactivarà a Configuració avançada de la pantalla"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Aquest mode admet: %1$s\nEn alguns televisors, és possible que hagis d\'activar l\'HDMI millorat per tenir disponibles més formats HDR. Comprova la configuració del televisor per veure si és compatible."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Aquest mode admet %1$s. En alguns televisors, és possible que hagis d\'activar l\'HDMI millorat per tenir disponibles més formats HDR. Comprova la configuració del televisor per veure si és compatible."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Cancel·la"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"D\'acord"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Vols esborrar dades emmagatzem. a memòria cau?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"S\'esborraran dades aplicacions a la memòria cau."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -273,7 +246,7 @@
     <string name="bluetooth_rename" msgid="7791922876280337194">"Canvia el nom del dispositiu connectat"</string>
     <string name="bluetooth_forget_action_title" msgid="2351140076684719196">"Oblida"</string>
     <string name="bluetooth_forget_confirm" msgid="5175414848391021666">"Oblida el dispositiu %1$s"</string>
-    <string name="bluetooth_serial_number_label" msgid="6639294603220209971">"Adreça de Bluetooth"</string>
+    <string name="bluetooth_serial_number_label" msgid="6639294603220209971">"Adreça Bluetooth"</string>
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Connectat"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Desconnectat"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"No tens permís per canviar la configuració del Bluetooth."</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"La teva organització gestiona aquest dispositiu."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> gestiona aquest dispositiu."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Més informació"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplicació de càmera}other{Aplicacions de càmera}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplicació de calendari"</string>
@@ -402,7 +376,7 @@
     <string name="device_status_title" msgid="9051569510258883673">"Estat"</string>
     <string name="battery_status_title" msgid="8850166742025222210">"Estat de la bateria"</string>
     <string name="battery_level_title" msgid="2672804570916248736">"Nivell de la bateria"</string>
-    <string name="status_bt_address" msgid="7190052214963950844">"Adreça de Bluetooth"</string>
+    <string name="status_bt_address" msgid="7190052214963950844">"Adreça Bluetooth"</string>
     <string name="status_up_time" msgid="1758102680983108313">"Temps d\'activitat"</string>
     <string name="legal_information" msgid="1087445528481370874">"Informació legal"</string>
     <string name="copyright_title" msgid="5879660711078649518">"Drets d\'autor"</string>
@@ -783,8 +757,8 @@
     <string name="system_show_hardware_layer" msgid="5833664339844452290">"Mostra la capa de programari"</string>
     <string name="system_show_gpu_overdraw" msgid="5073007513540516704">"Mostra el sobredibuix de la GPU"</string>
     <string name="system_show_surface_updates" msgid="7680759813613585278">"Mostra els canvis de superfície"</string>
-    <string name="system_window_animation_scale" msgid="685477540250939659">"Escala d\'animació de la finestra"</string>
-    <string name="system_transition_animation_scale" msgid="7266380208347453619">"Escala d\'animació de la transició"</string>
+    <string name="system_window_animation_scale" msgid="685477540250939659">"Escala de l\'animació de la finestra"</string>
+    <string name="system_transition_animation_scale" msgid="7266380208347453619">"Escala de l\'animació de transició"</string>
     <string name="system_animator_duration_scale" msgid="3829445237130423625">"Escala de durada de l\'animació"</string>
     <string name="system_strict_mode_enabled" msgid="7392183793064579588">"Mode estricte activat"</string>
     <string name="system_profile_gpu_rendering" msgid="1113416260742329348">"Perfil de representació de GPU"</string>
@@ -803,7 +777,7 @@
     <string name="system_desc_show_hardware_layer" msgid="3483713991865249527">"Il·lumina capes de maquinari en verd en actualitzar-se"</string>
     <string name="system_desc_show_gpu_overdraw" msgid="74019834911598588">"De millor a pitjor: blau, verd, vermell clar, vermell"</string>
     <string name="system_desc_show_surface_updates" msgid="4018685547515133353">"Il·lumina superfície de finestres en actualitzar-se"</string>
-    <string name="system_desc_strict_mode_enabled" msgid="1974896408481676324">"Il·lumina la pantalla quan les aplicacions facin operacions llargues al fil principal"</string>
+    <string name="system_desc_strict_mode_enabled" msgid="1974896408481676324">"Il·lumina si aplicacions tarden molt al procés principal"</string>
     <string name="system_desc_profile_gpu_rendering" msgid="1594070211030991">"Mesura temps represen. a adb shell dumpsys gfxinfo"</string>
     <string name="security_unknown_sources_title" msgid="2012801664240314305">"Fonts desconegudes"</string>
     <string name="security_unknown_sources_desc" msgid="7196715598352173267">"Permet instal·lar aplicacions que no siguin de Play Store"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Confirma que vols evitar que la pantalla es desactivi mentre mires contingut, cosa que pot incrementar l\'ús d\'energia."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Mentre estigui inactiu"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Mentre estigui mirant contingut"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Desactiva automàticament"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Desactiva automàticament quan es detecti inactivitat"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Desactiva automàticament quan s\'estigui veient"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Desactiva el televisor automàticament"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Desactiva el televisor automàticament quan estigui inactiu"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Desactiva el televisor automàticament en mirar"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"El temporitzador Mentre estigui inactiu ha de durar menys que el temporitzador Mentre estigui mirant contingut"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"El temporitzador Mentre estigui mirant contingut ha de durar més que el temporitzador Mentre estigui inactiu"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Limita la connexió a la xarxa en espera"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Activa el comportament"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Restableix"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Codi de sincronització d\'Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Modes d\'energia"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Millora l\'eficiència energètica quan el televisor no es fa servir"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Activa:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Tingues en compte que aquest mode pot augmentar el consum d\'energia del dispositiu."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Activa <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
 </resources>
diff --git a/Settings/res/values-cs/energy-modes.xml b/Settings/res/values-cs/energy-modes.xml
deleted file mode 100644
index 447863836..000000000
--- a/Settings/res/values-cs/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Základní síťové funkce"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Nízká spotřeba energie"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Vypnout připojení k síti, když televizi nikdo nepoužívá."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Důležité aktualizace a funkce"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Doporučené síťové funkce"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimalizovaná spotřeba energie"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Zapne funkce, které televizi probudí přes síť (pohotovostní režim s připojením k síti)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Vložit funkci 1]"</item>
-    <item msgid="8724721267222341891">"[Vložit funkci 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Další síťové funkce"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Zvýšená spotřeba energie"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Tato možnost zapíná kromě doporučených funkcí také další funkce, což může vést k vyšší spotřebě energie, když televize není používána."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Vložit funkci 1]"</item>
-    <item msgid="170760143032597722">"[Vložit funkci 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-cs/strings.xml b/Settings/res/values-cs/strings.xml
index c46e4971b..e87d796c7 100644
--- a/Settings/res/values-cs/strings.xml
+++ b/Settings/res/values-cs/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Zálohování a obnovení"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Obnovení továrních dat"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibrace"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Časovač vypnutí"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Nastavte časovače, které vypnout televizi za účelem úspory energie"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Výkon a energie"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Nastavení Eko"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Zařízení"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Vybrat formáty"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Rozšířená nastavení zvuku"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Povolit herní režim"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Sladit dynamický rozsah obsahu"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Když povolíte tuto možnost, systém bude přepínat mezi různými formáty dynamického rozsahu podle obsahu. Při přepínání formátu může obrazovka zčernat.\n\nDalší možnosti dynamického rozsahu najdete v sekci Rozšířená nastavení obrazu."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Preferovaný dynamický rozsah"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Převod preferovaný systémem"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Nechá správu převodu formátu na systému"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Když je vybrána tato možnost, určí systém vhodný dynamický rozsah k odeslání na váš displej, a podle potřeby obsah převede do tohoto dynamického rozsahu."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Vždy odpovídá formátu obsahu"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Vynutit převod"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Vynutí převod do preferovaného formátu"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Vynutit převod do preferovaného formátu. Vynucení převodu může mít dopad na další nastavení v sekci Režim zobrazení nebo Formát HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Vždy do SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Vždy do <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Chcete vynutit výstup HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Ve výchozím nastavení bude vynucen převod do formátu <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Váš displej poběží v rozlišení 1080p 60 Hz. Tato možnost není kompatibilní s vaším displejem při rozlišení 4k 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Formát Dolby Vision v aktuálním rozlišení není podporován. Pokud ho aktivujete ručně, rozlišení obrazovky se změní na 1080p, 60 Hz."</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Změnit rozlišení na 1080p, 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Vždy vynutit převod na Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Pokud je standard Dolby Vision ve formátech HDR v sekci Rozšířená nastavení obrazu zakázán, vynucení převodu na Dolby Vision jej znovu povolí."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Vždy vynutit převod na HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Pokud je standard HDR10 ve formátech HDR v sekci Rozšířená nastavení obrazu zakázán, vynucení převodu na HDR10 jej znovu povolí."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Vždy vynutit konverzi na HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Pokud je standard HLG ve formátech HDR v sekci Rozšířená nastavení obrazu zakázán, vynucení převodu na HLG jej znovu povolí."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Vždy vynutit převod na HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Pokud je standard HDR10 ve formátech HDR v sekci Rozšířená nastavení obrazu zakázán, vynucení převodu na HDR10 jej znovu povolí."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Vždy vynutit převod na SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Vynucení převodu na SDR deaktivuje všechny formáty ve formátech HDR v sekci Rozšířená nastavení zobrazení."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Sladit snímkovou frekvenci obsahu"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Pouze plynulé"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Synchronizované"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Zařízení se pokusí srovnat svůj výstup s původní snímkovou frekvencí sledovaného obsahu (pokud o to aplikace požádá a POUZE v případě, že vaše televize podporuje plynulý přechod na synchronizované zobrazení)."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Připojený displej nepodporuje přechod na synchronizovanou obnovovací frekvenci. Možnost nebude mít žádný efekt, dokud nepřepnete na displej, který funkci podporuje."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Vždy"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Nesynchronizované"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Zařízení se pokusí srovnat svůj výstup s původní snímkovou frekvencí sledovaného obsahu (pokud o to aplikace požádá). V důsledku toho se může obrazovka při zahájení nebo ukončení přehrávání videa na chviličku vypnout."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Nikdy"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Zařízení se nikdy nebude pokoušet srovnat svůj výstup s původní snímkovou frekvencí sledovaného obsahu (ani pokud o to aplikace požádá)."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Změnit rozlišení na %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Pokud chcete od teď používat rozlišení %1$s, vyberte OK"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision není při rozlišení %1$s podporováno a v „Rozšířených nastaveních obrazu“ bude deaktivováno"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Tento režim podporuje rozlišení: %1$s.\nNa některých televizích můžete zapnout vylepšené HDMI a zpřístupnit si tak další formáty HDR. V nastavení televize ověříte, zda je tato možnost podporována."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Tento režim podporuje rozlišení %1$s. Na některých televizích můžete zapnout vylepšené HDMI a zpřístupnit si tak další formáty HDR. V nastavení televize ověříte, zda je tato možnost podporována."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Zrušit"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Vymazat data uložená v mezipaměti?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Tímto vymažete z mezipaměti data všech aplikací."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -263,7 +236,7 @@
     <string name="bluetooth_known_devices_category" msgid="6895470515631452961">"Příslušenství"</string>
     <string name="bluetooth_official_remote_category" msgid="5817814488268307170">"Dálkové ovládání"</string>
     <string name="bluetooth_official_remote_entry_title" msgid="6699700335229570038">"Nastavení dálkového ovládání"</string>
-    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"Nastavení tlačítek dálkového ovládání"</string>
+    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"Nastavení vzdálených tlačítek"</string>
     <string name="bluetooth_ir_entry_subtitle" msgid="4606207128353416151">"Ovládání hlasitosti, vstupu a napájení televizorů, přijímačů a soundbarů"</string>
     <string name="bluetooth_connect_action_title" msgid="7715342395313781643">"Připojit"</string>
     <string name="bluetooth_connect_confirm" msgid="4769958536295137386">"Připojit k zařízení %s"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Toto zařízení spravuje vaše organizace."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Toto zařízení je spravováno organizací <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Další informace"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplikace k focení a natáčení}few{Aplikace k focení a natáčení}many{Aplikace k focení a natáčení}other{Aplikace k focení a natáčení}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Kalendářová aplikace"</string>
@@ -401,7 +375,7 @@
     <string name="status_unavailable" msgid="2033933928980193334">"Nedostupné"</string>
     <string name="device_status_title" msgid="9051569510258883673">"Stav"</string>
     <string name="battery_status_title" msgid="8850166742025222210">"Stav baterie"</string>
-    <string name="battery_level_title" msgid="2672804570916248736">"Stav baterie"</string>
+    <string name="battery_level_title" msgid="2672804570916248736">"Nabití baterie"</string>
     <string name="status_bt_address" msgid="7190052214963950844">"Adresa Bluetooth"</string>
     <string name="status_up_time" msgid="1758102680983108313">"Doba provozu"</string>
     <string name="legal_information" msgid="1087445528481370874">"Právní informace"</string>
@@ -423,7 +397,7 @@
     <string name="title_signal_strength" msgid="5047116893338315998">"Síla signálu"</string>
     <string name="title_random_mac_settings" msgid="6685812569356353378">"Soukromí"</string>
   <string-array name="random_mac_settings_entries">
-    <item msgid="3457228452595715533">"Používat náhodnou adresu MAC (výchozí nastavení)"</item>
+    <item msgid="3457228452595715533">"Používat randomizovanou adresu MAC (výchozí)"</item>
     <item msgid="2490415280467390067">"Používat adresu MAC zařízení"</item>
   </string-array>
     <string name="mac_address_not_available" msgid="2992935344891853369">"Nedostupné"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Potvrďte, že se displej při sledování nemá vypínat (může to vést k vyšší spotřebě energie)."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Při neaktivitě"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Při sledování"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Automaticky vypnout"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Při neaktivitě automaticky vypnout"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Při sledování automaticky vypnout"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Automaticky vypnout televizi"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Při neaktivitě automaticky vypnout televizi"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Při sledování automaticky vypnout televizi"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Časovač „Při neaktivitě“ musí být kratší než časovač „Při sledování“"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Časovač „Při sledování“ musí být delší než časovač „Při neaktivitě“"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Omezit připojení v pohotovostním režimu"</string>
@@ -1045,7 +1019,7 @@
     <string name="alarms_and_reminders_description" msgid="4063972350154624500">"Povolte aplikacím nastavovat budíky a plánovat akce závislé na čase. Aplikace poběží na pozadí, což může vést k vyšší spotřebě energie.\n\nPokud je toto oprávnění vypnuté, stávající budíky a události závislé na čase naplánované aplikací nebudou fungovat."</string>
     <string name="turn_screen_on_title" msgid="5293798529284629011">"Zapnout obrazovku"</string>
     <string name="allow_turn_screen_on" msgid="4903401106871656521">"Povolit zapínání obrazovky"</string>
-    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Povolte aplikaci zapínat obrazovku. Pokud aplikace bude mít toto oprávnění, může kdykoli zapnout obrazovku bez požadavku uživatele."</string>
+    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Povolte aplikaci zapínat obrazovku. Pokud aplikace bude mít toto oprávnění, může kdykoli zapnout obrazovku bez explicitního intentu."</string>
     <string name="special_access" msgid="21806055758289916">"Zvláštní přístup aplikací"</string>
     <string name="string_concat" msgid="5213870180216051497">"<xliff:g id="PART1">%1$s</xliff:g>, <xliff:g id="PART2">%2$s</xliff:g>"</string>
     <string name="audio_category" msgid="6143623109624947993">"Zvuk"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Chování po zapnutí"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Obnovit"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Párovací kód pro ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Energetické režimy"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Snížit spotřebu energie, když televizi nikdo nepoužívá"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Zapne tyto funkce:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"V tomto režimu může zařízení spotřebovávat více energie."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Zapnout režim <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
 </resources>
diff --git a/Settings/res/values-da/energy-modes.xml b/Settings/res/values-da/energy-modes.xml
deleted file mode 100644
index fc7b7d627..000000000
--- a/Settings/res/values-da/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Vigtige netværksfunktioner"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Lavt energiforbrug"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Deaktiver netværksforbindelsen, når fjernsynet ikke er i brug"</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Vigtige opdateringer og funktioner"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Anbefalede netværksfunktioner"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimeret energiforbrug"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Aktiverer funktioner, der vækker fjernsynet via netværket (netværkstilsluttet standbytilstand)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Yderligere netværksfunktioner"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Øget energiforbrug"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Ud over de anbefalede funktioner aktiverer denne indstilling yderligere funktioner, når fjernsynet ikke er i brug, som kan øge energiforbruget."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-da/strings.xml b/Settings/res/values-da/strings.xml
index 3bd781c03..da50a10eb 100644
--- a/Settings/res/values-da/strings.xml
+++ b/Settings/res/values-da/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Sikkerhedskopiering og gendannelse"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Gendannelse af fabriksdata"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibrering"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Timer til slukning"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Indstil timere for at slukke fjernsynet og spare strøm"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Strøm og energi"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Eco-indstillinger"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Enheder"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Vælg formater"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Avancerede lydindstillinger"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Tillad spiltilstand"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Dynamisk område for matchet indhold"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Når du aktiverer denne mulighed, vil systemet skifte mellem forskellige dynamiske områdeformater for at matche indholdet. Dette kan medføre, at skærmen bliver sort under et formatskift.\n\nKlik på Avancerede skærmindstillinger for at se flere muligheder for dynamiske områder."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Foretrukket dynamisk område"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Systemforetrukken konvertering"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Lader systemet administrere konverteringen af formatet"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Når denne mulighed er valgt, fastlægger systemet et passende dynamisk interval, som sendes til din skærm, og konverterer indholdet i overensstemmelse med dette dynamiske interval efter behov."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Matcher altid indholdets format"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Gennemtving konvertering"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Gennemtvinger konvertering til foretrukket format"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Gennemtving konvertering til et foretrukket format. Når du gennemtvinger konvertering, kan det påvirke andre indstillinger i Skærmtilstand eller HDR-format."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Altid til SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Altid til <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Vil du gennemtvinge HDR-output?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Som standard gennemtvinges konverteringen til <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Din skærm vil køre med en opløsning på 1080p 60 Hz. Denne valgmulighed er ikke kompatibel med din skærm, når den kører med en opløsning på 4K 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision understøttes ikke i den nuværende opløsning. Hvis du aktiverer Dolby Vision manuelt, ændres opløsningen på din skærm til 1080p 60 Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Vil du ændre opløsning til 1080p 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Gennemtving altid konvertering til Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Hvis Dolby Vision er deaktiveret under HDR-formaterne i de avancerede skærmindstillinger, vil tvungen konvertering til Dolby Vision genaktivere formatet."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Gennemtving altid konvertering til HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Hvis HDR10 er deaktiveret under HDR-formaterne i de avancerede skærmindstillinger, vil tvungen konvertering til HDR10 genaktivere formatet."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Gennemtving altid konvertering til HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Hvis HLG er deaktiveret under HDR-formaterne i de avancerede skærmindstillinger, vil tvungen konvertering til HLG genaktivere formatet."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Gennemtving altid konvertering til HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Hvis HDR10+ er deaktiveret under HDR-formaterne i de avancerede skærmindstillinger, vil tvungen konvertering til HDR10+ genaktivere formatet."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Gennemtving altid konvertering til SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Hvis du gennemtvinger konvertering til SDR, deaktiveres alle formater under HDR-formaterne i de avancerede skærmindstillinger."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Match indholdets billedfrekvens"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Kun overgang uden sort skærm"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Problemfri"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Hvis appen anmoder om det, justerer din enhed outputtet efter den oprindelige billedfrekvens for det indhold, du ser. Dette kan KUN gennemføres, hvis dit fjernsyn kan udføre en problemfri overgang."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Din forbundne skærm understøtter ikke overgangsfri ændring af opdateringshastigheden. Denne indstilling har ingen effekt, medmindre du skifter til en skærm, der understøtter dette."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Altid"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Ikke problemfri"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Hvis appen anmoder om det, justerer din enhed outputtet efter den oprindelige billedfrekvens for det indhold, du ser. Dette kan medføre, at din skærm bliver sort i et sekunds tid, når du afslutter eller starter en videoafspilning."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Aldrig"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Selvom appen anmoder om det, forsøger din enhed aldrig at justere outputtet efter den oprindelige billedfrekvens for det indhold, du ser."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Vil du skifte opløsning til %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Vælg OK for at bruge %1$s fremover."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision understøttes ikke med %1$s og deaktiveres under \"Avancerede skærmindstillinger\""</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Denne tilstand understøtter: %1$s\nPå visse fjernsyn kan det være nødvendigt at aktivere Forbedret HDMI for at få flere HDR-formater. Tjek dit fjernsyns indstillinger for at se, om denne funktion understøttes."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Denne tilstand understøtter %1$s. På nogle fjernsyn skal du muligvis aktivere forbedret HDMI for at aktivere flere HDR-formater. Tjek dit fjernsyns indstillinger for at se, om dette understøttes."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Annuller"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Vil du rydde cachelagrede data?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Dette vil rydde cachelagrede data for alle apps."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Denne enhed administreres af din organisation."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Denne enhed administreres af <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Få flere oplysninger"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kameraapp}one{Kameraapp}other{Kameraapps}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Kalenderapp"</string>
@@ -772,7 +746,7 @@
     <string name="system_allow_mock_locations" msgid="2483106887711851466">"Tillad imiterede lokationer"</string>
     <string name="system_select_debug_app" msgid="6200987902307533721">"Vælg app til fejlretning"</string>
     <string name="system_wait_for_debugger" msgid="5715878008542589060">"Vent på fejlfinder"</string>
-    <string name="system_verify_apps_over_usb" msgid="7289212844195483932">"Verificer apps via USB"</string>
+    <string name="system_verify_apps_over_usb" msgid="7289212844195483932">"Bekræft apps via USB"</string>
     <string name="system_desc_verify_apps_over_usb" msgid="7737988681480237094">"Tjek om apps, der er installeret via ADB/ADT, har skadelig adfærd"</string>
     <string name="system_wifi_verbose_logging" msgid="3097788974146704831">"Detaljeret Wi-Fi-logføring"</string>
     <string name="system_desc_wifi_verbose_logging" msgid="3537578245428327314">"Aktivér detaljeret Wi-Fi-logføring"</string>
@@ -961,9 +935,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Bekræft, at du vil forhindre skærmen i at slukke under afspilning. Det kan øge energiforbruget."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Ved inaktivitet"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Under afspilning"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Sluk automatisk"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Sluk automatisk ved inaktivitet"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Sluk automatisk under afspilning"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Sluk fjernsynet automatisk"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Sluk automatisk fjernsynet, når det er inaktivt"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Sluk automatisk fjernsynet, når du ser noget på det"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Timeren for \"Ved inaktivitet\" skal være kortere end timeren for \"Under afspilning\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Timeren for \"Under afspilning\" skal være længere end timeren for \"Ved inaktivitet\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Begræns netværksforbindelsen i standby"</string>
@@ -1119,9 +1093,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Adfærd, når fjernsynet tændes"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Nulstil"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Ethernet-parringskode"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Energitilstande"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Optimer energiforbruget, når fjernsynet ikke er i brug"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Aktiverer:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Vær opmærksom på, at denne tilstand kan øge energiforbruget på enheden."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Aktivér \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/Settings/res/values-de/energy-modes.xml b/Settings/res/values-de/energy-modes.xml
deleted file mode 100644
index 508d999c4..000000000
--- a/Settings/res/values-de/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Grundlegende Netzwerkfunktionen"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Niedrigerer Stromverbrauch"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Netzwerkverbindung deaktivieren, wenn der Fernseher nicht verwendet wird."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Wichtige Updates und Funktionen"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Empfohlene Netzwerkfunktionen"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimierter Stromverbrauch"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Aktiviert Funktionen, durch die der Ruhemodus des Fernsehers über das Netzwerk beendet werden kann (Bereitschaftsbetrieb)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Zusätzliche Netzwerkfunktionen"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Höherer Stromverbrauch"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Durch diese Option werden neben empfohlenen Funktionen zusätzliche Funktionen aktiviert, durch die der Stromverbrauch steigen kann, wenn der Fernseher nicht verwendet wird."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-de/strings.xml b/Settings/res/values-de/strings.xml
index 8ecd202f7..c68c66358 100644
--- a/Settings/res/values-de/strings.xml
+++ b/Settings/res/values-de/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Sicherung &amp; Wiederherstellung"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Zurücksetzen auf Werkseinstellungen"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibrierung"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Timer zum Ausschalten"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Timer einrichten, um den Fernseher auszuschalten und Energie zu sparen"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Stromversorgung und Energie"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Stromspareinstellungen"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Geräte"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Formate auswählen"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Erweiterte Toneinstellungen"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Spielmodus zulassen"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Inhalte an dynamischen Bereich anpassen"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Wenn du diese Option aktivierst, passt das System das Format des dynamischen Bereichs an die wiedergegebenen Inhalte an. Beim Wechsel des Formats kann der Bildschirm kurz schwarz werden.\n\nKlicke auf „Erweiterte Displayeinstellungen“, um weitere Optionen zum dynamischen Bereich zu sehen."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Bevorzugter dynamischer Bereich"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Vom System bevorzugte Umwandlung"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Die Umwandlung von Formaten wird vom System verwaltet"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Wenn diese Option ausgewählt wird, ermittelt das System einen geeigneten dynamischen Bereich, das an dein Display gesendet wird, und wandelt Inhalte nach Bedarf in diesen dynamischen Bereich um."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Das Format des Inhalts wird nicht verändert"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Umwandlung erzwingen"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Erzwingt die Umwandlung in ein bevorzugtes Format"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Umwandlung in ein bevorzugtes Format erzwingen. Das Erzwingen einer Umwandlung beeinträchtigt möglicherweise andere Einstellungen im Anzeigemodus oder HDR-Format."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Immer in SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Immer in <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Möchtest du die HDR-Ausgabe erzwingen?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Standardmäßig wird für die Umwandlung <xliff:g id="HDR_TYPE">%s</xliff:g> erzwungen."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Inhalte werden auf deiner Anzeige mit einer Auflösung von 1080p und einer Bildwiederholrate von 60 Hz wiedergegeben. Diese Option ist nicht mit deiner Anzeige kompatibel, wenn Inhalte mit einer Auflösung von 4K und einer Bildwiederholrate von 60 Hz wiedergegeben werden."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision wird für die aktuelle Auflösung nicht unterstützt. Wenn du Dolby Vision manuell aktivierst, wird die Auflösung deines Bildschirms in 1080p/60Hz geändert"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Auflösung in 1080p/60Hz ändern?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Umwandlung in Dolby Vision immer erzwingen"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Wenn Dolby Vision in „Erweiterte Displayeinstellungen“ bei den HDR-Formaten deaktiviert ist, wird diese Technologie bei Erzwingen der Umwandlung in Dolby Vision wieder aktiviert."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Umwandlung in HDR10 immer erzwingen"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Wenn HDR10 in „Erweiterte Displayeinstellungen“ bei den HDR-Formaten deaktiviert ist, wird diese Technologie bei Erzwingen der Umwandlung in HDR10 wieder aktiviert."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Umwandlung in HLG immer erzwingen"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Wenn HLG in „Erweiterte Displayeinstellungen“ bei den HDR-Formaten deaktiviert ist, wird diese Technologie bei Erzwingen der Umwandlung in HLG wieder aktiviert."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Umwandlung in HDR10+ immer erzwingen"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Wenn HDR10+ in „Erweiterte Displayeinstellungen“ bei den HDR-Formaten deaktiviert ist, wird diese Technologie bei Erzwingen der Umwandlung in HDR10+ wieder aktiviert."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Umwandlung in SDR immer erzwingen"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Durch das Erzwingen von SDR in „Erweiterte Displayeinstellungen“ bei den HDR-Formaten werden alle Formate deaktiviert."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"An Framerate des Inhalts anpassen"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Nur nahtlos"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Nahtlos"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Wenn die App es anfordert, wird die Ausgabe deines Geräts an die Original-Framerate des aktuellen Inhalts angepasst. Das gilt allerdings NUR, wenn dein Fernseher einen nahtlosen Wechsel unterstützt."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Der verbundene Bildschirm unterstützt keine nahtlose Umstellung der Aktualisierungsrate. Diese Option greift erst, wenn du einen Bildschirm verwendest, der sie unterstützt."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Immer"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Nicht nahtlos"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Wenn die App es anfordert, wird die Ausgabe deines Geräts an die Original-Framerate des aktuellen Inhalts angepasst. Das kann dazu führen, dass der Bildschirm beim Beenden oder Starten einer Videowiedergabe vorübergehend schwarz wird."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Nie"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Selbst wenn die App es anfordert, wird die Ausgabe deines Geräts nie an die Original-Framerate des aktuellen Inhalts angepasst."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Auflösung in %1$s ändern?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Wähle „OK“ aus, um die neue Auflösung %1$s von jetzt an zu verwenden"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision wird für %1$s nicht unterstützt und in den erweiterten Displayeinstellungen deaktiviert."</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Dieser Modus unterstützt: %1$s\nUm weitere HDR-Formate nutzen zu können, musst du auf einigen Fernsehern möglicherweise erweitertes HDMI aktivieren. Sieh in den Einstellungen deines Fernsehers nach, ob dies unterstützt wird."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Dieser Modus unterstützt %1$s. Auf einigen Fernsehern musst du möglicherweise erweitertes HDMI aktivieren, um weitere HDR-Formate aktivieren zu können. Sieh in den Einstellungen deines Fernsehers nach, ob dies unterstützt wird."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Abbrechen"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Daten im Cache löschen?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Daten im Cache werden für alle Apps gelöscht."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Dieses Gerät wird von deiner Organisation verwaltet."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Dieses Gerät wird von <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> verwaltet."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Weitere Informationen"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kamera-App}other{Kamera-Apps}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Kalender-App"</string>
@@ -696,7 +670,7 @@
     <string name="palette_color_purple" msgid="2123828754639683555">"Lila"</string>
     <string name="palette_color_gray" msgid="4014534773994261194">"Grau"</string>
     <string name="accessibility_shortcut" msgid="5856158637840030531">"Bedienungshilfe-Kurzbefehl"</string>
-    <string name="accessibility_shortcut_enable" msgid="6603542432267329986">"Kurzbefehl für Bedienungshilfen aktivieren"</string>
+    <string name="accessibility_shortcut_enable" msgid="6603542432267329986">"Bedienungshilfe-Tastenkombination aktivieren"</string>
     <string name="accessibility_shortcut_service" msgid="2053250146891420311">"Verknüpfter Dienst"</string>
     <string name="accessibility_shortcut_description" msgid="2050424178481510046">"Wenn die Tastenkombination aktiviert ist, kannst du die Bedienungshilfe starten, indem du die Zurück-Taste und die Nach-Unten-Taste drei Sekunden lang gedrückt hältst."</string>
     <string name="accessibility_captions" msgid="3411554568812306549">"Untertitel"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Bitte bestätige, dass der Bildschirm während der Medienwiedergabe nicht ausgeschaltet werden soll. Diese Einstellung führt möglicherweise zu erhöhtem Energieverbrauch."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Bei Inaktivität"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Beim Anschauen"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Automatisch ausschalten"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Bei Inaktivität automatisch ausschalten"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Beim Zuschauen automatisch ausschalten"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Fernseher automatisch ausschalten"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Fernseher bei Inaktivität automatisch ausschalten"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Fernseher beim Zuschauen automatisch ausschalten"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Der Timer „Bei Inaktivität“ muss kürzer sein als der Timer „Beim Anschauen“"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Der Timer „Beim Anschauen“ muss länger sein als der Timer „Bei Inaktivität“"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Netzwerkzugriff im Stand-by beschränken"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Nach dem Einschalten"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Zurücksetzen"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Ethernet-Kopplungscode"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Energiemodi"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Stromverbrauch verringern, wenn Fernseher nicht verwendet wird"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Aktiviert:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Beachte, dass der Stromverbrauch des Geräts in diesem Modus höher sein kann."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"„<xliff:g id="ENERGYMODENAME">%s</xliff:g>“ aktivieren?"</string>
 </resources>
diff --git a/Settings/res/values-el/energy-modes.xml b/Settings/res/values-el/energy-modes.xml
deleted file mode 100644
index 0f482a12c..000000000
--- a/Settings/res/values-el/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Απαραίτητες λειτουργίες δικτύου"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Χαμηλή χρήση ενέργειας"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Απενεργοποιήστε τη σύνδεση δικτύου όταν η τηλεόραση δεν χρησιμοποιείται."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Σημαντικές ενημερώσεις και λειτουργίες"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Προτεινόμενες λειτουργίες δικτύου"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Βελτιστοποιημένη χρήση ενέργειας"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Ενεργοποιεί λειτουργίες που ενεργοποιούν την τηλεόραση μέσω δικτύου (δικτυωμένη λειτουργία αναμονής)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Εισαγωγή λειτουργίας 1]"</item>
-    <item msgid="8724721267222341891">"[Εισαγωγή λειτουργίας 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Πρόσθετες λειτουργίες δικτύου"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Αυξημένη χρήση ενέργειας"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Εκτός από τις προτεινόμενες λειτουργίες, η συγκεκριμένη επιλογή ενεργοποιεί πρόσθετες λειτουργίες όταν η τηλεόραση είναι απενεργοποιημένη, οι οποίες μπορεί να αυξήσουν τη χρήση ενέργειας."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Εισαγωγή λειτουργίας 1]"</item>
-    <item msgid="170760143032597722">"[Εισαγωγή λειτουργίας 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-el/strings.xml b/Settings/res/values-el/strings.xml
index ddb143e6e..6d0a126c8 100644
--- a/Settings/res/values-el/strings.xml
+++ b/Settings/res/values-el/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Αντίγραφα ασφαλείας και επαναφορά"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Επαναφορά εργοστασιακών ρυθμίσεων"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Βαθμονόμηση"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Χρονόμετρο απενεργοποίησης"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Ορίστε χρονόμετρα για απενεργοποίηση της τηλεόρασης και εξοικονομήστε ενέργεια"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Λειτουργία και ενέργεια"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Ρυθμίσεις Eco"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Συσκευές"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Επιλέξτε μορφές"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Σύνθετες ρυθμίσεις ήχου"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Να επιτρέπεται η λειτουργία παιχνιδιού"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Αντιστοίχιση με δυναμικό εύρος του περιεχομένου"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Όταν ενεργοποιήσετε αυτήν την επιλογή, το σύστημα θα κάνει εναλλαγή διάφορων μορφών δυναμικού εύρους για να εντοπίσει εκείνη που αντιστοιχεί στο περιεχόμενο. Ενδέχεται να εμφανιστεί μια κενή οθόνη κατά την εναλλαγή μορφών.\n\nΚάντε κλικ στις Σύνθετες ρυθμίσεις οθόνης για να δείτε περισσότερες επιλογές δυναμικού εύρους."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Προτιμώμενο δυναμικό εύρος"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Μετατροπή που είναι προτιμώμενη από το σύστημα"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Επιτρέπει στο σύστημα να διαχειρίζεται τη μετατροπή μορφής"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Όταν ορίζεται αυτή η επιλογή, το σύστημα προσδιορίζει ένα κατάλληλο δυναμικό εύρος που θα αποστέλλεται στην οθόνη σας και θα μετατρέπει το περιεχόμενο σε αυτό το δυναμικό εύρος, όπως απαιτείται."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Αντιστοιχεί πάντα στη μορφή του περιεχομένου"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Επιβολή μετατροπής"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Επιβάλλει τη μετατροπή στην προτιμώμενη μορφή"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Επιβολή μετατροπής σε προτιμώμενη μορφή. Η επιβολή μετατροπής μπορεί να επηρεάσει άλλες ρυθμίσεις στη Λειτουργία προβολής ή στη μορφή Υψηλού δυναμικού εύρους (HDR)."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Πάντα σε SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Πάντα σε <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Θέλετε να γίνει επιβολή της εξόδου σε Υψηλό δυναμικό εύρος (HDR);"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Από προεπιλογή, θα γίνει επιβολή της μετατροπής σε <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Η οθόνη σας θα λειτουργεί σε ανάλυση 1080p 60Hz. Αυτή η επιλογή δεν είναι συμβατή με την οθόνη σας όταν λειτουργεί σε ανάλυση 4K 60Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Το Dolby Vision δεν υποστηρίζεται στην τρέχουσα ανάλυση. Αν ενεργοποιήσετε το Dolby Vision με μη αυτόματο τρόπο, η ανάλυση της οθόνης θα αλλάξει σε 1080p 60 Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Θέλετε να αλλάξετε την ανάλυση σε 1080p 60 Hz;"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Να επιβάλλεται πάντα μετατροπή σε Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Αν το Dolby Vision είναι απενεργοποιημένο στην ενότητα Μορφές Υψηλού δυναμικού εύρους (HDR) στις Σύνθετες ρυθμίσεις οθόνης, η επιβολή της μετατροπής σε Dolby Vision θα το ενεργοποιήσει ξανά."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Να επιβάλλεται πάντα μετατροπή σε HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Αν το HDR10 είναι απενεργοποιημένο στην ενότητα Μορφές Υψηλού δυναμικού εύρους (HDR) στις Σύνθετες ρυθμίσεις οθόνης, η επιβολή της μετατροπής σε HDR10 θα το ενεργοποιήσει ξανά."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Να επιβάλλεται πάντα μετατροπή σε HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Αν το HLG είναι απενεργοποιημένο στην ενότητα Μορφές Υψηλού δυναμικού εύρους (HDR) στις Σύνθετες ρυθμίσεις οθόνης, η επιβολή της μετατροπής σε HLG θα το ενεργοποιήσει ξανά."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Να επιβάλλεται πάντα μετατροπή σε HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Αν το HDR10+ είναι απενεργοποιημένο στην ενότητα Μορφές Υψηλού δυναμικού εύρους (HDR) στις Σύνθετες ρυθμίσεις οθόνης, η επιβολή της μετατροπής σε HDR10+ θα το ενεργοποιήσει ξανά."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Να επιβάλλεται πάντα μετατροπή σε SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Η επιβολή της μετατροπής σε SDR θα απενεργοποιήσει όλες τις μορφές στην ενότητα Μορφές Υψηλού δυναμικού εύρους (HDR) στις Σύνθετες ρυθμίσεις οθόνης."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Αντιστοίχιση με ρυθμό καρέ περιεχομένου"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Μόνο απρόσκοπτα"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Απρόσκοπτη λειτουργία"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Εάν το ζητήσει η εφαρμογή, η συσκευή σας θα αντιστοιχίσει την έξοδό της με τον αρχικό ρυθμό καρέ του περιεχομένου που παρακολουθείτε, ΜΟΝΟ εάν η τηλεόρασή σας μπορεί να εκτελέσει την απρόσκοπτη μετάβαση."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Η συνδεδεμένη οθόνη δεν υποστηρίζει απρόσκοπτη αλλαγή ρυθμού ανανέωσης. Για να λειτουργήσει αυτή η επιλογή θα πρέπει να χρησιμοποιήσετε μια οθόνη που την υποστηρίζει."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Πάντα"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Μη απρόσκοπτη λειτουργία"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Εάν το ζητήσει η εφαρμογή, η συσκευή σας θα αντιστοιχίσει την έξοδό της με τον αρχικό ρυθμό καρέ του περιεχομένου που παρακολουθείτε. Η οθόνη σας μπορεί να σβήσει για ένα δευτερόλεπτο κατά την έξοδο ή την είσοδο στην αναπαραγωγή βίντεο."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Ποτέ"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Ακόμα κι αν το ζητήσει η εφαρμογή, η συσκευή σας δεν θα προσπαθήσει ποτέ να αντιστοιχίσει την έξοδό της με τον αρχικό ρυθμό καρέ του περιεχομένου που παρακολουθείτε."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Αλλαγή ανάλυσης σε %1$s;"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Επιλέξτε ΟΚ για να χρησιμοποιείτε στο εξής ανάλυση %1$s."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Το Dolby Vision δεν υποστηρίζεται σε ανάλυση %1$s και θα απενεργοποιηθεί στις Σύνθετες ρυθμίσεις οθόνης"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Η συγκεκριμένη λειτουργία υποστηρίζει: %1$s\nΣε ορισμένες τηλεοράσεις, μπορεί να χρειαστεί να ενεργοποιήσετε τη λειτουργία Βελτιωμένο HDMI για να ενεργοποιήσετε περισσότερες μορφές HDR. Ελέγξτε τις ρυθμίσεις της τηλεόρασης για να δείτε αν υποστηρίζεται αυτή η λειτουργία."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Αυτή η λειτουργία υποστηρίζει %1$s. Σε ορισμένες τηλεοράσεις, μπορεί να χρειαστεί να ενεργοποιήσετε το Enhanced HDMI για να ενεργοποιήσετε περισσότερες μορφές HDR. Ελέγξτε τις ρυθμίσεις της τηλεόρασης για να δείτε αν υποστηρίζεται αυτή η λειτουργία."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Ακύρωση"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ΟΚ"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Να διαγραφούν τα δεδομένα κρυφής μνήμης;"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Διαγραφή κρυφής μνήμης όλων των εφαρμογών."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Αυτή η συσκευή είναι διαχειριζόμενη από τον οργανισμό σας."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Τη συσκευή διαχειρίζεται ο οργανισμός <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Μάθετε περισσότερα"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Εφαρμογή κάμερας}other{Εφαρμογές κάμερας}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Εφαρμογή ημερολογίου"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Επιβεβαιώστε ότι δεν θέλετε να απενεργοποιείται η οθόνη κατά την παρακολούθηση, επιλογή που μπορεί να αυξήσει τη χρήση ενέργειας."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Όταν είναι ανενεργή"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Κατά την παρακολούθηση"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Αυτόματη απενεργοποίηση"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Αυτόματη απενεργοποίηση όταν η συσκευή είναι ανενεργή"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Αυτόματη απενεργοποίηση κατά την παρακολούθηση"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Αυτόματη απενεργοποίηση της τηλεόρασης"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Αυτόματη απενεργοποίηση της τηλεόρασης όταν είναι αδρανής"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Αυτόματη απενεργοποίηση της τηλεόρασης κατά την παρακολούθηση"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Το χρονόμετρο Όταν είναι ανενεργή πρέπει να διαρκεί λιγότερο από το χρονόμετρο Κατά την παρακολούθηση"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Το χρονόμετρο Κατά την παρακολούθηση πρέπει να διαρκεί περισσότερο από το χρονόμετρο Όταν είναι ανενεργή"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Περιορισμός σύνδ. δικτύου σε κατ. αναμ."</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Συμπεριφορά κατά την ενεργοποίηση"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Επαναφορά"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Κωδικός σύζευξης Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Λειτουργίες ενέργειας"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Βελτίωση της ενεργειακής αποδοτικότητας όταν η τηλεόραση δεν χρησιμοποιείται"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Ενεργοποιεί:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Έχετε υπόψη ότι η συγκεκριμένη λειτουργία μπορεί να αυξήσει την κατανάλωση ενέργειας της συσκευής."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Ενεργοποίηση <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
 </resources>
diff --git a/Settings/res/values-en-rAU/energy-modes.xml b/Settings/res/values-en-rAU/energy-modes.xml
deleted file mode 100644
index b85af7b00..000000000
--- a/Settings/res/values-en-rAU/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Essential network features"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Low energy use"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Turn off network connection when the TV is not in use."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Critical updates and functions"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Recommended network features"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimised energy use"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Turns on features that wake the TV over the network (networked standby)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Additional network features"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Increased energy use"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"In addition to recommended features, this option turns on additional features that may increase energy use when the TV is not in use."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-en-rAU/strings.xml b/Settings/res/values-en-rAU/strings.xml
index 25f244dd9..ea29f5a0c 100644
--- a/Settings/res/values-en-rAU/strings.xml
+++ b/Settings/res/values-en-rAU/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Back up and restore"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Factory data reset"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Calibration"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Shut-off timer"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Set timers to turn TV off and save energy"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Power and energy"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Eco settings"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Devices"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Select formats"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Advanced sound settings"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Allow game mode"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Match content dynamic range"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"When enabling this option, the system will switch between different dynamic range formats to match the content. This may cause a black screen during a format switch.\n\nClick Advanced Display settings for more dynamic range options."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Preferred dynamic range"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"System-preferred conversion"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Lets the system manage the format conversion"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"When this option is selected, the system will determine a suitable dynamic range to be sent to your display and convert content to this dynamic range as needed."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Always matches content\'s format"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Force conversion"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Forces conversion to preferred format"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Force conversion to a preferred format. Forcing conversion may affect other settings in Display mode or HDR format."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Always to SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Always to <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Do you want to force the HDR output?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"By default, the conversion will be forced to <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Your display will run at 1080p 60 Hz resolution. This option is not compatible with your display when running at the 4K 60 Hz resolution."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision is not supported at the current resolution. If you enable Dolby Vision manually, the resolution of your display will be changed to 1080p 60Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Change resolution to 1080p 60Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Always force conversion to Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"If Dolby Vision is disabled in HDR formats in the advanced display settings, forcing conversion to Dolby Vision will re-enable it."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Always force conversion to HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"If HDR10 is disabled in HDR formats in the advanced display settings, forcing conversion to HDR10 will re-enable it."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Always force conversion to HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"If HLG is disabled in HDR formats in the advanced display settings, forcing conversion to HLG will re-enable it."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Always force conversion to HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"If HDR10+ is disabled in HDR formats in the advanced display settings, forcing conversion to HDR10+ will re-enable it."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Always force conversion to SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Forcing conversion to SDR will disable all formats in the HDR formats in advanced display settings."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Match content frame rate"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Seamless-only"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Seamless"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"If the app requests it, your device will match its output to the original frame rate of the content that you’re watching, ONLY if your TV can perform a seamless transition."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Your connected display does not support seamless refresh rate transitions. This option will have no effect unless you change to a display that supports it."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Always"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Non-seamless"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"If the app requests it, your device will match its output to the original frame rate of the content that you’re watching. This may cause your screen to go blank for a second when exiting or entering a video playback."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Never"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Even if the app requests it, your device will never try to match its output to the original frame rate of the content that you’re watching."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Change resolution to %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Select OK to use %1$s from now on."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision is not supported at %1$s and will be disabled in \'Advanced display settings\'"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"This mode supports: %1$s\nOn some TVs, you may need to turn on enhanced HDMI to enable more HDR formats. Check your TV settings to see if this is supported."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"This mode supports %1$s. On some TVs, you may need to turn on enhanced HDMI to enable more HDR formats. Check your TV settings to see if this is supported."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Cancel"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Clear cached data?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"This will clear cached data for all apps."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"This device is managed by your organisation."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"This device is managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Learn more"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Camera app}other{Camera apps}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Calendar app"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Please confirm to prevent the display from turning off while watching, which has the potential for increased energy use."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"When inactive"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"When watching"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Automatically turn off"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Automatically turn off when inactive"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Automatically turn off when watching"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Automatically turn off TV"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Automatically turn off TV when inactive"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Automatically turn off TV when watching"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\'When inactive\' timer must be shorter than \'When watching\' timer"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\'When watching\' timer must be longer than \'When inactive\' timer"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Limit network connection in standby"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Power-on behaviour"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Reset"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Ethernet pairing code"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Energy modes"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Improve energy efficiency when TV is not in use"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Enables:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Note that this mode may increase the power consumption of the device."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Enable \'<xliff:g id="ENERGYMODENAME">%s</xliff:g>\'"</string>
 </resources>
diff --git a/Settings/res/values-en-rCA/energy-modes.xml b/Settings/res/values-en-rCA/energy-modes.xml
deleted file mode 100644
index 8db883041..000000000
--- a/Settings/res/values-en-rCA/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Essential network features"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Low energy use"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Turn off network connection when the TV is not in use."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Critical updates and functions"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Recommended network features"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimized energy use"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Turns on features that wake the TV over the network (networked standby)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Additional network features"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Increased energy use"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"In addition to recommended features, this option turns on additional features when the TV is not in use that may increase energy use."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-en-rCA/strings.xml b/Settings/res/values-en-rCA/strings.xml
index 8c33d7da7..f6c15082c 100644
--- a/Settings/res/values-en-rCA/strings.xml
+++ b/Settings/res/values-en-rCA/strings.xml
@@ -56,14 +56,14 @@
     <string name="accessibility_category_title" msgid="1552664829936369592">"Accessibility"</string>
     <string name="remotes_and_accessories_category_title" msgid="4795119810430255047">"Remotes &amp; accessories"</string>
     <string name="display_and_sound_category_title" msgid="9203309625380755860">"Display &amp; Sound"</string>
-    <string name="help_and_feedback_category_title" msgid="7036505833991003031">"Help and feedback"</string>
+    <string name="help_and_feedback_category_title" msgid="7036505833991003031">"Help &amp; Feedback"</string>
     <string name="privacy_category_title" msgid="8552430590908463601">"Privacy"</string>
     <string name="privacy_device_settings_category" msgid="5018334603278648524">"Device Settings"</string>
     <string name="privacy_account_settings_category" msgid="5786591549945777400">"Account Settings"</string>
     <string name="privacy_assistant_settings_title" msgid="4524957824712623680">"Google Assistant"</string>
     <string name="privacy_purchases_settings_title" msgid="6490965297061569673">"Payment &amp; Purchases"</string>
     <string name="privacy_app_settings_category" msgid="858250971978879266">"App Settings"</string>
-    <string name="privacy_category_summary" msgid="3534434883380511043">"Location, usage and diagnostics, ads"</string>
+    <string name="privacy_category_summary" msgid="3534434883380511043">"Location, Usage &amp; Diagnostics, Ads"</string>
     <string name="add_account" msgid="7386223854837017129">"Add account"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Remove account"</string>
     <string name="account_sync" msgid="4315295293211313989">"Choose synced apps"</string>
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Backup &amp; Restore"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Factory data reset"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Calibration"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Shut-Off Timer"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Set timers to turn TV off and save energy"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Power &amp; Energy"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Eco settings"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Devices"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Select formats"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Advanced sound settings"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Allow game mode"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Match content dynamic range"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"When enabling this option, the system will switch between different dynamic range formats to match the content. This may cause a black screen during a format switch.\n\nClick Advanced Display settings for more dynamic range options."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Preferred dynamic range"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"System-preferred conversion"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Let\'s the system manage the format conversion"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"When this option is selected, the system will determine a suitable dynamic range to be sent to your display and convert content to this dynamic range as needed."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Always matches content\'s format"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Force conversion"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Forces conversion to preferred format"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Force conversion to a preferred format. Forcing conversion may affect other settings in Display Mode or HDR Format."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Always to SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Always to <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Do you want to force the HDR output?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"By default the conversion will be forced to <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Your display will run at 1080p 60Hz resolution. This option is not compatible with your display when running at the 4k 60Hz resolution."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision is not supported at the current resolution. If you enable Dolby Vision manually, the resolution of your display will be changed to 1080p 60Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Change resolution to 1080p 60Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Always force conversion to Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"If Dolby Vision is disabled in HDR Formats in the Advanced Display Settings, forcing conversion to Dolby Vision will re-enable it."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Always force conversion to HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"If HDR10 is disabled in HDR Formats in the Advanced Display Settings, forcing conversion to HDR10 will re-enable it."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Always force conversion to HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"If HLG is disabled in HDR Formats in the Advanced Display Settings, forcing conversion to HLG will re-enable it."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Always force conversion to HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"If HDR10+ is disabled in HDR Formats in the Advanced Display Settings, forcing conversion to HDR10+ will re-enable it."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Always force conversion to SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Forcing conversion to SDR will disable all formats in the HDR Formats in Advanced Display Settings."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Match content frame rate"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Seamless-only"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Seamless"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"If the app requests it, your device will match its output to the original frame rate of the content you’re watching, ONLY if your TV can perform a seamless transition."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Your connected display does not support seamless refresh rate transitions. This option will have no effect unless you change to a display that supports it."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Always"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Non-seamless"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"If the app requests it, your device will match its output to the original frame rate of the content you’re watching. This may cause your screen to go blank for a second when exiting or entering a video playback."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Never"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Even if the app requests it, your device will never try to match its output to the original frame rate of the content you’re watching."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Change resolution to %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Select OK to use %1$s from now on."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision is not supported at %1$s and will be disabled in \"Advanced Display Settings\""</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"This mode supports: %1$s\nOn some TVs, you may need to turn on Enhanced HDMI to enable more HDR formats. Check your TV settings to see if this is supported."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"This mode supports %1$s. On some TVs, you may need to turn on Enhanced HDMI to enable more HDR formats. Check your TV settings to see if this is supported."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Cancel"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Clear cached data?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"This will clear cached data for all apps."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -296,7 +269,7 @@
     <string name="system_home_theater_control" msgid="6228949628173590310">"Home theater control"</string>
     <string name="system_developer_options" msgid="8480844257066475479">"Developer options"</string>
     <string name="accessibility_none" msgid="6355646833528306702">"None"</string>
-    <string name="system_diagnostic" msgid="1654842813331919958">"Usage and diagnostics"</string>
+    <string name="system_diagnostic" msgid="1654842813331919958">"Usage &amp; diagnostics"</string>
     <string name="no_device_admins" msgid="4628974717150185625">"No device admin apps available"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="7678529948487939871">"Disabled by admin"</string>
     <string name="disabled_by_administrator_summary" msgid="3420979957115426764">"Not available"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"This device is managed by your organization."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"This device is managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" "</string>
     <string name="learn_more" msgid="820336467414665686">"Learn more"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Camera app}other{Camera apps}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Calendar app"</string>
@@ -526,7 +500,7 @@
     <string name="storage_calculating_size" msgid="5716281278843281044">"Calculating…"</string>
     <string name="storage_apps_usage" msgid="8659915575274468924">"Apps"</string>
     <string name="storage_downloads_usage" msgid="8429196848359517158">"Downloads"</string>
-    <string name="storage_dcim_usage" msgid="1890098882753254745">"Photos and videos"</string>
+    <string name="storage_dcim_usage" msgid="1890098882753254745">"Photos &amp; Videos"</string>
     <string name="storage_music_usage" msgid="5362871290115089474">"Audio"</string>
     <string name="storage_media_misc_usage" msgid="3404230292054880339">"Misc."</string>
     <string name="storage_media_cache_usage" msgid="6397941751551207630">"Cached data"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Please confirm to prevent the display from turning off while watching, which has the potential for increased energy use."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"When inactive"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"When watching"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Automatically turn off"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Automatically turn off when inactive"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Automatically turn off when watching"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Automatically turn off TV"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Automatically turn off TV when inactive"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Automatically turn off TV when watching"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"When inactive\" timer must be shorter than \"When watching\" timer"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"When watching\" timer must be longer than \"When inactive\" timer"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Limit network connection in standby"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Power on behavior"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Reset"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Ethernet pairing code"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Energy Modes"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Improve energy efficiency when TV is not in use"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Enables:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Note that this mode may increase the power consumption of the device."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Enable \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/Settings/res/values-en-rGB/energy-modes.xml b/Settings/res/values-en-rGB/energy-modes.xml
deleted file mode 100644
index b85af7b00..000000000
--- a/Settings/res/values-en-rGB/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Essential network features"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Low energy use"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Turn off network connection when the TV is not in use."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Critical updates and functions"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Recommended network features"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimised energy use"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Turns on features that wake the TV over the network (networked standby)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Additional network features"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Increased energy use"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"In addition to recommended features, this option turns on additional features that may increase energy use when the TV is not in use."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-en-rGB/strings.xml b/Settings/res/values-en-rGB/strings.xml
index 70ce1c71c..fcad0887d 100644
--- a/Settings/res/values-en-rGB/strings.xml
+++ b/Settings/res/values-en-rGB/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Back up and restore"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Factory data reset"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Calibration"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Shut-off timer"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Set timers to turn TV off and save energy"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Power and energy"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Eco settings"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Devices"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Select formats"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Advanced sound settings"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Allow game mode"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Match content dynamic range"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"When enabling this option, the system will switch between different dynamic range formats to match the content. This may cause a black screen during a format switch.\n\nClick Advanced Display settings for more dynamic range options."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Preferred dynamic range"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"System-preferred conversion"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Lets the system manage the format conversion"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"When this option is selected, the system will determine a suitable dynamic range to be sent to your display and convert content to this dynamic range as needed."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Always matches content\'s format"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Force conversion"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Forces conversion to preferred format"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Force conversion to a preferred format. Forcing conversion may affect other settings in Display mode or HDR format."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Always to SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Always to <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Do you want to force the HDR output?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"By default, the conversion will be forced to <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Your display will run at 1080p 60 Hz resolution. This option is not compatible with your display when running at the 4K 60 Hz resolution."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision is not supported at the current resolution. If you enable Dolby Vision manually, the resolution of your display will be changed to 1080p 60Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Change resolution to 1080p 60Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Always force conversion to Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"If Dolby Vision is disabled in HDR formats in the advanced display settings, forcing conversion to Dolby Vision will re-enable it."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Always force conversion to HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"If HDR10 is disabled in HDR formats in the advanced display settings, forcing conversion to HDR10 will re-enable it."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Always force conversion to HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"If HLG is disabled in HDR formats in the advanced display settings, forcing conversion to HLG will re-enable it."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Always force conversion to HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"If HDR10+ is disabled in HDR formats in the advanced display settings, forcing conversion to HDR10+ will re-enable it."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Always force conversion to SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Forcing conversion to SDR will disable all formats in the HDR formats in advanced display settings."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Match content frame rate"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Seamless-only"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Seamless"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"If the app requests it, your device will match its output to the original frame rate of the content that you’re watching, ONLY if your TV can perform a seamless transition."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Your connected display does not support seamless refresh rate transitions. This option will have no effect unless you change to a display that supports it."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Always"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Non-seamless"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"If the app requests it, your device will match its output to the original frame rate of the content that you’re watching. This may cause your screen to go blank for a second when exiting or entering a video playback."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Never"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Even if the app requests it, your device will never try to match its output to the original frame rate of the content that you’re watching."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Change resolution to %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Select OK to use %1$s from now on."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision is not supported at %1$s and will be disabled in \'Advanced display settings\'"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"This mode supports: %1$s\nOn some TVs, you may need to turn on enhanced HDMI to enable more HDR formats. Check your TV settings to see if this is supported."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"This mode supports %1$s. On some TVs, you may need to turn on enhanced HDMI to enable more HDR formats. Check your TV settings to see if this is supported."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Cancel"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Clear cached data?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"This will clear cached data for all apps."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"This device is managed by your organisation."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"This device is managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Learn more"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Camera app}other{Camera apps}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Calendar app"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Please confirm to prevent the display from turning off while watching, which has the potential for increased energy use."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"When inactive"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"When watching"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Automatically turn off"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Automatically turn off when inactive"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Automatically turn off when watching"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Automatically turn off TV"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Automatically turn off TV when inactive"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Automatically turn off TV when watching"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\'When inactive\' timer must be shorter than \'When watching\' timer"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\'When watching\' timer must be longer than \'When inactive\' timer"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Limit network connection in standby"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Power-on behaviour"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Reset"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Ethernet pairing code"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Energy modes"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Improve energy efficiency when TV is not in use"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Enables:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Note that this mode may increase the power consumption of the device."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Enable \'<xliff:g id="ENERGYMODENAME">%s</xliff:g>\'"</string>
 </resources>
diff --git a/Settings/res/values-en-rIN/energy-modes.xml b/Settings/res/values-en-rIN/energy-modes.xml
deleted file mode 100644
index b85af7b00..000000000
--- a/Settings/res/values-en-rIN/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Essential network features"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Low energy use"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Turn off network connection when the TV is not in use."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Critical updates and functions"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Recommended network features"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimised energy use"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Turns on features that wake the TV over the network (networked standby)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Additional network features"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Increased energy use"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"In addition to recommended features, this option turns on additional features that may increase energy use when the TV is not in use."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-en-rIN/strings.xml b/Settings/res/values-en-rIN/strings.xml
index 70ce1c71c..fcad0887d 100644
--- a/Settings/res/values-en-rIN/strings.xml
+++ b/Settings/res/values-en-rIN/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Back up and restore"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Factory data reset"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Calibration"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Shut-off timer"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Set timers to turn TV off and save energy"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Power and energy"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Eco settings"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Devices"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Select formats"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Advanced sound settings"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Allow game mode"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Match content dynamic range"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"When enabling this option, the system will switch between different dynamic range formats to match the content. This may cause a black screen during a format switch.\n\nClick Advanced Display settings for more dynamic range options."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Preferred dynamic range"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"System-preferred conversion"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Lets the system manage the format conversion"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"When this option is selected, the system will determine a suitable dynamic range to be sent to your display and convert content to this dynamic range as needed."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Always matches content\'s format"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Force conversion"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Forces conversion to preferred format"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Force conversion to a preferred format. Forcing conversion may affect other settings in Display mode or HDR format."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Always to SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Always to <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Do you want to force the HDR output?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"By default, the conversion will be forced to <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Your display will run at 1080p 60 Hz resolution. This option is not compatible with your display when running at the 4K 60 Hz resolution."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision is not supported at the current resolution. If you enable Dolby Vision manually, the resolution of your display will be changed to 1080p 60Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Change resolution to 1080p 60Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Always force conversion to Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"If Dolby Vision is disabled in HDR formats in the advanced display settings, forcing conversion to Dolby Vision will re-enable it."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Always force conversion to HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"If HDR10 is disabled in HDR formats in the advanced display settings, forcing conversion to HDR10 will re-enable it."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Always force conversion to HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"If HLG is disabled in HDR formats in the advanced display settings, forcing conversion to HLG will re-enable it."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Always force conversion to HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"If HDR10+ is disabled in HDR formats in the advanced display settings, forcing conversion to HDR10+ will re-enable it."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Always force conversion to SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Forcing conversion to SDR will disable all formats in the HDR formats in advanced display settings."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Match content frame rate"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Seamless-only"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Seamless"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"If the app requests it, your device will match its output to the original frame rate of the content that you’re watching, ONLY if your TV can perform a seamless transition."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Your connected display does not support seamless refresh rate transitions. This option will have no effect unless you change to a display that supports it."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Always"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Non-seamless"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"If the app requests it, your device will match its output to the original frame rate of the content that you’re watching. This may cause your screen to go blank for a second when exiting or entering a video playback."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Never"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Even if the app requests it, your device will never try to match its output to the original frame rate of the content that you’re watching."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Change resolution to %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Select OK to use %1$s from now on."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision is not supported at %1$s and will be disabled in \'Advanced display settings\'"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"This mode supports: %1$s\nOn some TVs, you may need to turn on enhanced HDMI to enable more HDR formats. Check your TV settings to see if this is supported."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"This mode supports %1$s. On some TVs, you may need to turn on enhanced HDMI to enable more HDR formats. Check your TV settings to see if this is supported."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Cancel"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Clear cached data?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"This will clear cached data for all apps."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"This device is managed by your organisation."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"This device is managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Learn more"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Camera app}other{Camera apps}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Calendar app"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Please confirm to prevent the display from turning off while watching, which has the potential for increased energy use."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"When inactive"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"When watching"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Automatically turn off"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Automatically turn off when inactive"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Automatically turn off when watching"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Automatically turn off TV"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Automatically turn off TV when inactive"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Automatically turn off TV when watching"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\'When inactive\' timer must be shorter than \'When watching\' timer"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\'When watching\' timer must be longer than \'When inactive\' timer"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Limit network connection in standby"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Power-on behaviour"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Reset"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Ethernet pairing code"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Energy modes"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Improve energy efficiency when TV is not in use"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Enables:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Note that this mode may increase the power consumption of the device."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Enable \'<xliff:g id="ENERGYMODENAME">%s</xliff:g>\'"</string>
 </resources>
diff --git a/Settings/res/values-en-rXC/energy-modes.xml b/Settings/res/values-en-rXC/energy-modes.xml
deleted file mode 100644
index 4708075f4..000000000
--- a/Settings/res/values-en-rXC/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‎‎‎‏‎‎‎‎‎‏‏‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎Essential network features‎‏‎‎‏‎"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎‏‎‎‏‎‎Low energy use‎‏‎‎‏‎"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎Turn off network connection when the TV is not in use.‎‏‎‎‏‎"</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‏‎‎Critical updates and functions‎‏‎‎‏‎"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‎‏‏‏‎‎‎‏‏‎‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎‎‎Recommended network features‎‏‎‎‏‎"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‏‎‎‎‏‏‎Optimized energy use‎‏‎‎‏‎"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‏‎Turns on features that wake the TV over the network (networked standby).‎‏‎‎‏‎"</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‎‎‎‎‎‎‎‎‎‏‏‎‎‎‎[Insert feature 1]‎‏‎‎‏‎"</item>
-    <item msgid="8724721267222341891">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‏‎‎‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‎‎‏‏‎[Insert feature 2]‎‏‎‎‏‎"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎‎‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎Additional network features‎‏‎‎‏‎"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‎‎‎‎Increased energy use‎‏‎‎‏‎"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎In addition to recommended features, this option turns on additional features when the TV is not in use that may increase energy use.‎‏‎‎‏‎"</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‎‎‏‏‎[Insert feature 1]‎‏‎‎‏‎"</item>
-    <item msgid="170760143032597722">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‎‎‏‎‎‎‎‎‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‎‎[Insert feature 2]‎‏‎‎‏‎"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-en-rXC/strings.xml b/Settings/res/values-en-rXC/strings.xml
index feb3c5e8a..7decf6e8c 100644
--- a/Settings/res/values-en-rXC/strings.xml
+++ b/Settings/res/values-en-rXC/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‏‎‎‎‏‏‎‎‎‏‏‏‎‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‏‎‎Backup &amp; Restore‎‏‎‎‏‎"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‎‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎Factory data reset‎‏‎‎‏‎"</string>
     <string name="device_calibration" msgid="2907914144048739705">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‎‏‎Calibration‎‏‎‎‏‎"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‎‎‎Shut-Off Timer‎‏‎‎‏‎"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‎‏‏‏‎‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‎‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎Set timers to turn TV off and save energy‎‏‎‎‏‎"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎Power &amp; Energy‎‏‎‎‏‎"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‏‎‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‎‏‏‎‏‏‎‎‏‎‎‏‏‎‏‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎Eco settings‎‏‎‎‏‎"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‏‏‏‏‎‏‏‏‎Devices‎‏‎‎‏‎"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‎‏‏‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎Select formats‎‏‎‎‏‎"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎‏‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‎‎‏‏‎HDMI-CEC‎‏‎‎‏‎"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‎Advanced sound settings‎‏‎‎‏‎"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎Allow game mode‎‏‎‎‏‎"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‏‎‎‏‏‏‎‎‎‏‎‎‎‎‎‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‎‎‏‏‏‏‎‎Match content dynamic range‎‏‎‎‏‎"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‏‎‎When enabling this option, the system will switch between different dynamic range formats to match the content. This may cause a black screen during a format switch.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Click Advanced Display settings for more dynamic range options.‎‏‎‎‏‎"</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‏‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‎Preferred dynamic range‎‏‎‎‏‎"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‎‎System-preferred conversion‎‏‎‎‏‎"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‎‎‎Let\'s the system manage the format conversion‎‏‎‎‏‎"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‎‏‎‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‎‏‎‎‏‏‎‎When this option is selected, the system will determine a suitable dynamic range to be sent to your display and convert content to this dynamic range as needed.‎‏‎‎‏‎"</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‎‏‏‎‎‎‎‎‏‎‏‎‏‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‏‎‎‏‏‏‏‎‎‏‏‏‏‏‎‎‏‎Always matches content\'s format‎‏‎‎‏‎"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‏‎‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‏‏‎Force conversion‎‏‎‎‏‎"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‎‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎Forces conversion to preferred format‎‏‎‎‏‎"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎Force conversion to a preferred format. Forcing conversion may affect other settings in Display Mode or HDR Format.‎‏‎‎‏‎"</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‎‎‎‏‏‏‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎‎Always to SDR‎‏‎‎‏‎"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‏‎Always to ‎‏‎‎‏‏‎<xliff:g id="HDR_TYPE">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‏‎‎‎‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎Do you want to force the HDR output?‎‏‎‎‏‎"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‏‏‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‎‎‎‎By default the conversion will be forced to ‎‏‎‎‏‏‎<xliff:g id="HDR_TYPE">%s</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‎‎‏‎‏‎‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎‎‎‏‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎Your display will run at 1080p 60Hz resolution. This option is not compatible with your display when running at the 4k 60Hz resolution.‎‏‎‎‏‎"</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎‎‎‏‎‏‏‎‎‏‏‎‏‎‏‏‎‎‏‏‎Dolby Vision is not supported at the current resolution. If you enable Dolby Vision manually, the resolution of your display will be changed to 1080p 60Hz‎‏‎‎‏‎"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‎Change resolution to 1080p 60Hz?‎‏‎‎‏‎"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‏‏‎‏‏‎‎Always force conversion to Dolby Vision‎‏‎‎‏‎"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‏‎‎‎‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎‏‎‎If Dolby Vision is disabled in HDR Formats in the Advanced Display Settings, forcing conversion to Dolby Vision will re-enable it.‎‏‎‎‏‎"</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‎Always force conversion to HDR10‎‏‎‎‏‎"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎If HDR10 is disabled in HDR Formats in the Advanced Display Settings, forcing conversion to HDR10 will re-enable it.‎‏‎‎‏‎"</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‎‏‎‎‏‏‎‏‏‏‏‏‏‎‎‎‎Always force conversion to HLG‎‏‎‎‏‎"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎‎‎‏‎‏‏‎‏‎‎‎‎‎‏‎If HLG is disabled in HDR Formats in the Advanced Display Settings, forcing conversion to HLG will re-enable it.‎‏‎‎‏‎"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‎‎‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‎‎‎‎‎‏‏‏‎Always force conversion to HDR10+‎‏‎‎‏‎"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‎‎‏‏‎‎‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‏‎‎‏‎If HDR10+ is disabled in HDR Formats in the Advanced Display Settings, forcing conversion to HDR10+ will re-enable it.‎‏‎‎‏‎"</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‏‎‎‏‏‏‏‏‎‏‎‎‎‏‎Always force conversion to SDR‎‏‎‎‏‎"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎Forcing conversion to SDR will disable all formats in the HDR Formats in Advanced Display Settings.‎‏‎‎‏‎"</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‎‎‎‏‎‎‎‎‎‏‎‎‏‏‎‎‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‎‎‏‎Match content frame rate‎‏‎‎‏‎"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‎‎‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‎‏‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎‏‎Seamless-only‎‏‎‎‏‎"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‏‎‎‎‎Seamless‎‏‎‎‏‎"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎If the app requests it, your device will match its output to the original frame rate of the content you’re watching, ONLY if your TV can perform a seamless transition.‎‏‎‎‏‎"</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎‎‎Your connected display does not support seamless refresh rate transitions. This option will have no effect unless you change to a display that supports it.‎‏‎‎‏‎"</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‎‎‎‏‏‏‏‎Always‎‏‎‎‏‎"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎Non-seamless‎‏‎‎‏‎"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‏‎‎‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎If the app requests it, your device will match its output to the original frame rate of the content you’re watching. This may cause your screen to go blank for a second when exiting or entering a video playback.‎‏‎‎‏‎"</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‎‏‎‏‏‎‏‏‎‏‏‎‎‏‎‏‎‏‏‎‎‎‎‎‏‏‎‎‎‎‎‏‎‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‏‎Never‎‏‎‎‏‎"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎‏‏‏‏‏‎‎‏‎‏‏‎‎‎‏‏‎‏‎‏‎‎‎‎‏‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‏‏‏‏‏‎Even if the app requests it, your device will never try to match its output to the original frame rate of the content you’re watching.‎‏‎‎‏‎"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‎‎‏‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎‎Change resolution to %1$s?‎‏‎‎‏‎"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎Select OK to use %1$s from now on.‎‏‎‎‏‎"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‏‏‎Dolby Vision is not supported at %1$s and will be disabled in \"Advanced Display Settings\"‎‏‎‎‏‎"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‏‎‎This mode supports: %1$s‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎On some TVs, you may need to turn on Enhanced HDMI to enable more HDR formats. Check your TV settings to see if this is supported.‎‏‎‎‏‎"</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎This mode supports %1$s. On some TVs, you may need to turn on Enhanced HDMI to enable more HDR formats. Check your TV settings to see if this is supported.‎‏‎‎‏‎"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‎‎‎‎‏‏‎‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‎‏‎Cancel‎‏‎‎‏‎"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‏‏‎‏‎‎‎OK‎‏‎‎‏‎"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‏‎‎‎‎‏‏‎‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‎‏‎‏‎Hz‎‏‎‎‏‎"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="RESOLUTION">%1$s</xliff:g>‎‏‎‎‏‏‏‎ (‎‏‎‎‏‏‎<xliff:g id="REFRESH_RATE">%2$s</xliff:g>‎‏‎‎‏‏‏‎ Hz)‎‏‎‎‏‎"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎‏‎‎‎‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="RESOLUTION">%1$s</xliff:g>‎‏‎‎‏‏‏‎ ( ‎‏‎‎‏‏‎<xliff:g id="REFRESH_RATE">%2$s</xliff:g>‎‏‎‎‏‏‏‎ Hz)‎‏‎‎‏‎"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‎‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎‏‎‏‎‏‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‏‏‏‎‏‎‏‎Clear cached data?‎‏‎‎‏‎"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎This will clear cached data for all apps.‎‏‎‎‏‎"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎This device is managed by your organization.‎‏‎‎‏‎"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‏‏‏‎This device is managed by ‎‏‎‎‏‏‎<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" ‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‏‏‎‎ ‎‏‎‎‏‎"</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‎‎‎‏‎‏‎‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎‏‏‎‏‎‎‎‎‏‎‎‏‏‎‏‎‏‏‎‏‏‏‎‎- %1$s‎‏‎‎‏‎"</string>
+    <string name="word_separator" msgid="3175619900852797955">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‏‏‎,‎‏‎‎‏‎"</string>
+    <string name="space_separator" msgid="4169645647388594972">" ‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎ ‎‏‎‎‏‎"</string>
     <string name="learn_more" msgid="820336467414665686">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎Learn more‎‏‎‎‏‎"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎Camera app‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎Camera apps‎‏‎‎‏‎}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‎‏‏‏‎‏‏‎‎‎Calendar app‎‏‎‎‏‎"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‎‎‎‎‎‎‏‏‎‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‎‏‎‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‎‎Please confirm to prevent the display from turning off while watching, which has the potential for increased energy use.‎‏‎‎‏‎"</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎When inactive‎‏‎‎‏‎"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‏‎‏‏‎‎‏‎‏‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‏‏‎‎‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎When watching‎‏‎‎‏‎"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‏‏‏‏‏‎‎‎‏‎‎Automatically turn off‎‏‎‎‏‎"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎Automatically turn off when inactive‎‏‎‎‏‎"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‎Automatically turn off when watching‎‏‎‎‏‎"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‏‎‎‏‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‏‎‎‏‎Automatically turn off TV‎‏‎‎‏‎"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‏‎‎‏‎‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‎‎‎Automatically turn off TV when inactive‎‏‎‎‏‎"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‎‎‎‎‎‎‎‎Automatically turn off TV when watching‎‏‎‎‏‎"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎\"When inactive\" timer must be shorter than \"When watching\" timer‎‏‎‎‏‎"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‏‏‎‏‏‎\"When watching\" timer must be longer than \"When inactive\" timer‎‏‎‎‏‎"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‎‏‏‎‎‏‏‎‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎Limit network connection in standby‎‏‎‎‏‎"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‎‏‎‏‏‎‎‎‏‏‎‎‎Power on behavior‎‏‎‎‏‎"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‎‎‎‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎Reset‎‏‎‎‏‎"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‎‎‏‏‎‎Ethernet pairing code‎‏‎‎‏‎"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‏‎‏‎‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎Energy Modes‎‏‎‎‏‎"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎Improve energy efficiency when TV is not in use‎‏‎‎‏‎"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‎‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎Enables:‎‏‎‎‏‎"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‏‎‎‎‎‏‎‏‏‎‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‏‎‎‏‎‏‏‎Note that this mode may increase the power consumption of the device.‎‏‎‎‏‎"</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‎‏‎Enable \"‎‏‎‎‏‏‎<xliff:g id="ENERGYMODENAME">%s</xliff:g>‎‏‎‎‏‏‏‎\"‎‏‎‎‏‎"</string>
 </resources>
diff --git a/Settings/res/values-es-rUS/energy-modes.xml b/Settings/res/values-es-rUS/energy-modes.xml
deleted file mode 100644
index a5d929607..000000000
--- a/Settings/res/values-es-rUS/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Funciones de red esenciales"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Bajo consumo de energía"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Desactiva la conexión de red cuando la TV no esté en uso."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Funciones y actualizaciones importantes"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Funciones de red recomendadas"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Consumo de energía optimizado"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Activa funciones que encienden la TV por la red (modo en espera en red)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insertar función 1]"</item>
-    <item msgid="8724721267222341891">"[Insertar función 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Funciones de red adicionales"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Consumo de energía aumentado"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Además de las funciones recomendadas, esta opción activa otras funciones cuando la TV no está en uso que podrían aumentar el uso de energía."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insertar función 1]"</item>
-    <item msgid="170760143032597722">"[Insertar función 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-es-rUS/strings.xml b/Settings/res/values-es-rUS/strings.xml
index d54afe599..29ea19e09 100644
--- a/Settings/res/values-es-rUS/strings.xml
+++ b/Settings/res/values-es-rUS/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Copias de seguridad y restablecimiento"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Restablecimiento de la configuración de fábrica"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Calibración"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Temporizador de apagado"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Configura temporizadores para apagar la TV y ahorrar energía"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Encendido y consumo"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Configuración de Eco"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Dispositivos"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Seleccionar formatos"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Configuración de sonido avanzada"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Habilitar modo de juego"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Coincidir con el rango dinámico del contenido"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Si se habilita esta opción, el sistema cambiará entre los diferentes formatos de rango dinámico para coincidir con el contenido. Esto puede provocar una pantalla negra durante el cambio de formato.\n\nHaz clic en Configuración de pantalla avanzada para ver más opciones de rango dinámico."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Rango dinámico preferido"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Conversión preferida por el sistema"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Deja que el sistema se ocupe de la conversión del formato"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Cuando está opción está seleccionada, el sistema determina un intervalo dinámico apropiado para enviar a tu pantalla y convierte el contenido a este rango dinámico según sea necesario."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Siempre hacer coincidir con el formato del contenido"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Forzar la conversión"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Fuerza la conversión al formato preferido"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Fuerza la conversión a un formato preferido. Forzar la conversión podría afectar otras opciones de configuración en el modo de pantalla o con el formato HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Siempre a SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Siempre a <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"¿Quieres forzar la compatibilidad con HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"De forma predeterminada, la conversión se forzará a <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"La pantalla funcionará con una resolución de 1080p/60 Hz Esta opción no es compatible con tu pantalla cuando funciona con la resolución de 4K/60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Por el momento, Dolby Vision no es compatible con esta resolución. Si habilitas Dolby Vision de forma manual, se cambiará la resolución de la pantalla a 1080p/60 Hz."</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"¿Quieres cambiar la resolución a 1080p/60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Forzar siempre la conversión a Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Si la opción Dolby Vision está desactivada en formatos HDR en la Configuración de pantalla avanzada, forzar la conversión a Dolby Vision volverá a activarla."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Forzar siempre la conversión a HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Si la opción HDR10 está desactivada en formatos HDR en la Configuración de pantalla avanzada, forzar la conversión a HDR10 volverá a activarla."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Forzar siempre la conversión a HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Si la opción HLG está desactivada en formatos HDR en la Configuración de pantalla avanzada, forzar la conversión a HLG volverá a activarla."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Forzar siempre la conversión a HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Si la opción HDR10+ está desactivada en formatos HDR en la Configuración de pantalla avanzada, forzar la conversión a HDR10+ volverá a activarla."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Forzar siempre la conversión a SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Si fuerzas la conversión a SDR, se inhabilitarán todos los formatos HDR en la Configuración de pantalla avanzada."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Igualar velocidad de fotogramas del contenido"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Solo fluida"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Fluida"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Si la app lo solicita, el dispositivo hará coincidir la velocidad de fotogramas resultante con la original del contenido SOLO si la TV puede realizar una transición fluida."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"La pantalla conectada no admite las transiciones de frecuencia de actualización fluidas. Esta opción no tendrá efecto, a menos que cambies a una pantalla que la admita."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Siempre"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"No fluida"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Si la app lo solicita, el dispositivo hará coincidir la velocidad de fotogramas resultante con la original del contenido, lo que puede provocar que la pantalla quede en blanco por un segundo al salir o ingresar a una reproducción de video."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Nunca"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Aunque la app lo solicite, el dispositivo nunca hará coincidir la velocidad de fotogramas resultante con la original del contenido que estás mirando."</string>
@@ -217,12 +190,12 @@
     <string name="resolution_selection_dialog_title" msgid="4029798035133645272">"Se cambió la resolución"</string>
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"¿Quieres cambiar la resolución a %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Seleccionar Aceptar para usar %1$s a partir de ahora."</string>
-    <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision no es compatible en %1$s, por lo que se desactivará en \"Configuración de pantalla avanzada\""</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Este modo admite lo siguiente: %1$s\nEs posible que, en algunas TVs, debas activar el HDMI mejorado para habilitar otros formatos HDR. Consulta la configuración de la TV para ver si se admite."</string>
+    <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s no admite Dolby Vision, por lo que se desactivará en \"Configuración de pantalla avanzada\""</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Este modo admite %1$s. En algunas TVs, es posible que debas activar el HDMI mejorado para habilitar otros formatos HDR. Consulta la configuración de la TV para ver si se admite."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Cancelar"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Aceptar"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"¿Deseas borrar los datos almacenados en caché?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Se borrarán los datos almacenados en caché de todas las aplicaciones."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -263,7 +236,7 @@
     <string name="bluetooth_known_devices_category" msgid="6895470515631452961">"Accesorios"</string>
     <string name="bluetooth_official_remote_category" msgid="5817814488268307170">"Control remoto"</string>
     <string name="bluetooth_official_remote_entry_title" msgid="6699700335229570038">"Configuración del control remoto"</string>
-    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"Configurar botones del control remoto"</string>
+    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"Configura botones de control remoto"</string>
     <string name="bluetooth_ir_entry_subtitle" msgid="4606207128353416151">"Controla el volumen, el encendido y la entrada en TVs, receptores y barras de sonido"</string>
     <string name="bluetooth_connect_action_title" msgid="7715342395313781643">"Conectar"</string>
     <string name="bluetooth_connect_confirm" msgid="4769958536295137386">"Conectar a %1$s"</string>
@@ -300,7 +273,7 @@
     <string name="no_device_admins" msgid="4628974717150185625">"No hay apps de administración de dispositivo disponibles"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="7678529948487939871">"El administrador inhabilitó la opción"</string>
     <string name="disabled_by_administrator_summary" msgid="3420979957115426764">"No disponible"</string>
-    <string name="manage_device_admin" msgid="5714217234035017983">"Apps de administración de dispositivos"</string>
+    <string name="manage_device_admin" msgid="5714217234035017983">"Apps de administración"</string>
     <string name="number_of_device_admins_none" msgid="2734299122299837459">"No hay apps activas"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="108190334043671416">"Inhabilitada: admin, encriptación o credenciales"</string>
     <string name="enterprise_privacy_settings" msgid="8226765895133003202">"Información del dispositivo administrado"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Tu organización administra este dispositivo."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> administra este dispositivo."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Más información"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{App de cámara}other{Apps de cámara}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"App de calendario"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Confirma para evitar que la pantalla se apague mientras está en uso, lo que puede aumentar el consumo de energía."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Cuando entre en inactividad"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Cuando esté mirando"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Apagar automáticamente"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Apagar automáticamente cuando se detecta inactividad"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Apagar automáticamente cuando se está viendo"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Apagar automáticamente la TV"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Apagar automáticamente la TV ante inactividad"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Apagar automáticamente la TV al mirar"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"El temporizador de \"Cuando entre en inactividad\" debe ser más corto que el de \"Cuando esté mirando\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"El temporizador de \"Cuando esté mirando\" debe ser más largo que el de \"Cuando entre en inactividad\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Limita conexión de red en modo en espera"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Comportamiento cuando se enciende la TV"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Restablecimiento"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Código de vinculación de Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Modos de energía"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Mejorar la eficiencia energética cuando la TV no esté en uso"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Habilita lo siguiente:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Ten en cuenta que este modo podría aumentar el consumo de energía del dispositivo."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Habilitar \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/Settings/res/values-es/energy-modes.xml b/Settings/res/values-es/energy-modes.xml
deleted file mode 100644
index 68448b60e..000000000
--- a/Settings/res/values-es/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Funciones de red esenciales"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Bajo consumo de energía"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Desactiva la conexión de red cuando no se está usando la televisión."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Actualizaciones y funciones críticas"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Funciones de red recomendadas"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Consumo de energía optimizado"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Activa funciones que encienden la televisión a través de la red (modo de espera en red)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Funciones de red adicionales"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Mayor consumo de energía"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Además de las funciones recomendadas, esta opción activa otras funciones cuando no se está usando la televisión que pueden aumentar el consumo de energía."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-es/strings.xml b/Settings/res/values-es/strings.xml
index 50a0281b1..4e9633a38 100644
--- a/Settings/res/values-es/strings.xml
+++ b/Settings/res/values-es/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Copia de seguridad y restauración"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Restablecer estado de fábrica"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Calibración"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Temporizador de apagado"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Configura temporizadores para apagar la TV y ahorrar energía"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Alimentación y energía"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Ajustes de Eco"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Dispositivos"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Seleccionar formatos"</string>
@@ -151,39 +151,12 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI‑CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Ajustes avanzados de sonido"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Permitir modo de juego"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Adaptarse al rango dinámico del contenido"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Al habilitar esta opción, el sistema cambiará entre los diferentes formatos de rango dinámico para adaptarse al contenido. La pantalla puede quedarse en negro durante el cambio de formato.\n\nHaz clic en Ajustes avanzados de la pantalla para ver más opciones de rango dinámico."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Rango dinámico preferido"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Conversión preferida por el sistema"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Permite que el sistema gestione la conversión del formato"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Al seleccionar esta opción, el sistema determinará un rango dinámico adecuado para que se envíe a tu pantalla y convertirá el contenido en dicho rango dinámico según sea necesario."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Siempre coincide con el formato del contenido"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Forzar conversión"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Fuerza la conversión al formato preferido"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Fuerza la conversión al formato preferido. Forzar la conversión puede afectar a otros ajustes en el modo de visualización o en el formato HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Siempre a SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Siempre a <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"¿Quieres forzar la salida HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"De forma predeterminada, la conversión se forzará a <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Tu pantalla se ejecutará con una resolución de 1080p a 60 Hz. Esta opción no es compatible con tu pantalla cuando se ejecuta con una resolución de 4K a 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision no se puede usar con esta resolución. Si habilitas Dolby Vision manualmente, la resolución de tu pantalla cambiará a 1080p 60 Hz."</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"¿Cambiar la resolución a 1080p 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Forzar siempre la conversión a Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Si Dolby Vision está inhabilitado en los formatos HDR de los ajustes avanzados de la pantalla y se fuerza la conversión a Dolby Vision, se volverá a habilitar."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Forzar siempre la conversión a HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Si HDR10 está inhabilitado en los formatos HDR de los ajustes avanzados de la pantalla y se fuerza la conversión a HDR10, se volverá a habilitar."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Forzar siempre la conversión a HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Si HLG está inhabilitado en los formatos HDR de los ajustes avanzados de la pantalla y se fuerza la conversión a HLG, se volverá a habilitar."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Forzar siempre la conversión a HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Si HDR10+ está inhabilitado en los formatos HDR de los ajustes avanzados de la pantalla y se fuerza la conversión a HDR10+, se volverá a habilitar."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Forzar siempre la conversión a SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Si se fuerza la conversión a SDR, se inhabilitarán todos los formatos HDR de los ajustes avanzados de la pantalla."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Adaptarse a la velocidad de fotogramas del contenido"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Solo transición fluida"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Solo si la transición es fluida"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Si la aplicación lo solicita, tu dispositivo intentará hacer coincidir la imagen con la velocidad de fotogramas original del contenido que veas, pero SOLO si tu televisor puede mostrar una transición fluida."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"La pantalla que has conectado no es compatible con las transiciones de tasa de refresco fluidas. Esta opción no tendrá ningún efecto a menos que cambies a una pantalla compatible."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Siempre"</string>
-    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Si la aplicación lo solicita, tu dispositivo intentará mostrar el contenido que veas en su velocidad de fotogramas original. Esto puede provocar que la pantalla se ponga en blanco durante un segundo al iniciar o terminar la reproducción del vídeo."</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Aunque la transición no sea fluida"</string>
+    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Si la aplicación lo solicita, tu dispositivo intentará mostrar en su velocidad de fotogramas original el contenido que ves. Esta opción puede provocar que la pantalla se ponga en blanco durante un segundo al iniciar o termina la reproducción del vídeo."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Nunca"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Aunque la aplicación lo solicite, tu dispositivo nunca intentará mostrar el contenido que veas en su velocidad de fotogramas original."</string>
     <string name="font_scale_settings_title" msgid="4114019544800225980">"Ajuste de texto"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"¿Cambiar la resolución a %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Selecciona Aceptar para usar %1$s a partir de ahora."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision no es compatible en %1$s. Se inhabilitará en \"Ajustes avanzados de la pantalla\"."</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Este modo admite: %1$s\nEn algunas televisiones, puede que tengas que activar el HDMI mejorado para habilitar más formatos de HDR. Consulta los ajustes de la TV para comprobar si puedes hacerlo."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Este modo admite %1$s. Es posible que en algunas televisiones tengas que activar el HDMI mejorado para habilitar más formatos HDR. Ve a la configuración de la TV para comprobar si puedes hacerlo."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Cancelar"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Aceptar"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"¿Borrar datos almacenados en caché?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Se borrarán datos en caché de las aplicaciones."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Este dispositivo está administrado por tu organización."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> administra este dispositivo."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Más información"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplicación de cámara}other{Aplicaciones de cámara}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplicación de calendario"</string>
@@ -678,7 +652,7 @@
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="9200419191468995574">"Texto de alto contraste"</string>
     <string name="accessibility_toggle_bold_text_preference_title" msgid="3328992531170432669">"Texto en negrita"</string>
     <string name="accessibility_color_correction" msgid="6765093204922184119">"Corrección de color"</string>
-    <string name="color_correction_usage" msgid="4160611639548748657">"Usar Corrección de color"</string>
+    <string name="color_correction_usage" msgid="4160611639548748657">"Usar corrección de color"</string>
     <string name="color_correction_color_mode" msgid="5081377780734779169">"Modo de color"</string>
     <string name="color_correction_mode_deuteranomaly" msgid="1513793544554228224">"Deuteronomalía"</string>
     <string name="color_correction_mode_deuteranomaly_summary" msgid="5991561481464520986">"Rojo-verde"</string>
@@ -768,7 +742,7 @@
     <string name="system_always_check" msgid="384870282800221580">"Comprobar siempre"</string>
     <string name="system_bt_hci_log" msgid="1891838112637932603">"Registro de Bluetooth HCI"</string>
     <string name="system_email_address" msgid="3725494874473757217">"Dirección de correo"</string>
-    <string name="system_usb_debugging" msgid="2158285492172755923">"Depuración por USB"</string>
+    <string name="system_usb_debugging" msgid="2158285492172755923">"Depuración USB"</string>
     <string name="system_allow_mock_locations" msgid="2483106887711851466">"Ubicaciones simuladas"</string>
     <string name="system_select_debug_app" msgid="6200987902307533721">"Aplicación para depurar"</string>
     <string name="system_wait_for_debugger" msgid="5715878008542589060">"Esperar al depurador"</string>
@@ -931,7 +905,7 @@
     <string name="device_apps_app_management_storage_used_desc" msgid="8928632612101487179">"<xliff:g id="SIZE">%1$s</xliff:g> utilizados en <xliff:g id="VOLUME">%2$s</xliff:g>"</string>
     <string name="device_apps_app_management_clear_data" msgid="7305471678286735600">"Borrar datos"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="170972356946852847">"Todos los datos de esta aplicación se eliminarán de forma permanente.\nEsto incluye los archivos, la configuración, las cuentas, las bases de datos, etc."</string>
-    <string name="device_apps_app_management_clear_default" msgid="4566187319647111484">"Borrar valores predeterminados"</string>
+    <string name="device_apps_app_management_clear_default" msgid="4566187319647111484">"Borrar acciones predeterminadas"</string>
     <string name="device_apps_app_management_clear_default_set" msgid="1649974109123107390">"Configurar para abrir en acciones"</string>
     <string name="device_apps_app_management_clear_default_none" msgid="5935252537185381597">"No hay opciones predeterminadas"</string>
     <string name="device_apps_app_management_clear_cache" msgid="2678301483598915479">"Borrar caché"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Confirma que quieres inhabilitar que la pantalla se apague durante la reproducción, lo cual puede aumentar el consumo de energía."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Cuando esté inactivo"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Mientras se ve contenido"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Apagar automáticamente"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Apagar automáticamente cuando esté inactivo"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Apagar automáticamente mientras se ve contenido"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Apagar automáticamente la televisión"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Apagar automáticamente la televisión cuando esté inactiva"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Apagar automáticamente la televisión cuando se vea contenido"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"El temporizador \"Cuando esté inactivo\" debe ser más corto que el temporizador \"Mientras se ve contenido\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"El temporizador \"Mientras se ve contenido\" debe ser más largo que el temporizador \"Cuando esté inactivo\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Limitar conexión de red en modo inactivo"</string>
@@ -1043,10 +1017,10 @@
     <string name="picture_in_picture_empty_text" msgid="4370198922852736600">"Las aplicaciones instaladas no admiten el modo imagen en imagen"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="3296649114939705896">"Permite que las aplicaciones creen una ventana imagen en imagen mientras estén abiertas o después de que hayas salido de ellas (por ejemplo, para seguir viendo un vídeo). La ventana se muestra sobre otras aplicaciones que estés utilizando."</string>
     <string name="alarms_and_reminders_description" msgid="4063972350154624500">"Permite que las aplicaciones programen alarmas y otras acciones que se llevan a cabo a horas concretas. Esta función hace que las aplicaciones sigas activas en segundo plano, lo que puede usar más batería.\n\nSi este permiso está desactivado, no funcionarán las alarmas ni los eventos que se activan a una hora determinada programados por esta aplicación."</string>
-    <string name="turn_screen_on_title" msgid="5293798529284629011">"Encender la pantalla"</string>
+    <string name="turn_screen_on_title" msgid="5293798529284629011">"Encender pantalla"</string>
     <string name="allow_turn_screen_on" msgid="4903401106871656521">"Permitir encender la pantalla"</string>
     <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Permite que una aplicación encienda la pantalla. Si das este permiso, la aplicación puede encender la pantalla en cualquier momento sin que se lo pidas."</string>
-    <string name="special_access" msgid="21806055758289916">"Acceso especial de aplicaciones"</string>
+    <string name="special_access" msgid="21806055758289916">"Aplicaciones con accesos especiales"</string>
     <string name="string_concat" msgid="5213870180216051497">"<xliff:g id="PART1">%1$s</xliff:g>, <xliff:g id="PART2">%2$s</xliff:g>"</string>
     <string name="audio_category" msgid="6143623109624947993">"Audio"</string>
     <string name="record_audio" msgid="5035689290259575229">"Grabar audio"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Comportamiento al encenderse"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Restablecer"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Código de emparejamiento de Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Modos de energía"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Mejorar la eficiencia energética cuando no se esté usando la televisión"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Habilita lo siguiente:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Ten en cuenta que este modo puede aumentar el consumo de energía del dispositivo."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Habilitar <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
 </resources>
diff --git a/Settings/res/values-et/energy-modes.xml b/Settings/res/values-et/energy-modes.xml
deleted file mode 100644
index 6f6e88593..000000000
--- a/Settings/res/values-et/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Peamised võrgufunktsioonid"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Vähene energiatarbimine"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Lülitab võrguühenduse välja, kui telerit ei ‏kas‏utata."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Kriitilised värskendused ja funktsioonid"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Soovitatavad võrgufunktsioonid"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimeeritud energiatarbimine"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Lülitab sisse funktsioonid, mis teleri võrgu kaudu äratavad (võrgupõhine ooterežiim)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Täiendavad võrgufunktsioonid"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Suurem energiatarbimine"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Lisaks soovitatud funktsioonidele lülitab see valik sisse lisafunktsioonid, kui telerit ei kasutata. See võib energiatarbimist suurendada."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-et/strings.xml b/Settings/res/values-et/strings.xml
index c04c78143..d37ea3df6 100644
--- a/Settings/res/values-et/strings.xml
+++ b/Settings/res/values-et/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Varundamine ja taastamine"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Tehase andmetele lähtestamine"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibreerimine"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Väljalülitustaimer"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Seadke taimerid, et lülitada teler välja ja säästa energiat"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Toide ja energia"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Ökonoomse režiimi seaded"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Seadmed"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Vormingute valimine"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Täpsemad heliseaded"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Luba mängurežiim"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Vastendamine sisu dünaamilise ulatusega"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Selle valiku lubamise korral vahetab süsteem vastavalt sisule erineva dünaamilise ulatuse vormingute vahel. See võib vormingu vahetamise ajal põhjustada ekraani mustaks muutumist.\n\nTäiendavate dünaamilise ulatuse valikute nägemiseks klõpsake valikul „Täpsemad kuvaseaded“."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Eelistatud dünaamiline ulatus"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Süsteemieelistusega konvertimine"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Lubab süsteemil vormingu konvertimist hallata"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Kui see valik on tehtud, määrab süsteem sobiliku dünaamilise vahemiku, mis ekraanile saadetakse, ja konverdib sisu vastavalt vajadusele sellesse dünaamilisse vahemikku."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Vastendab alati sisu vorminguga"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Konvertimise jõustamine"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Jõustab konvertimise eelistatud vormingule"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Jõustage konvertimine eelistatud vormingule. Konvertimise jõustamine võib mõjutada teisi kuvarežiimi või HDR-vormingu seadeid."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Alati SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Alati <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Kas soovite jõustada HDR-väljundi?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Vaikimisi jõustatakse konvertimise tüübiks <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Teie ekraan töötab 1080p ja 60 Hz eraldusvõimega. See valik ei ühildu teie ekraaniga, kui see töötab 4K ja 60 Hz eraldusvõimega."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Visionit ei toetata praeguse eraldusvõime juures. Kui lubate Dolby Visioni käsitsi, määratakse teie ekraani eraldusvõimeks 1080p 60 Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Kas määrata eraldusvõimeks 1080p 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Alati konvertimise jõustamine Dolby Visionile"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Kui Dolby Vision on HDR-vormingutes menüüs „Täpsemad kuvaseaded” keelatud, lubatakse Dolby Visioni konvertimise jõustamisel see uuesti."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Alati konvertimise jõustamine HDR10-le"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Kui HDR10 on HDR-vormingutes menüüs „Täpsemad kuvaseaded” keelatud, lubatakse HDR10 konvertimise jõustamisel see uuesti."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Alati konvertimise jõustamine HLG-le"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Kui HLG on HDR-vormingutes menüüs „Täpsemad kuvaseaded” keelatud, lubatakse HLG konvertimise jõustamisel see uuesti."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Alati konvertimise jõustamine HDR10+-le"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Kui HDR10+ on HDR-vormingutes menüüs „Täpsemad kuvaseaded” keelatud, lubatakse HDR10+ konvertimise jõustamisel see uuesti."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Alati konvertimise jõustamine SDR-le"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"SDR-i konvertimise jõustamisel keelatakse kõik vormingud HDR-vormingutes jaotises Täpsemad kuvaseaded."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Vastenda sisu kaadrisagedusega"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Ainult sujuv"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Sujuv"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Kui rakendus seda taotleb, vastendab teie seade väljundi vaadatava sisu algse kaadrisagedusega AINULT siis, kui teie teler on sujuvaks üleviimiseks suuteline."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Teie ühendatud ekraan ei toeta värskendussageduse sujuvat üleviimist. Sellel valikul ei ole mõju, kui te ei võta kasutusele ekraani, mis seda funktsiooni toetab."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Alati"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Mittesujuv"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Kui rakendus seda taotleb, vastendab teie seade väljundi vaadatava sisu algse kaadrisagedusega. Seetõttu võib ekraanikuva video taasesitusest väljumisel või sellele lülitumisel hetkeks tühi olla."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Mitte kunagi"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Isegi kui rakendus seda taotleb, ei ürita teie seade mitte kunagi väljundit vaadatava sisu algse kaadrisagedusega vastendada."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Kas määrata eraldusvõimeks %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Valige OK, et edaspidi kasutada eraldusvõimet %1$s."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Visionit režiimis %1$s ei toetata ja see on menüüs „Täpsemad kuvaseaded“ keelatud"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"See režiim toetab: %1$s\nMõnes teleris peate võib-olla sisse lülitama täiustatud HDMI, et lubada rohkem HDR-vorminguid. Vaadake oma teleri seadetest, kas seda toetatakse."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"See režiim toetab valikut %1$s. Mõnes teleris peate võib-olla sisse lülitama täiustatud HDMI, et lubada rohkem HDR-vorminguid. Vaadake oma teleri seadetest, kas seda toetatakse."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Tühista"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Kas soovite vahemälus olevad andmed kustutada?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Kustutab rakenduste vahemälus olevad andmed."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Seda seadet haldab teie organisatsioon."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Seda seadet haldab <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Lisateave"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kaamerarakendus}other{Kaamerarakendused}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Kalendrirakendus"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Kinnitage, et vältida vaatamise ajal ekraani väljalülitumist. See võib suurendada energiakasutust."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Passiivne"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Vaatamisel"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Lülita automaatselt välja"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Lülita passiivsuse korral automaatselt välja"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Lülita vaatamise ajal automaatselt välja"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Teleri automaatne väljalülitamine"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Lülita teler automaatselt välja, kui see on inaktiivne"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Lülita teler automaatselt välja, kui seda vaadatakse"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Taimer „Passiivne“ peab olema lühem kui taimer „Vaatamisel“"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Taimer „Vaatamisel“ peab olema pikem kui taimer „Passiivne“"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Ooterežiimis võrguühenduse piiramine"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Käitumine sisselülitamisel"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Lähtesta"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Etherneti sidumiskood"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Energiarežiimid"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Parandage energiatõhusust, kui telerit ei kasutata"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Lubab järgmised."</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Pange tähele, et see režiim võib suurendada seadme energiatarbimist."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Luba režiim „<xliff:g id="ENERGYMODENAME">%s</xliff:g>”"</string>
 </resources>
diff --git a/Settings/res/values-eu/energy-modes.xml b/Settings/res/values-eu/energy-modes.xml
deleted file mode 100644
index 3471ded1e..000000000
--- a/Settings/res/values-eu/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Sarearen ezinbesteko eginbideak"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Energia-kontsumo txikia"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Desaktibatu sareko konexioa telebista erabiltzen ari ez zarenean."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Eguneratze eta funtzio garrantzitsuak"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Sarearen eginbide gomendatuak"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Energia-kontsumo optimizatua"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Sarearen bidez (sare bidezko egonean modua) telebista aktibatzen duten eginbideak aktibatzen ditu."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Idatzi lehenengo eginbidea]"</item>
-    <item msgid="8724721267222341891">"[Idatzi bigarren eginbidea]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Sarearen eginbide gehigarriak"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Energia-kontsumo handia"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Gomendatutako eginbideez gain, agian energia-kontsumo handiagoa duten eginbide gehigarriak aktibatzen ditu aukera honek telebista erabiltzen ari ez zarenean."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Idatzi lehenengo eginbidea]"</item>
-    <item msgid="170760143032597722">"[Idatzi bigarren eginbidea]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-eu/strings.xml b/Settings/res/values-eu/strings.xml
index 4f0101004..68de38ed2 100644
--- a/Settings/res/values-eu/strings.xml
+++ b/Settings/res/values-eu/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Babeskopiak eta leheneratzea"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Berrezarri jatorrizko datuak"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibrazioa"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Itzaltzeko tenporizadorea"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Ezarri tenporizadoreak telebista itzaltzeko eta energia aurrezteko moduan"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Piztu eta itzaltzea eta kontsumoa"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Eko moduaren ezarpenak"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Gailuak"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Hautatu formatuak"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Soinuaren ezarpen aurreratuak"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Eman jokatzeko modua erabiltzeko baimena"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Bat etorri edukiaren tarte dinamikoarekin"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Aukera hau gaitzean, sistema tarte dinamikoko formatu batetik bestera aldatuko da edukiarekin bat etortzeko. Ondorioz, baliteke pantaila beltz jartzea formatu batetik bestera aldatu bitartean.\n\nTarte dinamikoen aukera gehiago ikusteko, sakatu pantailaren ezarpen aurreratuak."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Tarte dinamiko hobetsia"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Sistemak hobetsitako bihurketa"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Utzi sistemari formatuaren bihurketa kudeatzen"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Aukera hau hautatzean, sistemak zehaztuko du tarte dinamiko egokia hura pantailara bidaltzeko eta edukia tarte dinamiko horretara bihurtzeko, beharrezkoa bada."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Beti dator bat edukiaren formatuarekin"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Behartu bihurketa"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Bihurketa hobetsitako formatura behartzen du"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Behartu bihurketa hobetsitako formatura. Baliteke bihurketa behartzeak bistaratzeko moduaren edo HDR formatuaren beste ezarpen batzuei eragitea."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Beti SDR formatura"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Beti <xliff:g id="HDR_TYPE">%s</xliff:g> formatura"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"HDR formaturako irteera behartu nahi duzu?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Modu lehenetsian, <xliff:g id="HDR_TYPE">%s</xliff:g> formatura behartuko da bihurketa."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Zure pantailak 1080p bereizmena izango du (60 Hz). Aukera hori ez da bateragarria pantailarekin pantailak 4K bereizmena badu (60 Hz)."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Bereizmen honetan ez da onartzen Dolby Vision. Dolby Vision eskuz gaituz gero, 1080p-ko (60Hz) bereizmenera aldatuko da pantaila."</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"1080p-ko (60Hz) bereizmenera aldatu nahi duzu?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Behartu beti Dolby Vision-erako bihurketa"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Pantailaren ezarpen aurreratuetako HDRko formatuetarako Dolby Vision desgaituta badago, Dolby Vision-erako bihurketa behartzeak Dolby Vision berriro gaituko du."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Behartu beti HDR10-erako bihurketa"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Pantailaren ezarpen aurreratuetako HDRko formatuetarako HDR10 desgaituta badago, HDR10-erako bihurketa behartzeak HDR10 berriro gaituko du."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Behartu beti HLGrako bihurketa"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Pantailaren ezarpen aurreratuetako HDRko formatuetarako HLG desgaituta badago, HLGrako bihurketa behartzeak HLG berriro gaituko du."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Behartu beti HDR10+ araurako bihurketa"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Pantailaren ezarpen aurreratuetako HDRko formatuetarako HDR10+ desgaituta badago, HDR10+ araurako bihurketa behartzeak HDR10+ berriro gaituko du."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Behartu beti SDR-rako bihurketa"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"SDR-rako bihurketa behartuz gero, pantailaren ezarpen aurreratuetako HDRko formatuetan dauden formatu guztiak desgaituko dira."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Bat etorri edukiaren irudi-abiadurarekin"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Etenik gabe soilik"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Zuzenekoa"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Aplikazioak eskatzen badu eta telebistak zuzeneko trantsizio bat egin badezake SOILIK bat-etorraraziko du gailuak bere irteera ikusten ari zaren edukiaren jatorrizko irudi-abiadurarekin."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Konektatu duzun pantailak ez ditu onartzen etenik gabeko trantsizioak freskatze-abiaduran. Aukera honek ez du eraginik izango hura onartzen duen pantaila bat erabiltzen ez baduzu."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Beti"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Ez-zuzenekoa"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Aplikazioak eskatzen badu, ikusten ari zaren edukiaren jatorrizko irudi-abiadurarekin bat-etorraraziko du gailuak bere irteera. Ondorioz, baliteke segundo batez pantailan ezer ez agertzea bideoa erreproduzitzen duzunean edo erreproduzitzeari uzten diozunean."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Inoiz ez"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Aplikazioak eskatu arren, gailuak ez du bat-etorraraziko bere irteera ikusten ari zaren edukiaren jatorrizko irudi-abiadurarekin."</string>
@@ -217,12 +190,12 @@
     <string name="resolution_selection_dialog_title" msgid="4029798035133645272">"Aldatu da bereizmena"</string>
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"%1$s ezarri nahi duzu bereizmen gisa?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Hemendik aurrera %1$s erabiltzeko, hautatu Ados."</string>
-    <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision-ek ez du %1$s modua onartzen eta pantailaren ezarpen aurreratuetan desgaituko da"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Moduak hauek onartzen ditu: %1$s\nTelebista batzuetan, baliteke HDMI hobetua aktibatu behar izatea HDR formatu gehiago gaitzeko. Aukera hori duzun jakiteko, ikusi telebistaren ezarpenak."</string>
+    <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision ez da %1$s moduarekin bateragarria, eta pantailaren ezarpen aurreratuetan desgaituko da"</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Moduak hauek onartzen ditu: %1$s. Telebista batzuetan, baliteke HDMI hobetua aktibatu behar izatea HDR formatu gehiago gaitzeko. Aukera hori duzun jakiteko, ikusi telebistaren ezarpenak."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Utzi"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Ados"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Cacheko datuak garbitu nahi dituzu?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Aplikazio guztien cacheko datuak garbituko dira."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Zure erakundeak kudeatzen du gailua."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> erakundeak kudeatzen du gailu hau."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Lortu informazio gehiago"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kamera-aplikazioa}other{Kamera-aplikazioak}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Egutegi-aplikazioa"</string>
@@ -371,8 +345,8 @@
     <string name="about_build" msgid="8467840394761634575">"Android TV-ren sistema eragilearen konpilazioa"</string>
     <string name="show_dev_countdown" msgid="4064986225625409361">"{count,plural, =1{# urrats falta zaizu garatzaile izateko}other{# urrats falta zaizkizu garatzaile izateko}}"</string>
     <string name="about_ads" msgid="7662896442040086522">"Iragarkiak"</string>
-    <string name="ads_description" msgid="8081069475265061074">"Kudeatu iragarkien ezarpenak; adibidez, berrezarri publizitate-identifikatzailea."</string>
-    <string name="ads_content_description" msgid="1006489792324920289">"Iragarkiak: kudeatu iragarkien ezarpenak; adibidez, berrezarri publizitate-identifikatzailea."</string>
+    <string name="ads_description" msgid="8081069475265061074">"Kudeatu iragarkien ezarpenak; adibidez, berrezarri publizitate IDa."</string>
+    <string name="ads_content_description" msgid="1006489792324920289">"Iragarkiak: kudeatu iragarkien ezarpenak; adibidez, berrezarri publizitate IDa."</string>
     <string name="show_dev_on" msgid="612741433124106067">"Garatzailea zara!"</string>
     <string name="show_dev_already" msgid="1522591284776449818">"Ez dago zertan, dagoeneko garatzailea zara"</string>
     <string name="device_info_default" msgid="2374506935205518448">"Ezezaguna"</string>
@@ -797,7 +771,7 @@
     <string name="system_desc_hdmi_optimization" msgid="5695603795556335912">"Optimizatu pantaila bereizmen edo irudi-abiadura handiena izan dezan. Ezarpen honek Ultra HD motako pantailetan soilik du eragina. Ezarpena aldatuz gero, gailua berrabiaraziko da."</string>
     <string name="system_desc_bt_hci_log" msgid="2592649923221658103">"Gaitu Bluetooth HCI miatze-erregistroa"</string>
     <string name="system_desc_usb_debugging" msgid="5672275208185222785">"Aktibatu arazketa modua USBa konektatzean"</string>
-    <string name="system_desc_wait_for_debugger" msgid="7213496668606417691">"Araztutako aplikazioak araztailea erantsi arte itxaroten du exekutatu aurretik"</string>
+    <string name="system_desc_wait_for_debugger" msgid="7213496668606417691">"Araztutako aplikazioa araztailea erantsi arte itxaroten ari da exekutatu aurretik"</string>
     <string name="system_desc_show_layout_bounds" msgid="5275008598296135852">"Erakutsi bideo zatiaren mugak, marjinak, etab."</string>
     <string name="system_desc_show_gpu_view_updates" msgid="9088343415389734854">"Distirarazi leiho barruko ikuspegiak GPUz marraztean"</string>
     <string name="system_desc_show_hardware_layer" msgid="3483713991865249527">"Distirarazi hardware-geruzak berdez haiek eguneratzean"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Berretsi pantaila itzaltzea eragozteko multimedia-edukia ikusi bitartean (baliteke energia gehiago kontsumitzea modu horrek)."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Inaktibo dagoenean"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Zerbait ikusi bitartean"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Desaktibatu automatikoki"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Desaktibatu automatikoki inaktibo dagoenean"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Desaktibatu automatikoki ikusi bitartean"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Itzali telebista automatikoki"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Itzali telebista automatikoki inaktibo dagoenean"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Itzali telebista automatikoki ikusten ari zarenean"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"Inaktibo dagoenean\" izeneko tenporizadoreak \"Zerbait ikusi bitartean\" izenekoak baino laburragoa izan behar du"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"Zerbait ikusi bitartean\" izeneko tenporizadoreak \"Inaktibo dagoenean\" izenekoak baino luzeagoa izan behar du"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Mugatu sarerako konexioak egonean moduan"</string>
@@ -1042,7 +1016,7 @@
     <string name="picture_in_picture_app_detail_switch" msgid="3688997906817583854">"Eman pantaila txiki gainjarria erabiltzeko baimena"</string>
     <string name="picture_in_picture_empty_text" msgid="4370198922852736600">"Ez dago instalatuta pantaila txiki gainjarriarekin bateragarria den aplikaziorik"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="3296649114939705896">"Eman pantaila txiki gainjarri bat sortzeko baimena aplikazioei, aplikazioa irekita dagoenean nahiz hartatik irtetean (adibidez, bideoak ikusten jarraitzeko). Erabiltzen ari zaren beste aplikazioen gaienean erakutsiko da leiho hori."</string>
-    <string name="alarms_and_reminders_description" msgid="4063972350154624500">"Eman alarmak ezartzeko eta orduaren araberako beste ekintza batzuk programatzeko baimena aplikazioei. Hala, aplikazioek atzeko planoan funtzionatuko dute, eta litekeena da bateria gehiago kontsumitzea.\n\nBaimen hori ematen ez baduzu, ez dute funtzionatuko aplikazio horien bidez programatutako alarmek eta orduaren araberako ekintzek."</string>
+    <string name="alarms_and_reminders_description" msgid="4063972350154624500">"Eman alarmak ezartzeko eta orduaren araberako beste ekintza batzuk programatzeko baimena aplikazioei. Hala, aplikazioek atzeko planoan funtzionatuko dute, eta litekeena da bateria gehiago kontsumitzea.\n\nEz baduzu ematen baimen hori, ez dute funtzionatuko aplikazio horien bidez programatutako alarmek eta orduaren araberako ekintzek."</string>
     <string name="turn_screen_on_title" msgid="5293798529284629011">"Piztu pantaila"</string>
     <string name="allow_turn_screen_on" msgid="4903401106871656521">"Eman pantaila pizteko baimena"</string>
     <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Eman pantaila pizteko baimena aplikazioei. Baimena emanez gero, aplikazioek edonoiz piztu ahal izango dute pantaila, zuk halako asmorik izan ez arren."</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Piztean izan beharreko portaera"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Berrezarri"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Ethernet bidez parekatzeko kodea"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Energia moduak"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Hobetu energiaren eraginkortasuna telebista erabiltzen ari ez zarenean"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Hauek gaitzen ditu:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Kontuan izan agian modu honek gailuaren energia-kontsumoa handituko duela."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Gaitu <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
 </resources>
diff --git a/Settings/res/values-fa/energy-modes.xml b/Settings/res/values-fa/energy-modes.xml
deleted file mode 100644
index e47f0e57e..000000000
--- a/Settings/res/values-fa/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"ویژگی‌های ضروری شبکه"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"مصرف کم انرژی"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"هنگامی که از تلویزیون استفاده نمی‌شود اتصال شبکه خاموش شود."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"عملکردها و به‌روزرسانی‌های بسیار مهم"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"ویژگی‌های توصیه‌شده شبکه"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"مصرف بهینه انرژی"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ویژگی‌هایی را روشن می‌کند که تلویزیون را ازطریق شبکه بیدار می‌کند (آماده‌به‌کار متصل به شبکه)"</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[درج ویژگی ۱]"</item>
-    <item msgid="8724721267222341891">"[درج ویژگی ۲]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"ویژگی‌های اضافی شبکه"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"مصرف بیشتر انرژی"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"علاوه‌بر ویژگی‌های توصیه‌شده، این گزینه در مواقعی که از تلویزیون استفاده نمی‌شود ویژگی‌هایی اضافی روشن می‌کند که می‌تواند مصرف انرژی را افزایش دهد."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[درج ویژگی ۱]"</item>
-    <item msgid="170760143032597722">"[درج ویژگی ۲]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-fa/strings.xml b/Settings/res/values-fa/strings.xml
index 7c2c7573a..5c5465128 100644
--- a/Settings/res/values-fa/strings.xml
+++ b/Settings/res/values-fa/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"پشتیبان‌گیری و بازیابی"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"بازنشانی داده‌های کارخانه"</string>
     <string name="device_calibration" msgid="2907914144048739705">"کالیبراسیون"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"زمان‌سنج خاموش شدن"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"تنظیم زمان‌سنج برای خاموش کردن تلویزیون و صرفه‌جویی در مصرف انرژی"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"برق و انرژی"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"تنظیمات بوم‌مصرف"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"دستگاه‌ها"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"انتخاب قالب"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"تنظیمات پیشرفته صدا"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"مجاز کردن حالت بازی"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"مطابقت دادن بازه پویای محتوا"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"هنگام فعال کردن این گزینه، سیستم بین قالب‌های مختلف بازه پویا جابه‌جا می‌شود تا با محتوا مطابقت پیدا کند. به‌همین دلیل ممکن است درطول تغییر قالب، صفحه سیاهی ببینید.\n\nبرای گزینه‌های بازه پویای بیشتر، روی «تنظیمات پیشرفته نمایشگر» کلیک کنید."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"بازه پویای ترجیحی"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"تبدیل ترجیحی سیستم"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"به سیستم اجازه داده می‌شود تبدیل قالب را مدیریت کند"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"وقتی این گزینه انتخاب شود، سیستم محدوده پویای مناسبی را برای ارسال به صفحه‌نمایش شما تعیین می‌کند و درصورت نیاز محتوا را به این محدوده پویا تبدیل می‌کند."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"همیشه با قالب محتوا مطابقت دارد"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"تبدیل اجباری"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"تبدیل به قالب ترجیحی را اجباری می‌کند"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"تبدیل به قالب ترجیحی را اجباری می‌کند. تبدیل اجباری ممکن است بر دیگر تنظیمات در «حالت نمایش» یا «قالب HDR» تأثیر بگذارد."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"همیشه به SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"همیشه به <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"آیا می‌خواهید خروجی HDR را اجباری کنید؟"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"به‌طور پیش‌فرض، تبدیل به‌صورت اجباری به <xliff:g id="HDR_TYPE">%s</xliff:g> انجام می‌شود."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"صفحه‌نمایش شما با وضوح ۱۰۸۰ پیکسل و ۶۰ هرتز کار می‌کند. وقتی صفحه‌نمایش شما با وضوح 4K و ۶۰ هرتز کار می‌کند، این گزینه با آن سازگار نیست."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"در این وضوح از Dolby Vision پشتیبانی نمی‌شود. اگر Dolby Vision را به‌صورت دستی فعال کنید، وضوح نمایشگر به ۱۰۸۰ پیکسل ۶۰ هرتز تغییر خواهد کرد"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"وضوح به ۱۰۸۰ پیکسل ۶۰ هرتز تغییر کند؟"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"همیشه تبدیل به Dolby Vision به‌طور اجباری انجام شود"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"اگر Dolby Vision در «قالب‌های HDR» در «تنظیمات پیشرفته نمایشگر» غیرفعال شده باشد، تبدیل اجباری به Dolby Vision باعث می‌شود این تنظیم مجدداً فعال شود."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"همیشه تبدیل به HDR10 به‌طور اجباری انجام شود"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"اگر HDR10 در «قالب‌های HDR» در «تنظیمات پیشرفته نمایشگر» غیرفعال شده باشد، تبدیل اجباری به HDR10 باعث می‌شود این تنظیم مجدداً فعال شود."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"همیشه تبدیل به HLG به‌طور اجباری انجام شود"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"اگر HLG در «قالب‌های HDR» در «تنظیمات پیشرفته نمایشگر» غیرفعال شده باشد، تبدیل اجباری به HLG باعث می‌شود این تنظیم مجدداً فعال شود."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"همیشه تبدیل به HDR10+‎ به‌طور اجباری انجام شود"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"اگر HDR10+‎ در «قالب‌های HDR» در «تنظیمات پیشرفته نمایشگر» غیرفعال شده باشد، تبدیل اجباری به HDR10+‎ باعث می‌شود این تنظیم مجدداً فعال شود."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"همیشه تبدیل به SDR به‌طور اجباری انجام شود"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"تبدیل اجباری به SDR باعث می‌شود همه قالب‌ها در «قالب‌های HDR» در «تنظیمات پیشرفته نمایشگر» غیرفعال شود."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"مطابقت دادن نرخ فریم محتوا"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"فقط یکپارچه"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"یکپارچه"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"اگر برنامه درخواست کند، تنها درصورتی‌که تلویزیونتان بتواند انتقال یکپارچه را اجرا کند، دستگاهتان خروجی‌اش را با نرخ فریم اصلی محتوایی که تماشا می‌کنید هماهنگ خواهد کرد."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"نمایشگر متصل از انتقال نرخ بازآوری یکپارچه پشتیبانی نمی‌کند. این گزینه تأثیری نخواهد داشت، مگراینکه از نمایشگری که از این ویژگی پشتیبانی می‌کند استفاده کنید."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"همیشه"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"غیریکپارچه"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"اگر برنامه درخواست کند، دستگاهتان خروجی‌اش را با نرخ فریم اصلی محتوایی که تماشا می‌کنید هماهنگ خواهد کرد. در چنین شرایطی، وقتی از بازپخش ویدیو خارج می‌شوید یا به آن وارد می‌شود، ممکن است صفحه‌تان لحظه‌ای خالی شود."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"هرگز"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"حتی اگر برنامه درخواست کند، دستگاهتان هیچ‌گاه خروجی‌اش را با نرخ فریم اصلی محتوایی که تماشا می‌کنید هماهنگ نخواهد کرد."</string>
@@ -217,12 +190,12 @@
     <string name="resolution_selection_dialog_title" msgid="4029798035133645272">"وضوح تغییر کرده است"</string>
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"وضوح به %1$s تغییر کند؟"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"«تأیید» را انتخاب کنید تا ازاین‌پس از %1$s استفاده شود."</string>
-    <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"‫Dolby Vision در %1$s پشتیبانی نمی‌شود و در «تنظیمات پیشرفته نمایشگر» غیرفعال می‌شود."</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"این حالت از این موارد پشتیبانی می‌کند: %1$s\nدر برخی‌از تلویزیون‌ها، باید «HDMI بهبودیافته» را روشن کنید تا قالب‌های HDR بیشتری فعال شود. تنظیمات تلویزیون را بررسی کنید تا ببینید این مورد پشتیبانی می‌شود یا نه."</string>
+    <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision در %1$s پشتیبانی نمی‌شود و در «تنظیمات پیشرفته نمایشگر» غیرفعال می‌شود."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"این حالت از %1$s پشتیبانی می‌کند. در برخی‌از تلویزیون‌ها ممکن است نیاز باشد HDMI بهبودیافته را روشن کنید تا قالب‌های HDR بیشتری فعال شود. تنظیمات تلویزیون را بررسی کنید تا ببینید این مورد پشتیبانی می‌شود یا نه."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"لغو"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"تأیید"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"هرتز"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> هرتز)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> هرتز)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"اطلاعات در حافظه پنهان پاک شود؟"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"اطلاعات در حافظه پنهان همه برنامه‌ها پاک می‌شود."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"این دستگاه را سازمانتان مدیریت می‌کند."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"این دستگاه توسط <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> مدیریت می‌شود."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">"،"</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"بیشتر بدانید"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{برنامه دوربین}one{برنامه دوربین}other{برنامه‌های دوربین}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"برنامه تقویم"</string>
@@ -774,8 +748,8 @@
     <string name="system_wait_for_debugger" msgid="5715878008542589060">"منتظر اشکال‌زدا"</string>
     <string name="system_verify_apps_over_usb" msgid="7289212844195483932">"تأیید برنامه‌ها ازطریق USB"</string>
     <string name="system_desc_verify_apps_over_usb" msgid="7737988681480237094">"‫بررسی برنامه‌های نصب شده از طریق ADB/ADT از نظر رفتار مضر"</string>
-    <string name="system_wifi_verbose_logging" msgid="3097788974146704831">"گزارش‌گیری مفصل Wi‑Fi"</string>
-    <string name="system_desc_wifi_verbose_logging" msgid="3537578245428327314">"فعال کردن گزارش‌گیری مفصل Wi‑Fi"</string>
+    <string name="system_wifi_verbose_logging" msgid="3097788974146704831">"گزارش‌گیری طولانی Wi‑Fi"</string>
+    <string name="system_desc_wifi_verbose_logging" msgid="3537578245428327314">"فعال کردن گزارش‌گیری طولانی Wi‑Fi"</string>
     <string name="system_show_touches" msgid="8244331695139748286">"نمایش تعداد لمسها"</string>
     <string name="system_pointer_location" msgid="8724050865245555084">"محل اشاره‌گر"</string>
     <string name="system_show_layout_bounds" msgid="8803080672553699649">"نمایش محدوده‌های طرح‌بندی"</string>
@@ -896,7 +870,7 @@
     <string name="restricted_profile_configure_title" msgid="3327502517511010296">"تنظیمات"</string>
     <string name="restricted_profile_configure_apps_title" msgid="2244201859522056827">"برنامه‌های مجاز شده"</string>
     <string name="restricted_profile_allowed" msgid="970921490464867884">"مجاز شد"</string>
-    <string name="restricted_profile_not_allowed" msgid="8184983064118036268">"مجاز نبودن"</string>
+    <string name="restricted_profile_not_allowed" msgid="8184983064118036268">"مجاز نیست"</string>
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"سفارشی کردن محدودیت‌ها"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"یک لحظه..."</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"تغییر پین"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"لطفاً تأیید کنید که نمایشگر درحین تماشا خاموش نشود؛ این کار احتمال افزایش مصرف انرژی را همراه دارد."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"هنگام عدم فعالیت"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"هنگام تماشا"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"خاموش شدن خودکار"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"هنگام عدم فعالیت به‌طور خودکار خاموش شود"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"هنگام تماشا به‌طور خودکار خاموش شود"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"خاموش شدن خودکار تلویزیون"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"خاموش شدن خودکار تلویزیون هنگام غیرفعال بودن"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"خاموش شدن خودکار تلویزیون هنگام تماشا"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"زمان‌سنج «هنگام عدم فعالیت» باید کوتاه‌تر از زمان‌سنج «هنگام تماشا» باشد"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"زمان‌سنج «هنگام تماشا» باید طولانی‌تر از زمان‌سنج «هنگام عدم فعالیت» باشد"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"محدود کردن شبکه در حالت آماده‌به‌کار"</string>
@@ -1000,18 +974,18 @@
     <string name="apps_permissions" msgid="7876407267050498394">"مجوزها"</string>
     <string name="device_apps_permissions" msgid="8421323706003063878">"اجازه‌های برنامه"</string>
     <string name="app_permissions_group_summary" msgid="6818210080117761117">"<xliff:g id="COUNT_0">%1$d</xliff:g> از <xliff:g id="COUNT_1">%2$d</xliff:g> برنامه‌های مجاز"</string>
-    <string name="bluetooth_permission_request" msgid="7788089036741496993">"درخواست اجازه بلوتوث"</string>
+    <string name="bluetooth_permission_request" msgid="7788089036741496993">"درخواست مجوز بلوتوث"</string>
     <string name="security_patch" msgid="8924741264829495392">"سطح وصله امنیتی «سیستم‌عامل Android TV»"</string>
     <string name="choose_application" msgid="2375936782103669988">"انتخاب برنامه"</string>
     <string name="experimental_preference" msgid="3982593252210557436">"(آزمایشی)"</string>
-    <string name="reboot_safemode_action" msgid="2862127510492131128">"بازراه‌اندازی به حالت ایمن"</string>
-    <string name="reboot_safemode_confirm" msgid="5745977150299953603">"می‌خواهید به حالت ایمن بازراه‌اندازی کنید؟‌"</string>
-    <string name="reboot_safemode_desc" msgid="2919933461408942799">"با این کار همه برنامه‌های شخص ثالثی که نصب کرده‌اید غیرفعال می‌شود. با بازراه‌اندازی سیستم، این برنامه‌ها دوباره بازیابی می‌شوند."</string>
+    <string name="reboot_safemode_action" msgid="2862127510492131128">"راه‌اندازی مجدد در حالت ایمن"</string>
+    <string name="reboot_safemode_confirm" msgid="5745977150299953603">"می‌خواهید در حالت ایمن راه‌اندازی مجدد کنید؟‌"</string>
+    <string name="reboot_safemode_desc" msgid="2919933461408942799">"با این کار همه برنامه‌های شخص ثالثی که نصب کرده‌اید غیرفعال می‌شود. با راه‌اندازی مجدد سیستم، این برنامه‌ها دوباره بازیابی می‌شوند."</string>
     <string name="capturing_bugreport" msgid="832512801903486821">"درحال ثبت گزارش اشکال"</string>
     <string name="available_virtual_keyboard_category" msgid="7445262027711560629">"صفحه‌کلیدهای مجازی در دسترس"</string>
     <string name="manage_keyboards" msgid="7983890675377321912">"مدیریت صفحه‌کلیدها"</string>
     <string name="app_permission_summary_allowed" msgid="5359622119044147500">"مجاز"</string>
-    <string name="app_permission_summary_not_allowed" msgid="5131611341738385303">"مجاز نبودن"</string>
+    <string name="app_permission_summary_not_allowed" msgid="5131611341738385303">"غیرمجاز"</string>
     <string name="usage_access" msgid="8402350645248312782">"دسترسی به داده‌های مصرف"</string>
     <string name="usage_access_description" msgid="3276026988575551587">"دسترسی به داده‌های مصرف اجازه ردیابی برنامه‌هایی را که استفاده می کنید، چندوقت یک‌بار از آن‌ها استفاده می کنید، همچنین شرکت مخابراتی، تنظیمات زبان، و سایر جزئیات را به برنامه می‌دهد."</string>
     <string name="high_power_apps" msgid="5841073958519976562">"بهینه‌سازی انرژی"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"عملکرد تلویزیون هنگام روشن بودن"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"بازنشاندن"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"کد مرتبط‌سازی اترنت"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"حالت‌های انرژی"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"بهبود بهره‌وری انرژی در مواقعی که از تلویزیون استفاده نمی‌شود"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"این حالت را فعال می‌کند:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"توجه داشته باشید که ممکن است این حالت مصرف برق دستگاه را افزایش دهد."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"فعال کردن «<xliff:g id="ENERGYMODENAME">%s</xliff:g>»"</string>
 </resources>
diff --git a/Settings/res/values-fi/energy-modes.xml b/Settings/res/values-fi/energy-modes.xml
deleted file mode 100644
index b441948ee..000000000
--- a/Settings/res/values-fi/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Tärkeät verkko-ominaisuudet"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Käyttää vähän energiaa"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Katkaise verkkoyhteys, kun TV ei ole käytössä."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Tärkeät päivitykset ja toiminnot"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Suositellut verkko-ominaisuudet"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Energiankäyttö optimoitu"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Laittaa päälle ominaisuudet, jotka aktivoivat TV:n verkon kautta (verkkovalmiustila)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Verkon lisäominaisuudet"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Käyttää enemmän energiaa"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Suositeltujen ominaisuuksien lisäksi tämä valinta laittaa päälle lisäominaisuuksia, jotka saattavat kuluttaa enemmän energiaa, kun TV ei ole käytössä."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-fi/strings.xml b/Settings/res/values-fi/strings.xml
index 95faf5b64..77d91dc0c 100644
--- a/Settings/res/values-fi/strings.xml
+++ b/Settings/res/values-fi/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Varmuuskopiointi ja palautus"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Tehdasasetuksien palauttaminen"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibrointi"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Sammuttamisen ajastin"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Aseta ajastimia TV:n sammuttamiselle ja säästä energiaa"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Virta ja energia"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Ekoasetukset"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Laitteet"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Valitse muodot"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Äänen lisäasetukset"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Salli pelitila"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Valitse sama dynaaminen alue kuin sisällöllä"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Kun vaihtoehto otetaan käyttöön, järjestelmä vaihtaa dynaamisen alueen eri muotojen välillä löytääkseen sisältöä vastaavan asetuksen. Tämä voi aiheuttaa mustan näytön muodon vaihtamisen aikana.\n\nJos haluat nähdä lisää dynaamisen alueen vaihtoehtoja, valitse Näytön lisäasetukset."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Ensisijainen dynaaminen alue"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Järjestelmän valitsema muuntaminen"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Sallii järjestelmän hallita muodon muuntamista"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Kun tämä asetus on valittu, järjestelmä päättelee sopivan näytölle lähetettävän dynaamisen alueen ja muuntaa sisällön tarvittaessa."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Vastaa aina sisällön muotoa"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Muuntamisen pakottaminen"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Pakottaa muuntamisen valittuun muotoon"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Pakota muuntaminen valittuun muotoon. Muuntamisen pakottaminen voi vaikuttaa muihin asetuksiin näyttötilassa tai HDR-muodossa."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Aina SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Aina <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Haluatko pakottaa HDR-tulon?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Muunnos pakotetaan oletuksena tähän muotoon: <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Näytön resoluutio on 1080p ja 60 Hz. Tämä vaihtoehto ei ole yhteensopiva näytön kanssa, kun sen resoluutio on 4K ja 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Visionia ei tueta nykyisellä resoluutiolla. Jos otat Dolby Visionin käyttöön manuaalisesti, näytön resoluutioksi muutetaan 1080p 60 Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Muutetaanko resoluutioksi 1080p 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Pakota aina muuntaminen Dolby Visioniin"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Jos Dolby Vision on pois käytöstä näytön lisäasetusten HDR-muodoissa, Dolby Visioniin muuntamisen pakottaminen ottaa sen käyttöön."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Pakota aina muuntaminen HDR10:een"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Jos HDR10 on pois käytöstä näytön lisäasetusten HDR-muodoissa, HDR10:een muuntamisen pakottaminen ottaa sen käyttöön."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Pakota aina muuntaminen HLG:hen"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Jos HLG on pois käytöstä näytön lisäasetusten HDR-muodoissa, HLG:hen muuntamisen pakottaminen ottaa sen käyttöön."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Pakota aina muuntaminen HDR10+:aan"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Jos HDR10+ on pois käytöstä näytön lisäasetusten HDR-muodoissa, HDR10+:aan muuntamisen pakottaminen ottaa sen käyttöön."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Pakota aina muuntaminen SDR:ään"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"SDR:ään muuntamisen pakottaminen poistaa kaikki HDR-muodot käytöstä näytön lisäasetuksissa."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Valitse sama kuvanopeus kuin sisällöllä"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Vain saumaton"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Saumaton"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"VAIN jos televisiosi voi tehdä saumattoman siirtymän, laite täsmää äänen katsomasi sisällön alkuperäiseen kuvanopeuteen sovelluksen pyytäessä."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Yhdistetty näyttö ei tue saumattomia päivittymistiheyden vaihtoja. Asetuksella ei ole vaikutusta, ellet vaihda sitä tukevaan näyttöön."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Aina"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Ei-saumaton"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Jos sovellus pyytää sitä, laite täsmää äänen katsomasi sisällön alkuperäiseen kuvanopeuteen. Tämä voi saada näytön pimenemään hetkeksi avattaessa ja suljettaessa videon toistoa."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Ei koskaan"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Vaikka sovellus pyytäisi sitä, laitteesi ei koskaan yritä täsmätä ääntä katsomasi sisällön alkuperäiseen kuvanopeuteen."</string>
@@ -217,12 +190,12 @@
     <string name="resolution_selection_dialog_title" msgid="4029798035133645272">"Resoluutio on vaihdettu"</string>
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Muutetaanko resoluutioksi %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Valitse OK, jos haluat, että %1$s on käytössä tästä lähtien."</string>
-    <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s ei tue Dolby Visionia. Se poistetaan käytöstä Näytön lisäasetuksista."</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"%1$s on tuettu tässä tilassa.\nParannettu HDMI pitää laittaa päälle joillain televisioilla, jotta saat käyttöön enemmän HDR-muotoja. Tarkista, tuetaanko tätä TV:n asetuksista."</string>
+    <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s ei tue Dolby Visionia. Se poistetaan käytöstä Lisäasetuksista."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"%1$s on tuettu tässä tilassa. Parannettu HDMI pitää laittaa päälle joillain televisioilla, jotta saat käyttöön enemmän HDR-muotoja. Tarkista, tuetaanko tätä TV:n asetuksista."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Peru"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Tyhjennetäänkö välimuistitiedot?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Sovellusten välimuistit tyhjennetään."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Organisaatiosi hallinnoi tätä laitetta."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Tätä laitetta hallitsee <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Lue lisää"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kamerasovellus}other{Kamerasovellukset}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Kalenterisovellus"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Vahvista, että haluat estää näytön sammumisen katselun aikana, vaikka se saattaa lisätä energiankulutusta."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Ei-aktiivisena"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Katseltaessa"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Laita automaattisesti pois päältä"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Laita pois päältä automaattisesti kun laite ei ole aktiivinen"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Laita pois päältä automaattisesti katselun aikana"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Television automaattinen sammuttaminen"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Television automaattinen sammuttaminen, kun se on epäaktiivinen"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Television automaattinen sammuttaminen katseltaessa"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"Ei-aktiivisena\"-ajastimessa keston täytyy olla lyhyempi kuin \"Katseltaessa\"-ajastimessa"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"Katseltaessa\"-ajastimessa keston täytyy olla pidempi kuin \"Ei-aktiivisena\"-ajastimessa"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Rajoita verkkoyhteyttä lepotilassa"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Käynnistymistoiminta"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Nollaa"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Ethernetin yhdistämiskoodi"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Energiatilat"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Lisää energiatehokkuutta, kun TV ei ole käytössä"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Ottaa käyttöön nämä:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Huomaa, että tämä tila voi lisätä laitteen virrankulutusta."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Ota <xliff:g id="ENERGYMODENAME">%s</xliff:g> käyttöön"</string>
 </resources>
diff --git a/Settings/res/values-fr-rCA/energy-modes.xml b/Settings/res/values-fr-rCA/energy-modes.xml
deleted file mode 100644
index 4ee970aca..000000000
--- a/Settings/res/values-fr-rCA/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Fonctionnalités réseau essentielles"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Faible consommation d\'énergie"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Désactiver la connexion réseau lorsque le téléviseur n\'est pas en cours d\'utilisation."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Mises à jour et fonctionnalités essentielles"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Fonctionnalités réseau recommandées"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Consommation d\'énergie optimisée"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Active les fonctionnalités qui activent le téléviseur par le biais du réseau (veille en réseau)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Fonctionnalités réseau supplémentaires"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Consommation d\'énergie accrue"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Outre les fonctionnalités recommandées, cette option active des fonctionnalités supplémentaires lorsque le téléviseur n\'est pas en cours d\'utilisation. Ces dernières sont susceptibles d\'augmenter la consommation d\'énergie."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-fr-rCA/strings.xml b/Settings/res/values-fr-rCA/strings.xml
index 3ef986a93..f594e39c5 100644
--- a/Settings/res/values-fr-rCA/strings.xml
+++ b/Settings/res/values-fr-rCA/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Sauvegarder et restaurer"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Rétablir la configuration par défaut"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Étalonnage"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Minuterie d\'arrêt"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Réglez des minuteries pour éteindre le téléviseur et économiser de l\'énergie"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Alimentation et énergie"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Paramètres éco"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Appareils"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Sélectionner les options"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Paramètres sonores avancés"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Autoriser le mode Jeu"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Faire correspondre la gamme dynamique à celle du contenu"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Lorsque cette option est activée, le système passera d\'une gamme dynamique à une autre pour s\'adapter au contenu. Cela peut engendrer un écran noir lors d\'un changement de format.\n\nCliquez sur Paramètres d\'affichage avancés pour accéder à d\'autres options de gamme dynamique."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Gamme dynamique préférée"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Conversion préférée par le système"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Permet au système de gérer la conversion du format"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Lorsque cette option est sélectionnée, le système déterminera une gamme dynamique appropriée à envoyer à votre écran et convertira le contenu à cette gamme dynamique si nécessaire."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Toujours faire correspondre le format à celui du contenu"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Forcer la conversion"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"La conversion au format préféré sera forcée"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Forcer la conversion à un format préféré. Forcer la conversion peut avoir une incidence sur d\'autres paramètres du mode d\'affichage ou du format HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Toujours au format SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Toujours au format <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Voulez-vous forcer la sortie HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Par défaut, la conversion sera forcée au format <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Votre écran affichera une résolution de 1080p à 60 Hz. Cette option n\'est pas compatible avec votre écran lorsqu\'il affiche une résolution de 4K à 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision n\'est pas pris en charge à la résolution actuelle. Si vous activez Dolby Vision manuellement, votre écran passera à une résolution de 1080p à 60 Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Passer à une résolution de 1080p à 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Toujours forcer la conversion en Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Si Dolby Vision est désactivé dans les formats HDR dans les paramètres d\'affichage avancés, forcer la conversion en Dolby Vision le réactivera."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Toujours forcer la conversion en HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Si HDR10 est désactivé dans les formats HDR dans les paramètres d\'affichage avancés, forcer la conversion en HDR10 le réactivera."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Toujours forcer la conversion en HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Si HLG est désactivé dans les formats HDR dans les paramètres d\'affichage avancés, forcer la conversion en HLG le réactivera."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Toujours forcer la conversion en HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Si HDR10+ est désactivé dans les formats HDR dans les paramètres d\'affichage avancés, forcer la conversion en HDR10+ le réactivera."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Toujours forcer la conversion en SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Forcer la conversion en SDR désactivera tous les formats dans les formats HDR dans les paramètres d\'affichage avancés."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Faire correspondre la fréquence d\'images"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Uniquement sans interruption"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Transparent"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Si l\'application le demande, votre appareil fera correspondre sa sortie à la fréquence d\'images d\'origine du contenu que vous regardez, uniquement si votre téléviseur peut effectuer une transition transparente."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Votre écran connecté ne prend pas en charge les transitions fluides de la fréquence d\'actualisation. Cette option n\'aura aucun effet si vous ne passez pas à un écran qui la prend en charge."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Toujours"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Non transparent"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Si l\'application le demande, votre appareil fera correspondre sa sortie à la fréquence d\'images d\'origine du contenu que vous regardez. Votre écran risque alors d\'être vide pendant une seconde lors du démarrage ou de l\'arrêt d\'une vidéo."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Jamais"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Même si l\'application le demande, votre appareil n\'essaiera jamais de faire correspondre sa sortie à la fréquence d\'images d\'origine du contenu que vous regardez."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Modifier la résolution à %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Sélectionnez OK pour utiliser %1$s à partir de maintenant."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision n\'est pas pris en charge par %1$s et sera désactivé dans « Paramètres d\'affichage avancés »"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Ce mode soutient : %1$s\nSur certains téléviseurs, vous devrez peut-être activer le mode HDMI amélioré pour activer davantage de formats HDR. Vérifiez les paramètres de votre téléviseur pour savoir si ce mode est pris en charge."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Ce mode prend en charge %1$s. Sur certains téléviseurs, vous devrez peut-être activer le mode HDMI amélioré pour activer davantage de formats HDR. Vérifiez les paramètres de votre téléviseur pour savoir si ce mode est pris en charge."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Annuler"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Effacer les données mises en cache?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Les données en cache des applis seront effacées."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Cet appareil est géré par votre organisation."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Cet appareil est géré par <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" \\2060"</string>
     <string name="learn_more" msgid="820336467414665686">"En savoir plus"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Application d\'appareil photo}one{Application d\'appareil photo}other{Applications d\'appareil photo}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Application d\'agenda"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Veuillez confirmer pour empêcher l\'écran de s\'éteindre pendant la lecture, ce qui pourrait augmenter la consommation d\'énergie."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Lorsqu\'il n\'y a pas d\'activité"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Lors du visionnage"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Désactiver automatiquement"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Désactiver automatiquement en cas d\'inactivité"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Désactiver automatiquement lors du visionnage"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Éteindre automatiquement le téléviseur"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Éteindre automatiquement le téléviseur lorsqu\'il n\'y a pas d\'activité"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Éteindre automatiquement le téléviseur pendant le visionnage"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"La durée de la minuterie « Pendant l\'inactivité » doit être inférieure à celle de la minuterie « Pendant le visionnement »"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"La durée de la minuterie « Pendant le visionnement » doit être supérieure à celle de la minuterie « Pendant l\'inactivité »"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Limiter connexion réseau en mode Veille"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Comportement lorsque le téléviseur est allumé"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Réinitialiser"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Code d\'association Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Modes de consommation d\'énergie"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Améliorer l\'efficacité énergétique lorsque le téléviseur n\'est pas en cours d\'utilisation"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Active :"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Notez que ce mode peut augmenter la consommation d\'énergie de l\'appareil."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Activer « <xliff:g id="ENERGYMODENAME">%s</xliff:g> »"</string>
 </resources>
diff --git a/Settings/res/values-fr/energy-modes.xml b/Settings/res/values-fr/energy-modes.xml
deleted file mode 100644
index bca5b5558..000000000
--- a/Settings/res/values-fr/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Fonctionnalités réseau essentielles"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Faible consommation d\'énergie"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Désactivez la connexion réseau lorsque le téléviseur n\'est pas utilisé."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Mises à jour et fonctions essentielles"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Fonctionnalités réseau recommandées"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Consommation d\'énergie optimisée"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Active les fonctionnalités qui réveillent le téléviseur via le réseau (mode veille avec maintien de la connexion réseau)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insérer la fonctionnalité 1]"</item>
-    <item msgid="8724721267222341891">"[Insérer la fonctionnalité 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Fonctionnalités réseau supplémentaires"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Consommation d\'énergie accrue"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"En plus des fonctionnalités recommandées, cette option active des fonctionnalités supplémentaires lorsque le téléviseur n\'est pas utilisé, qui peuvent augmenter la consommation d\'énergie."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insérer la fonctionnalité 1]"</item>
-    <item msgid="170760143032597722">"[Insérer la fonctionnalité 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-fr/strings.xml b/Settings/res/values-fr/strings.xml
index aaaa3350d..9f5ce89b5 100644
--- a/Settings/res/values-fr/strings.xml
+++ b/Settings/res/values-fr/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Sauvegarde et restauration"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Rétablissement de la configuration d\'usine"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Étalonnage"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Minuteur d\'arrêt"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Définir des minuteurs pour éteindre le téléviseur et économiser de l\'énergie"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Alimentation et énergie"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Paramètres Éco"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Appareils"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Sélectionner des formats"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Paramètres audio avancés"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Autoriser le mode Jeu"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Faire correspondre à la plage dynamique du contenu"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Lorsque cette option est activée, le système passe d\'un format de plage dynamique à un autre en fonction du contenu. Cela peut entraîner l\'affichage d\'un écran noir pendant un changement de format.\n\nCliquez sur \"Paramètres d\'affichage avancés\" pour obtenir plus d\'options de plage dynamique."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Plage dynamique préférée"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Conversion choisie par le système"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Laisse le système gérer la conversion du format"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Lorsque cette option est sélectionnée, le système détermine une plage dynamique adaptée à envoyer à votre écran et convertit le contenu dans cette plage si besoin."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Respecte toujours le format du contenu"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Forcer la conversion"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Force la conversion dans le format choisi"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Forcez la conversion dans le format choisi. Forcer la conversion peut avoir des répercussions sur d\'autres paramètres en mode d\'affichage ou avec le format HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Toujours en SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Toujours en <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Voulez-vous forcer la sortie HDR ?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Par défaut, la conversion sera forcée en <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Votre écran fonctionnera avec une résolution 1080p de 60 Hz. Cette option n\'est pas compatible avec une résolution 4K de 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision n\'est pas compatible avec la résolution actuelle. Si vous activez Dolby Vision manuellement, la résolution de l\'écran passera à 1080p et 60 Hz."</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Faire passer la résolution à 1080p et 60 Hz ?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Toujours forcer la conversion vers Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Si la technologie Dolby Vision est désactivée pour les formats HDR dans les paramètres d\'affichage avancés, forcer la conversion vers cette technologie la réactivera."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Toujours forcer la conversion vers HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Si la technologie HDR10 est désactivée pour les formats HDR dans les paramètres d\'affichage avancés, forcer la conversion vers cette technologie la réactivera."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Toujours forcer la conversion vers HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Si la technologie HLG est désactivée pour les formats HDR dans les paramètres d\'affichage avancés, forcer la conversion vers cette technologie la réactivera."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Toujours forcer la conversion vers HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Si la technologie HDR10+ est désactivée pour les formats HDR dans les paramètres d\'affichage avancés, forcer la conversion vers cette technologie la réactivera."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Toujours forcer la conversion vers SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Forcer la conversion vers SDR désactivera tous les formats HDR dans les paramètres d\'affichage avancés"</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Ajuster en fonction de la fréquence d\'images du contenu"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Fluide uniquement"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Fluide"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Si l\'appli le demande, votre appareil ajustera sa sortie en fonction de la fréquence d\'images d\'origine du contenu que vous regardez, uniquement si votre TV peut effectuer une transition fluide."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Votre écran connecté n\'est pas compatible avec les transitions fluides de la fréquence d\'actualisation. Cette option n\'aura aucun effet, sauf si vous remplacez l\'écran par un modèle compatible."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Toujours"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Non fluide"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Si l\'appli le demande, votre appareil ajustera sa sortie en fonction de la fréquence d\'images d\'origine du contenu que vous regardez. Votre écran risque alors d\'être vide pendant une seconde lors du démarrage ou de l\'arrêt d\'une vidéo."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Jamais"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Même si l\'appli le demande, votre appareil n\'essaiera jamais d\'ajuster sa sortie en fonction de la fréquence d\'images d\'origine du contenu que vous regardez."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Passer en résolution %1$s ?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Sélectionnez \"OK\" pour utiliser %1$s à partir de maintenant."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"La technologie Dolby Vision n\'est pas compatible à %1$s et sera désactivée dans \"Paramètres d\'affichage avancés\""</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Ce mode est compatible avec : %1$s\nSur certains téléviseurs, vous devrez peut-être activer le HDMI amélioré pour activer d\'autres formats HDR. Examinez les paramètres de votre téléviseur pour vérifier la compatibilité."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Ce mode est compatible avec %1$s. Sur certains téléviseurs, vous devrez peut-être activer le HDMI amélioré pour activer d\'autres formats HDR. Examinez les paramètres de votre téléviseur pour vérifier la compatibilité."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Annuler"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Effacer les données mises en cache ?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Les données en cache des applis seront effacées."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Cet appareil est géré par votre organisation."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Cet appareil est géré par <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"En savoir plus"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Appli d\'appareil photo}one{Appli d\'appareil photo}other{Applis d\'appareil photo}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Agenda"</string>
@@ -651,7 +625,7 @@
     <string name="system_network_location_confirm" msgid="7128162421781085332">"Votre position sera enregistrée"</string>
     <string name="location_mode_title" msgid="728244518174115443">"Mode"</string>
     <string name="location_category_recent_location_requests" msgid="4541924383164183490">"Demandes localisation récentes"</string>
-    <string name="location_no_recent_apps" msgid="7033474075806435793">"Aucune appli n\'a récemment demandé la position"</string>
+    <string name="location_no_recent_apps" msgid="7033474075806435793">"Aucune appli n\'a demandé à accéder à votre position récemment"</string>
     <string name="location_high_battery_use" msgid="5325556609027887602">"Forte utilisation de la batterie"</string>
     <string name="location_low_battery_use" msgid="728585923412018253">"Faible utilisation de batterie"</string>
     <string name="location_mode_wifi_description" msgid="84697248707903061">"Utiliser le Wi-Fi pour estimer la localisation"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Veuillez confirmer pour empêcher l\'écran de s\'éteindre lors du visionnage, ce qui peut augmenter la consommation d\'énergie."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"En cas d\'inactivité"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Lors du visionnage"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Désactiver automatiquement"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Désactiver automatiquement lorsque l\'appareil est inactif"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Désactiver automatiquement lors du visionnage"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Éteindre le téléviseur automatiquement"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Éteindre le téléviseur automatiquement lorsqu\'il est inactif"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Éteindre le téléviseur automatiquement lors du visionnage"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Le minuteur \"En cas d\'inactivité\" doit être plus court que le minuteur \"Lors du visionnage\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Le minuteur \"Lors du visionnage\" doit être plus long que le minuteur \"En cas d\'inactivité\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Limiter la connexion réseau en veille"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Comportement au démarrage"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Réinitialiser"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Code d\'association Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Modes d\'énergie"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Améliorer l\'efficacité énergétique lorsque le téléviseur n\'est pas utilisé"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Activations :"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Notez que ce mode peut augmenter la consommation d\'énergie de l\'appareil."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Activer \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/Settings/res/values-gl/energy-modes.xml b/Settings/res/values-gl/energy-modes.xml
deleted file mode 100644
index 2ed330ff2..000000000
--- a/Settings/res/values-gl/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Funcións de rede básicas"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Consumo enerxético baixo"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Desactiva a conexión de rede cando non se está usando a televisión."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Actualizacións e funcións esenciais"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Funcións de rede recomendadas"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Consumo enerxético optimizado"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Activa funcións que reactivan a televisión con conexión de rede (modo de espera con conexión de rede)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Funcións de rede adicionais"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Maior consumo enerxético"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Ademais das funcións recomendadas, esta opción activa outras que permanecen habilitadas cando a televisión non se está usando, o cal pode aumentar o consumo enerxético."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-gl/strings.xml b/Settings/res/values-gl/strings.xml
index 19133b1fd..8f449cd09 100644
--- a/Settings/res/values-gl/strings.xml
+++ b/Settings/res/values-gl/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Copia de seguranza e restauración"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Restablecemento dos datos de fábrica"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Calibración"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Temporizador de apagado"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Configura os temporizadores para apagar a televisión e aforrar enerxía"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Acendido e enerxía"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Configuración do modo Eco"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Dispositivos"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Seleccionar formatos"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Configuración avanzada do son"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Permitir modo de xogo"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Adaptar o rango dinámico ao contido"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Ao activar esta opción, o sistema cambiará entre os diferentes formatos de rango dinámico para adaptarse ao contido. A pantalla pode escurecerse durante o cambio de formato.\n\nFai clic na configuración avanzada da pantalla para ver máis opcións de rango dinámico."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Rango dinámico preferido"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Conversión preferida polo sistema"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Permítelle ao sistema xestionar a conversión de formatos"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Ao seleccionar esta opción, o sistema determinará un rango dinámico axeitado para a túa pantalla e converterá o contido a dito rango se é necesario."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Coincide sempre co formato do contido"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Forzar conversión"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Forza a conversión ao formato preferido"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Forza a conversión a un formato preferido. É posible que forzar a conversión afecte a outras opcións de configuración do modo de visualización ou do formato HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Sempre a SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Sempre a <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Queres forzar a saída HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"De forma predeterminada, forzarase a conversión a <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"A pantalla terá unha resolución de 1080p e 60 Hz. Esta opción non é compatible coa túa pantalla cando se executa a unha resolución 4K de 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision non é compatible coa resolución actual. Se activas Dolby Vision de forma manual, a resolución da pantalla cambiarase a 1080p 60 Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Queres cambiar a resolución a 1080p 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Forzar sempre conversión a Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Se o formato Dolby Vision está desactivado en Formatos HDR, en Configuración avanzada da pantalla, volverase activar ao forzar a conversión a Dolby Vision."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Forzar sempre conversión a HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Se o formato HDR10 está desactivado en Formatos HDR, en Configuración avanzada da pantalla, volverase activar ao forzar a conversión a HDR10."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Forzar sempre conversión a HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Se o formato HLG está desactivado en Formatos HDR, en Configuración avanzada da pantalla, volverase activar ao forzar a conversión a HLG."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Forzar sempre conversión a HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Se o formato HDR10+ está desactivado en Formatos HDR, en Configuración avanzada da pantalla, volverase activar ao forzar a conversión a HDR10+."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Forzar sempre conversión a SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Ao forzar a conversión a SDR, desactivaranse todos os formatos dispoñibles en Formatos HDR, en Configuración avanzada da pantalla."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Facer coincidir cos fps do contido"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Só non facer coincidir"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Non facer coincidir"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Se a aplicación o solicita, o dispositivo fará que a saída coincida cos fotogramas por segundo orixinais do contido que esteas vendo, pero só se a televisión permite que se realice a transición sen complicacións."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"A pantalla conectada non é compatible coas transicións de frecuencia de actualización fluídas. Esta opción non terá efecto a menos que cambies a unha pantalla que sexa compatible."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Sempre"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Facer coincidir"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Se a aplicación o solicita, o dispositivo fará que a saída coincida cos fotogramas por segundo orixinais do contido que esteas vendo. Ten en conta que a pantalla pode quedar sen imaxe durante un segundo ao iniciar ou deter a reprodución de vídeos."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Nunca"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Aínda que a aplicación o solicite, o dispositivo nunca tentará facer que a saída coincida cos fotogramas por segundo orixinais do contido que esteas vendo."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Queres cambiar a resolución a %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Se queres utilizar %1$s a partir de agora, selecciona Aceptar."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision non é compatible con %1$s e desactivarase en Configuración avanzada da pantalla"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Este modo é compatible con: %1$s\nNalgunhas televisións, é posible que necesites activar o HDMI mellorado para habilitar máis formatos HDR. Comproba a configuración da televisión para ver se é compatible."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Este modo é compatible con %1$s. Nalgunhas televisións, é posible que necesites activar o HDMI mellorado para habilitar máis formatos HDR. Comproba a configuración da televisión para ver se é compatible."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Cancelar"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Aceptar"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Queres borrar os datos da caché?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Isto borrará datos da caché para as aplicacións"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Este dispositivo está xestionado pola túa organización."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Este dispositivo está xestionado por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Máis información"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplicación de cámara}other{Aplicacións de cámara}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplicación do calendario"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Confirma para evitar que a pantalla se apague mentres ves contido nela, o que podería aumentar o consumo enerxético."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Cando estea inactivo"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Durante a reprodución de contido"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Desactivar automaticamente"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Desactivar automaticamente en caso de inactividade"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Desactivar automaticamente durante a visualización"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Apagar a televisión automaticamente"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Apagar a televisión automaticamente cando estea inactiva"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Apagar a televisión automaticamente cando se estea vendo"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"O temporizador \"Cando estea inactivo\" debe durar menos tempo que o temporizador \"Durante a reprodución de contido\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"O temporizador \"Durante a reprodución de contido\" debe durar máis tempo que o temporizador \"Cando estea inactivo\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Limitar conexión de rede en espera"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Comportamento do acendido"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Restablecemento"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Código de vinculación de Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Modos de enerxía"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Mellora a eficiencia enerxética cando non se está usando a televisión"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Activa as seguintes funcións:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Ten en conta que este modo pode aumentar o consumo de enerxía do dispositivo."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Activar o modo <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
 </resources>
diff --git a/Settings/res/values-gu/energy-modes.xml b/Settings/res/values-gu/energy-modes.xml
deleted file mode 100644
index 86a2a2a1e..000000000
--- a/Settings/res/values-gu/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"આવશ્યક નેટવર્ક સુવિધાઓ"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ઓછો ઊર્જા વપરાશ"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"જ્યારે ટીવી ઉપયોગમાં ન હોય ત્યારે નેટવર્ક કનેક્શન બંધ કરો."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"મહત્ત્વપૂર્ણ અપડેટ અને કાર્યો"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"સુઝાવ આપેલી નેટવર્ક સુવિધાઓ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ઑપ્ટિમાઇઝ કરેલો ઊર્જા વપરાશ"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"નેટવર્ક પર ટીવીને સક્રિય કરતી સુવિધાઓ ચાલુ કરે છે (નેટવર્ક સ્ટેન્ડબાય પર છે)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[સુવિધા 1 દાખલ કરો]"</item>
-    <item msgid="8724721267222341891">"[સુવિધા 2 દાખલ કરો]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"વધારાની નેટવર્ક સુવિધાઓ"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"ઊર્જાના વપરાશમાં વધારો થયો"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"સુઝાવ આપેલી સુવિધાઓ ઉપરાંત, જ્યારે ટીવી ઉપયોગમાં ન હોય ત્યારે આ વિકલ્પ વધારાની સુવિધાઓ ચાલુ કરે છે જે ઊર્જાના વપરાશમાં વધારો કરી શકે છે."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[સુવિધા 1 દાખલ કરો]"</item>
-    <item msgid="170760143032597722">"[સુવિધા 2 દાખલ કરો]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-gu/strings.xml b/Settings/res/values-gu/strings.xml
index 528515424..57e464bdd 100644
--- a/Settings/res/values-gu/strings.xml
+++ b/Settings/res/values-gu/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"બૅકઅપ લો અને રિસ્ટોર કરો"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"ફેક્ટરી ડેટા રીસેટ"</string>
     <string name="device_calibration" msgid="2907914144048739705">"કેલિબ્રેશન"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"બંધ કરવા માટેનું ટાઇમર"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"ટીવી બંધ કરવા અને ઊર્જા બચાવવા માટે ટાઇમર સેટ કરો"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"પાવર અને ઊર્જા"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"ઇકો સેટિંગ"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"ડિવાઇસ"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"ફૉર્મેટ પસંદ કરો"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"વિગતવાર સાઉન્ડ સેટિંગ"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"ગેમ મોડની મંજૂરી આપો"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"કન્ટેન્ટની ડાઇનૅમિક શ્રેણી સાથે મેળ કરો"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"આ વિકલ્પ ચાલુ કરતી વખતે, કન્ટેન્ટ સાથે મેળ કરવા માટે સિસ્ટમ, ડાઇનૅમિક શ્રેણીના વિવિધ ફૉર્મેટ વચ્ચે સ્વિચ કરશે. આના કારણે ફૉર્મેટ સ્વિચ કરતી વખતે કાળી સ્ક્રીન જોવા મળી શકે છે.\n\nડાઇનૅમિક શ્રેણીના વધુ વિકલ્પો માટે, વિગતવાર ડિસ્પ્લે સેટિંગ પર ક્લિક કરો."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"પસંદ કરેલી ડાઇનૅમિક શ્રેણી"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"સિસ્ટમ દ્વારા પસંદ કરાયેલું રૂપાંતરણ"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"સિસ્ટમને ફૉર્મેટનું રૂપાંતરણ મેનેજ કરવા દો"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"જ્યારે આ વિકલ્પ પસંદ કરેલો હોય, ત્યારે સિસ્ટમ તમારા ડિસ્પ્લે પર મોકલવા માટેની અનુકૂળ ડાયનૅમિક રેંજ નક્કી કરશે અને કન્ટેન્ટને જરૂર મુજબ આ ડાયનૅમિક રેંજમાં રૂપાંતરિત કરશે."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"હંમેશાં કન્ટેન્ટના ફૉર્મેટ સાથે મેળ કરે છે"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"રૂપાંતરણ ફરજિયાત લાગુ કરવું"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"પસંદગીના ફૉર્મેટમાં રૂપાંતરણ ફરજિયાત લાગુ કરવામાં આવે છે"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"પસંદગીના ફૉર્મેટમાં રૂપાંતરણ ફરજિયાત લાગુ કરો રૂપાંતરણને ફરજિયાત લાગુ કરવાથી ડિસ્પ્લે મોડ અથવા HDR ફૉર્મેટના અન્ય સેટિંગ પર અસર પડી શકે છે."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"હંમેશાં SDRમાં"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"હંમેશાં <xliff:g id="HDR_TYPE">%s</xliff:g>માં"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"શું તમે HDR આઉટપુટને ફરજિયાત લાગુ કરવા માગો છો?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"ડિફૉલ્ટ તરીકે રૂપાંતરણને <xliff:g id="HDR_TYPE">%s</xliff:g>માં ફરજિયાત લાગુ કરવામાં આવશે."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"તમારા ડિસ્પ્લેને 1080p 60Hz રિઝોલ્યુશન પર ચલાવવામાં આવશે. જ્યારે તમારા ડિસ્પ્લેને 4k 60Hz રિઝોલ્યુશન પર ચલાવવામાં આવી રહ્યું હોય ત્યારે આ વિકલ્પ તેની સાથે સુસંગત હોતો નથી."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"હાલના રિઝોલ્યુશનમાં Dolby Vision સપોર્ટેડ નથી. જો તમે મેન્યુઅલી Dolby Vision ચાલુ કરશો, તો તમારા ડિસ્પ્લેનું રિઝોલ્યુશન 1080p 60Hzમાં બદલાઈ જશે"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"રિઝોલ્યુશનને 1080p 60Hzમાં બદલીએ?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Dolby Vision માટે, હંમેશાં ફરજિયાત રીતે રૂપાંતરણ કરો"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"જો ડિસ્પ્લેના વિગતવાર સેટિંગમાં Dolby Visionને HDR ફૉર્મેટ માટે બંધ કરવામાં આવ્યું હોય, તો Dolby Visionમાં ફરજિયાત રીતે રૂપાંતરણ કરવા પર તે ફરીથી ચાલુ થઈ જશે."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"HDR10 માટે, હંમેશાં ફરજિયાત રીતે રૂપાંતરણ કરો"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"જો ડિસ્પ્લેના વિગતવાર સેટિંગમાં HDR10ને HDR ફૉર્મેટ માટે બંધ કરવામાં આવ્યું હોય, તો HDR10માં ફરજિયાત રીતે રૂપાંતરણ કરવા પર તે ફરીથી ચાલુ થઈ જશે."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"HLG માટે, હંમેશાં ફરજિયાત રીતે રૂપાંતરણ કરો"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"જો ડિસ્પ્લેના વિગતવાર સેટિંગમાં HLGને HDR ફૉર્મેટ માટે બંધ કરવામાં આવ્યું હોય, તો HLGમાં ફરજિયાત રીતે રૂપાંતરણ કરવા પર તે ફરીથી ચાલુ થઈ જશે."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"HDR10+ માટે, હંમેશાં ફરજિયાત રીતે રૂપાંતરણ કરો"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"જો ડિસ્પ્લેના વિગતવાર સેટિંગમાં HDR10+ને HDR ફૉર્મેટ માટે બંધ કરવામાં આવ્યું હોય, તો HDR10+માં ફરજિયાત રીતે રૂપાંતરણ કરવા પર તે ફરીથી ચાલુ થઈ જશે."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"SDR માટે, હંમેશાં ફરજિયાત રીતે રૂપાંતરણ કરો"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"SDRમાં ફરજિયાત રીતે રૂપાંતરણ કરવાથી, ડિસ્પ્લેના વિગતવાર સેટિંગમાં HDR ફૉર્મેટમાંના બધા રૂપાંતરણો બંધ થઈ જશે."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"કન્ટેન્ટની ફ્રેમ રેટ સાથે મેળ કરો"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"માત્ર વિક્ષેપરહિત"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"ખામીરહિત"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"જો ઍપ તેની વિનંતી કરે, તો તમારું ડિવાઇસ તમે જોઈ રહ્યાં છો તે કન્ટેન્ટના ઑરિજિનલ ફ્રેમ રેટ સાથે, જો તમારું ટીવી ખામીરહિત સંચાર કરી શકે તો જ તેના આઉટપુટનો મેળ કરશે."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"તમારું કનેક્ટેડ ડિસ્પ્લે વિક્ષેપરહિત રિફ્રેશ થવાના રેટના ટ્રાન્ઝિશનને સપોર્ટ આપતું નથી. જ્યાં સુધી તમે તેને સપોર્ટ આપતા ડિસ્પ્લેમાં ન બદલો, ત્યાં સુધી આ વિકલ્પની કોઈ અસર થશે નહીં."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"હંમેશાં"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"બિન-ખામીરહિત"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"જો ઍપ તેની વિનંતી કરે, તો તમારું ડિવાઇસ તમે જોઈ રહ્યાં છો તે કન્ટેન્ટના ઑરિજિનલ ફ્રેમ રેટ સાથે તેના આઉટપુટનો મેળ કરશે. આના લીધે, જ્યારે તમે વીડિયો પ્લેબૅક ચાલુ અથવા બંધ કરો, ત્યારે તમારી સ્ક્રીન પર થોડી સેકન્ડ માટે કંઈપણ ન દેખાય તેવું બની શકે છે."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"ક્યારેય નહીં"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"જો ઍપ તેની વિનંતી કરે, તો પણ તમારું ડિવાઇસ તમે જોઈ રહ્યાં છો તે કન્ટેન્ટના ઑરિજિનલ ફ્રેમ રેટ સાથે તેના આઉટપુટનો મેળ કરવાનો ક્યારેય પ્રયાસ કરશે નહીં."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"શું રિઝોલ્યુશન બદલીને %1$s કરીએ?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"હવેથી %1$sનો ઉપયોગ કરવા માટે \'ઓકે\' પસંદ કરો."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision %1$s પર સપોર્ટેડ નથી અને \"વિગતવાર ડિસ્પ્લે સેટિંગ\"માં તેને બંધ કરવામાં આવશે"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"આ મોડ આને સપોર્ટ આપે છે: %1$s\nઅમુક ટીવી પર HDRના વધુ ફૉર્મેટ ચાલુ કરવા માટે, તમરે HDRની વધારેલી સુવિધા ચાલુ કરવી જરૂરી હોઈ શકે છે. આ સપોર્ટેડ છે કે નહીં, તે જોવા માટે તમારા ટીવીના સેટિંગ ચેક કરો."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"આ મોડ %1$sને સપોર્ટ કરે છે. અમુક ટીવી પર, વધુ HDR ફૉર્મેટ ચાલુ કરવા માટે, તમારે કદાચ વિસ્તૃત HDMI ચાલુ કરવાની જરૂર પડી શકે છે. આ સપોર્ટેડ છે કે નહીં, તે જોવા માટે તમારા ટીવીના સેટિંગ ચેક કરો."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"રદ કરો"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ઓકે"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"કૅશ કરેલ ડેટા સાફ કરીએ?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"આ તમામ ઍપ્લિકેશનોનો કેશ્ડ ડેટા સાફ કરશે."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"આ ડિવાઇસ તમારી સંસ્થા દ્વારા સંચાલિત થાય છે."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"આ ઉપકરણનું સંચાલન <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> દ્વારા થાય છે"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"વધુ જાણો"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{કૅમેરા ઍપ}one{કૅમેરા ઍપ}other{કૅમેરા ઍપ}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"કૅલેન્ડર ઍપ્લિકેશન"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"મીડિયા પ્લેબૅક જોતી વખતે ડિસ્પ્લેને બંધ થતું અટકાવવા માટે કૃપા કરીને કન્ફર્મ કરો, જેનાથી ઉર્જાનો વપરાશ વધવાની સંભાવના છે."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"નિષ્ક્રિય હોય ત્યારે"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"જોતી વખતે"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"ઑટોમૅટિક રીતે બંધ કરો"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"નિષ્ક્રિય હોય ત્યારે ઑટોમૅટિક રીતે બંધ કરો"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"જોતી વખતે ઑટોમૅટિક રીતે બંધ કરો"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"ઑટોમૅટિક રીતે ટીવી બંધ કરો"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"નિષ્ક્રિય હોય ત્યારે ઑટોમૅટિક રીતે ટીવી બંધ કરો"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"ટીવી જોતી વખતે તેને ઑટોમૅટિક રીતે બંધ કરો"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"નિષ્ક્રિય હોય ત્યારે\" ટાઇમરનો સમયગાળો \"જોતા હોય ત્યારે\" ટાઇમર કરતાં વધુ ટૂંકો હોવો આવશ્યક છે"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"જોતા હોય ત્યારે\" ટાઇમરનો સમયગાળો \"નિષ્ક્રિય હોય ત્યારે\" ટાઇમર કરતાં વધુ લાંબો હોવો આવશ્યક છે"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"સ્ટેન્ડબાયમાં નેટવર્ક કનેક્શન સીમિત કરો"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"પાવર ચાલુ હોય ત્યારની વર્તણૂક"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"રીસેટ કરો"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"ઇથરનેટનો જોડાણ કરવાનો કોડ"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"ઊર્જા મોડ"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"જ્યારે ટીવી ઉપયોગમાં ન હોય ત્યારે ઊર્જાની કાર્યક્ષમતાને બહેતર બનાવે છે"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"આ ચાલુ કરે છે:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"નોંધ કરો કે આ મોડ ડિવાઇસના પાવર વપરાશમાં વધારો કરી શકે છે."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" ચાલુ કરો"</string>
 </resources>
diff --git a/Settings/res/values-hi/energy-modes.xml b/Settings/res/values-hi/energy-modes.xml
deleted file mode 100644
index b9b404a73..000000000
--- a/Settings/res/values-hi/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"नेटवर्क से जुड़ी ज़रूरी सुविधाएं"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"बिजली की कम खपत"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"जब टीवी का इस्तेमाल न किया जा रहा हो, तो इंटरनेट बंद कर दें."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"गड़बड़ियों से जुड़ी सूचनाएं और फ़ंक्शन"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"सुझाई गई नेटवर्क की सुविधाएं"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"बिजली की खपत को ऑप्टिमाइज़ किया गया"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"नेटवर्क (स्टैंडबाय मोड) पर टीवी को फिर से चालू करने की सुविधा को चालू करें."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"नेटवर्क से जुड़ी अन्य सुविधाएं"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"बिजली की खपत में बढ़ोतरी"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"इस सुविधा का सुझाव देने के अलावा, जब टीवी का इस्तेमाल नहीं किया जाता है, तो यह विकल्प अतिरिक्त सुविधाओं को चालू कर देता है, जिससे बिजली की खपत ज़्यादा हो सकती है."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-hi/strings.xml b/Settings/res/values-hi/strings.xml
index a10226936..1bd855446 100644
--- a/Settings/res/values-hi/strings.xml
+++ b/Settings/res/values-hi/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"बैक अप लें और वापस लाएं"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"फ़ैक्ट्री डेटा रीसेट"</string>
     <string name="device_calibration" msgid="2907914144048739705">"अंशांकन"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"टीवी बंद करने का टाइमर"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"टीवी बंद करने के लिए टाइमर सेट करता है, ताकि बिजली बचाई जा सके"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"पावर और ऊर्जा"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"ईको मोड की सेटिंग"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"डिवाइस"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"फ़ॉर्मैट चुनें"</string>
@@ -151,39 +151,12 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"आवाज़ की बेहतर सेटिंग"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"गेम मोड की अनुमति दें"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"मिलते-जुलते कॉन्टेंट की डाइनैमिक रेंज"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"इस सुविधा को चालू करने पर सिस्टम, कॉन्टेंट से मिलते-जुलते नतीजे दिखाने के लिए अलग-अलग डाइनैमिक रेंज के फ़ॉर्मैट में स्विच करेगा. अलग-अलग फ़ॉर्मैट में स्विच करने के दौरान, सिस्टम की स्क्रीन ब्लैक हो सकती है.\n\nज़्यादा डाइनैमिक रेंज के फ़ॉर्मैट इस्तेमाल करने के लिए, \'डिसप्ले की बेहतर सेटिंग\' पर क्लिक करें."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"पसंंदीदा डाइनैमिक रेंज"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"सिस्टम के हिसाब से फ़ॉर्मैट बदलें"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"फ़ॉर्मैट को बदलने के लिए सिस्टम को मैनेज करने दें"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"जब यह विकल्प चुना जाएगा, तब सिस्टम आपके डिसप्ले पर भेजने के लिए कोई सही डाइनैमिक रेंज तय करेगा. साथ ही, ज़रूरत पड़ने पर कॉन्टेंट को इस डाइनैमिक रेंज में बदल दिया जाएगा."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"हमेशा कॉन्टेंट के फ़ॉर्मैट से मिलता-जुलता हो"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"फ़ॉर्मैट को ज़बरदस्ती बदलें"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"इससे कॉन्टेंट को आपके पसंदीदा फ़ॉर्मैट में ज़बरदस्ती बदला जाता है"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"इससे कॉन्टेंट को आपके पसंदीदा फ़ॉर्मैट में ज़बरदस्ती बदला जाता है. ऐसा हो सकता है कि फ़ॉर्मैट को ज़बरदस्ती बदलने से डिसप्ले मोड या एचडीआर फ़ॉर्मैट के दूसरी सेटिंग पर असर पड़े."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"कॉन्टेंट हमेशा एसडीआर पर"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"कॉन्टेंट हमेशा <xliff:g id="HDR_TYPE">%s</xliff:g> पर"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"एचडीआर आउटपुट को लागू करना है?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"डिफ़ॉल्ट रूप से कॉन्टेंट को <xliff:g id="HDR_TYPE">%s</xliff:g> में ज़बरदस्ती बदला जाएगा."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"आपका डिसप्ले 1080 पिक्सल 60Hz रिज़ॉल्यूशन पर चलेगा. जब आपका डिसप्ले 4K 60Hz रिज़ॉल्यूशन पर चल रहा होगा, तब यह तरीका आपके डिसप्ले पर काम नहीं करेगा."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision का इस्तेमाल मौजूदा रिज़ॉल्यूशन में नहीं किया जा सकता. अगर Dolby Vision को मैन्युअल तरीके से चालू किया जाता है, तो आपके डिसप्ले का रिज़ॉल्यूशन बदलकर 1080 पिक्सल 60 हर्ट्ज़ पर सेट हो जाएगा"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"क्या रिज़ॉल्यूशन को बदलकर 1080 पिक्सल 60 हर्ट्ज़ पर सेट करना है?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"एचडीआर फ़ॉर्मैट को Dolby Vision में हमेशा ज़बरदस्ती बदलें"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"अगर डिसप्ले की बेहतर सेटिंग में मौजूद \'एचडीआर फ़ॉर्मैट\' में जाकर Dolby Vision को बंद किया गया है, तो फ़ॉर्मैट को Dolby Vision में ज़बरदस्ती बदलने पर यह वापस चालू हो जाएगा."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"एचडीआर फ़ॉर्मैट को HDR10 में हमेशा ज़बरदस्ती बदलें"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"अगर डिसप्ले की बेहतर सेटिंग में मौजूद \'एचडीआर फ़ॉर्मैट\' में जाकर HDR10 को बंद किया गया है, तो फ़ॉर्मैट को HDR10 में ज़बरदस्ती बदलने पर यह वापस चालू हो जाएगा."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"एचडीआर फ़ॉर्मैट को HLG में हमेशा ज़बरदस्ती बदलें"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"अगर डिसप्ले की बेहतर सेटिंग में मौजूद \'एचडीआर फ़ॉर्मैट\' में जाकर HLG को बंद किया गया है, तो फ़ॉर्मैट को HLG में ज़बरदस्ती बदलने पर यह वापस चालू हो जाएगा."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"एचडीआर फ़ॉर्मैट को HDR10+ में हमेशा ज़बरदस्ती बदलें"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"अगर डिसप्ले की बेहतर सेटिंग में मौजूद \'एचडीआर फ़ॉर्मैट\' में जाकर HDR10+ को बंद किया गया है, तो फ़ॉर्मैट को HDR10+ में ज़बरदस्ती बदलने पर यह वापस चालू हो जाएगा."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"एचडीआर फ़ॉर्मैट को एसडीआर में हमेशा ज़बरदस्ती बदलें"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"फ़ॉर्मैट को एसडीआर में ज़बरदस्ती बदलने पर, डिसप्ले की बेहतर सेटिंग में मौजूद \'एचडीआर फ़ॉर्मैट\' में सभी फ़ॉर्मैट बंद हो जाएंगे."</string>
-    <string name="match_content_frame_rate_title" msgid="153291168560947689">"डिसप्ले और कॉन्टेंट की फ़्रेम रेट एक बराबर सेट करें"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"नैचुरल तरीके से"</string>
+    <string name="match_content_frame_rate_title" msgid="153291168560947689">"डिसप्ले और कॉन्टेंट की फ़्रेम दर एक बराबर सेट करें"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"ऐसे बदलाव जो डिसप्ले में आसानी से किए जा सकते हैं"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"अगर ऐप्लिकेशन ऐसा करने का अनुरोध करता है, तो आपका डिवाइस उस कॉन्टेंट के मूल फ़्रेम रेट के बराबर आउटपुट देगा जो आप देख रहे हैं. ऐसा तब होगा, जब आपका टीवी बिना किसी रुकावट के फ़्रेम रेट में बदलाव कर सकता हो."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"बिना किसी रुकावट के रीफ़्रेश दर में बदलाव करने की सुविधा, कनेक्ट किए गए डिवाइस पर काम नहीं करती. यह सुविधा तब तक काम नहीं करेगी, जब तक इसके साथ काम करने वाले डिवाइस से कनेक्ट नहीं किया जाता."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"हमेशा"</string>
-    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"अगर ऐप्लिकेशन ऐसा करने का अनुरोध करता है, तो आपका डिवाइस उस कॉन्टेंट के मूल फ़्रेम रेट के बराबर आउटपुट देगा जिसे फ़िलहाल देखा जा रहा है. वीडियो शुरू या बंद करते समय, हो सकता है कि डिवाइस की स्क्रीन पर कुछ सेकंड तक कुछ न दिखे."</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"ऐसे बदलाव जो डिसप्ले में आसानी से नहीं किए जा सकते हैं"</string>
+    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"अगर ऐप्लिकेशन ऐसा करने का अनुरोध करता है, तो आपका डिवाइस उस कॉन्टेंट के मूल फ़्रेम रेट के बराबर आउटपुट देगा जो आप देख रहे हैं. जब आप वीडियो देख रहे होते हैं या वीडियो देखना शुरू करते हैं, तो हो सकता है कि डिवाइस की स्क्रीन पर कुछ सेकंड तक कुछ न दिखे."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"कभी नहीं"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"भले ही, ऐप्लिकेशन ने ऐसा करने का अनुरोध किया हो, लेकिन आपका डिवाइस उस कॉन्टेंट के मूल फ़्रेम रेट के बराबर आउटपुट देने की कोशिश कभी नहीं करेगा जो आप देख रहे हैं."</string>
     <string name="font_scale_settings_title" msgid="4114019544800225980">"टेक्स्ट स्केलिंग"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"क्या रिज़ॉल्यूशन को बदलकर %1$s पर सेट करना है?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"अब से %1$s रिज़ॉल्यूशन का इस्तेमाल करने के लिए, \'ठीक है\' चुनें."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision का इस्तेमाल %1$s में नहीं किया जा सकता. इसे \"Advanced Display Settings\" में बंद कर दिया जाएगा"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"इस मोड में %1$s का इस्तेमाल किया जा सकता है\nकुछ टीवी पर एचडीआर के ज़्यादा फ़ॉर्मैट इस्तेमाल करने के लिए, आपको बेहतर एचडीएमआई की सेटिंग चालू करनी पड़ सकती है. अपने टीवी की सेटिंग में जाकर देखें कि क्या यह विकल्प उपलब्ध है."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"इस मोड में %1$s का इस्तेमाल किया जा सकता है. कुछ टीवी पर, एचडीआर के ज़्यादा फ़ॉर्मैट चालू करने के लिए, बेहतर एचडीएमआई की सेटिंग चालू करने की ज़रूरत होती है. अपने टीवी की सेटिंग में जाकर देखें कि क्या यह विकल्प उपलब्ध है."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"अभी नहीं"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ठीक है"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"हर्ट्ज़"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> हर्ट्ज़)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> हर्ट्ज़)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"संचित डेटा साफ़ करें?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"इससे सभी ऐप्‍स का संचित डेटा साफ़ हो जाएगा."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"इस डिवाइस का प्रबंधन आपका संगठन करता है."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> इस डिवाइस को प्रबंधित करता है."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"ज़्यादा जानें"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{कैमरा ऐप्लिकेशन}one{कैमरा ऐप्लिकेशन}other{कैमरा ऐप्लिकेशन}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"कैलेंडर ऐप्लिकेशन"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"कृपया पुष्टि करें कि आपको मीडिया देखते समय, डिसप्ले बंद न होने की सेटिंग चालू करनी है. ध्यान रखें कि ऐसा करने से बैटरी ज़्यादा खर्च हो सकती है."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"जब डिवाइस का इस्तेमाल न किया जा रहा हो"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"जब डिवाइस पर कॉन्टेंट चल रहा हो"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"टीवी के अपने-आप बंद होने की सेटिंग चालू करें"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"लंबे समय तक कोई गतिविधि न होने पर, टीवी के अपने-आप बंद होने की सेटिंग चालू करें"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"वीडियो देखते समय टीवी के अपने-आप बंद होने की सेटिंग चालू करें"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"टीवी के अपने-आप बंद होने की सेटिंग चालू करें"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"लंबे समय तक कोई गतिविधि न होने पर, टीवी के अपने-आप बंद होने की सेटिंग चालू करें"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"वीडियो देखते समय टीवी के अपने-आप बंद होने की सेटिंग चालू करें"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"जब डिवाइस का इस्तेमाल न किया जा रहा हो\" टाइमर, \"जब डिवाइस पर कॉन्टेंट चल रहा हो\" टाइमर से छोटा होना चाहिए"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"जब डिवाइस पर कॉन्टेंट चल रहा हो\" टाइमर, \"जब डिवाइस का इस्तेमाल न किया जा रहा हो\" टाइमर से लंबा होना चाहिए"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"स्टैंडबाय मोड में इंटरनेट का सीमित इस्तेमाल करें"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"टीवी के चालू होने पर दिखने वाली स्क्रीन"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"रीसेट करें"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"ईथरनेट से जोड़ने का कोड"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"एनर्जी मोड"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"टीवी इस्तेमाल में नहीं होने पर, ऊर्जा की क्षमता में सुधार करता है"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"चालू करता है:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ध्यान दें कि यह मोड डिवाइस की बिजली खपत बढ़ा सकता है."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" को चालू करें"</string>
 </resources>
diff --git a/Settings/res/values-hr/energy-modes.xml b/Settings/res/values-hr/energy-modes.xml
deleted file mode 100644
index 6bc135357..000000000
--- a/Settings/res/values-hr/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Neophodne mrežne značajke"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Niska potrošnja energije"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Isključi mrežnu vezu kad se TV ne upotrebljava."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Kritična ažuriranja i funkcije"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Preporučene mrežne značajke"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimizirana potrošnja energije"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Uključuje značajke koje aktiviraju TV putem mreže (umreženo stanje pripravnosti)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Dodatne mrežne značajke"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Povećana potrošnja energije"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Uz preporučene, ova opcija uključuje dodatne značajke kad se TV ne upotrebljava, koje mogu povećati potrošnju energije."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-hr/strings.xml b/Settings/res/values-hr/strings.xml
index 68b2a7525..bdfd2d714 100644
--- a/Settings/res/values-hr/strings.xml
+++ b/Settings/res/values-hr/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Sigurnosna kopija i vraćanje"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Vraćanje na tvorničko stanje"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibracija"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Odbrojavanje do isključivanja"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Postavite odbrojavanje za isključivanje TV-a i uštedu energije"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Napajanje i energija"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Eko postavke"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Uređaji"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Odaberite formate"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Napredne postavke zvuka"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Dopusti način za igru"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Usklađivanje s dinamičkim rasponom sadržaja"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Kad je ova opcija omogućena, sustav će se prebacivati između različitih formata dinamičkog raspona kako bi se podudarao sa sadržajem. Tijekom promjene formata može se pojaviti crni zaslon.\n\nKliknite postavke naprednog prikaza da biste vidjeli više opcija dinamičkog raspona."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Preferirani dinamički raspon"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Pretvaranje koje preferira sustav"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Omogućuje sustavu da upravlja pretvaranjem formata"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Kada se ta opcija odabere, sustav će odrediti prikladan dinamički raspon koji će se poslati na vaš zaslon i prema potrebi pretvorit će sadržaj na taj dinamički raspon."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Uvijek se podudara s formatom sadržaja"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Nametanje pretvaranja"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Nameće pretvaranje u preferirani format"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Nametanje pretvaranja u preferirani format. Nametanje pretvaranja može utjecati na druge postavke u načinu zaslona ili HDR format."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Uvijek u SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Uvijek u <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Želite li nametnuti HDR izlaz?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Prema zadanim postavkama nametnut će se pretvaranje u <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Razlučivost vašeg zaslona bit će 1080 p 60 Hz. Ta opcija nije kompatibilna s vašim zaslonom pri razlučivosti 4k 60Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision nije podržan u trenutačnoj razlučivosti. Ako ručno omogućite Dolby Vision, razlučivost zaslona promijenit će se u 1080p 60 Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Želite li promijeniti razlučivost u 1080p 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Uvijek nametni konverziju u Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Ako se Dolby Vision onemogući u HDR formatima u naprednim postavkama zaslona, nametanjem konverzije u Dolby Vision ponovo će se omogućiti."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Uvijek nametni konverziju u HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Ako se HDR10 onemogući u HDR formatima u naprednim postavkama zaslona, nametanjem konverzije u HDR10 ponovo će se omogućiti."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Uvijek nametni konverziju u HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Ako se HLG onemogući u HDR formatima u naprednim postavkama zaslona, nametanjem konverzije u HLG ponovo će se omogućiti."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Uvijek nametni konverziju u HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Ako se HDR10+ onemogući u HDR formatima u naprednim postavkama zaslona, nametanjem konverzije u HDR10+ ponovo će se omogućiti."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Uvijek nametni konverziju u SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Nametanjem konverzije u SDR onemogućit će se svi formati u HDR formatima u naprednim postavkama zaslona."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Usklađivanje s brojem sličica u sekundi sadržaja"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Samo bez prekida"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Bez prekida"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Ako aplikacija to zahtijeva, uređaj će uskladiti izlaz s izvornim brojem sličica u sekundi sadržaja koji gledate, no SAMO ako vaš televizor može izvršiti prijelaz bez prekida."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Vaš povezani zaslon ne podržava neometane prijelaze učestalosti osvježavanja. Ta opcija neće imati učinka ako ne prijeđete na zaslon koji je podržava."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Uvijek"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"S prekidima"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Ako aplikacija to zahtijeva, uređaj će uskladiti izlaz s izvornim brojem sličica u sekundi sadržaja koji gledate. Zbog toga će zaslon možda biti prazan na sekundu prilikom zaustavljanja ili pokretanja reprodukcije videozapisa."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Nikad"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Čak i ako aplikacija to zahtijeva, uređaj nikad neće pokušavati uskladiti izlaz s izvornim brojem sličica u sekundi sadržaja koji gledate."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Želite li promijeniti razlučivost u %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Odaberite U redu da biste odsad upotrebljavali %1$s."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision nije podržan u načinu %1$s i onemogućit će se u naprednim postavkama zaslona"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Ovaj način podržava: %1$s\nNa nekim televizorima možda ćete trebati uključiti poboljšani HDMI da biste omogućili više HDR formata. U postavkama televizora provjerite je li to podržano."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Ovaj način podržava %1$s. Na nekim televizorima možda ćete trebati uključiti poboljšani HDMI da biste omogućili više HDR formata. U postavkama televizora provjerite je li to podržano."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Odustani"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"U redu"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Želite li izbrisati podatke iz predmemorije?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Obrisat ćete predmemorirane podatke svih aplikacija."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Ovim uređajem upravlja vaša organizacija."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Ovim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠U+2060"</string>
     <string name="learn_more" msgid="820336467414665686">"Saznajte više"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplikacija fotoaparata}one{Aplikacije fotoaparata}few{Aplikacije fotoaparata}other{Aplikacije fotoaparata}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplikacija Kalendar"</string>
@@ -458,7 +432,7 @@
     <string name="title_wifi_proxy_hostname" msgid="1242297002220870385">"Naziv hosta proxy poslužitelja:"</string>
     <string name="title_wifi_proxy_port" msgid="566244407030390328">"Priključak proxy poslužitelja:"</string>
     <string name="title_wifi_proxy_bypass" msgid="8752756240663231435">"Zaobiđi proxy za:"</string>
-    <string name="title_wifi_ip_settings" msgid="296029383749112888">"Postavke IP-ja"</string>
+    <string name="title_wifi_ip_settings" msgid="296029383749112888">"IP postavke"</string>
     <string name="title_wifi_ip_address" msgid="5505806431042689276">"IP adresa:"</string>
     <string name="title_wifi_gateway" msgid="4496416267930824360">"Pristupnik:"</string>
     <string name="title_wifi_network_prefix_length" msgid="3200370297772096824">"Duljina mrežnog prefiksa:"</string>
@@ -796,7 +770,7 @@
     <string name="system_desc_hdcp_checking" msgid="1664068008848077241">"Upotrijebi samo za DRM sadržaj"</string>
     <string name="system_desc_hdmi_optimization" msgid="5695603795556335912">"Optimiziranje zaslona za maksimalnu rezoluciju ili maksimalan broj sličica u sekundi. To utječe samo na Ultra HD zaslone. Promjena te postavke izazvat će ponovno pokretanje uređaja."</string>
     <string name="system_desc_bt_hci_log" msgid="2592649923221658103">"Omogući zapisnik funkcije \"snoop\" za Bluetooth HCI"</string>
-    <string name="system_desc_usb_debugging" msgid="5672275208185222785">"Način rada za otklanjanje pogrešaka kada je priključen USB"</string>
+    <string name="system_desc_usb_debugging" msgid="5672275208185222785">"Otklanjanje pogrešaka putem USB-a"</string>
     <string name="system_desc_wait_for_debugger" msgid="7213496668606417691">"Aplikacija čeka program za otklanjanje pogrešaka"</string>
     <string name="system_desc_show_layout_bounds" msgid="5275008598296135852">"Za isječak prikaži granice, margine itd."</string>
     <string name="system_desc_show_gpu_view_updates" msgid="9088343415389734854">"Bljeskanje prikaza u prozorima pri crtanju GPU-om"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Potvrdite da biste spriječili isključivanje zaslona dok gledate, što potencijalno povećava upotrebu energije."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Tijekom neaktivnosti"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Tijekom gledanja"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Automatski isključi"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Automatski isključi tijekom neaktivnosti"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Automatski isključi tijekom gledanja"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Automatski isključi TV"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Automatski isključi TV kad nije aktivan"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Automatski isključi TV tijekom gledanja"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Odbrojavanje Tijekom neaktivnosti mora biti kraće od odbrojavanja Tijekom gledanja"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Odbrojavanje Tijekom gledanja mora biti dulje od odbrojavanja Tijekom neaktivnosti"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Ograniči mrežnu vezu u stanju mirovanja"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Ponašanje prilikom uključivanja"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Poništi"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Kôd za uparivanje etherneta"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Energetski načini"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Poboljšajte energetsku učinkovitost kad se TV ne upotrebljava"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Omogućuje:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Napominjemo da taj način može povećati potrošnju energije na uređaju."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Omogućite <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
 </resources>
diff --git a/Settings/res/values-hu/energy-modes.xml b/Settings/res/values-hu/energy-modes.xml
deleted file mode 100644
index 6c5b0955e..000000000
--- a/Settings/res/values-hu/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Alapvető hálózati funkciók"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Alacsony energiafelhasználás"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Hálózati kapcsolat kikapcsolása, amikor a TV nincs használatban."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Kritikus frissítések és funkciók"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Ajánlott hálózati funkciók"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimalizált energiafelhasználás"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Bekapcsolja azokat a funkciókat, amelyek felébresztik a tévét a hálózaton keresztül (hálózati készenléti állapot)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"További hálózati funkciók"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Nagyobb energiafelhasználás"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Az ajánlott funkciók mellett ez a lehetőség további olyan funkciókat is bekapcsol, amelyek növelhetik az energiafelhasználást, amikor nincs használatban a tévé."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-hu/strings.xml b/Settings/res/values-hu/strings.xml
index 10ffe0014..5b742a648 100644
--- a/Settings/res/values-hu/strings.xml
+++ b/Settings/res/values-hu/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Biztonsági mentés és visszaállítás"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Gyári adatok visszaállítása"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibrálás"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Kikapcsolási időzítő"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Beállíthat időzítőket a TV kikapcsolásához és az energiamegtakarítás érdekében."</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Áramellátás és energia"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Eco beállítások"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Eszközök"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Formátumok kiválasztása"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Speciális hangbeállítások"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Játékmód engedélyezése"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Tartalom dinamikatartományának használata"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Ha bekapcsolja ezt a beállítást, a rendszer a tartalmaknak megfelelően vált a különböző formátumú dinamikatartományok között. Formátumváltáskor fekete képernyő jelenhet meg.\n\nA dinamikatartománnyal kapcsolatos további lehetőségekért kattintson a Speciális kijelzőbeállítások elemre."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Preferált dinamikatartomány"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Rendszer által előnyben részesített konverzió"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"A rendszer kezelheti a formátumátalakítást"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"A beállítás kijelölésével a rendszer határozza majd meg a kijelzőre továbbítandó megfelelő dinamikus tartományt, majd szükség szerint erre a dinamikus tartományra alakítja át a tartalmat."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Mindig egyezteti a tartalom formátumát"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Konverzió kikényszerítése"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"A kívánt formátumra kényszeríti ki a konverziót"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"A kívánt formátumra kényszerítheti ki a konverziót. A konverzió kikényszerítése hatást gyakorolhat a megjelenítési mód vagy a HDR formátum beállításaira."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Mindig SDR szabványra"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Mindig erre: <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Szeretné kikényszeríteni a HDR-kimenetet?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"A rendszer alapértelmezés szerint a következőre kényszeríti a konverziót: <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"A kijelző felbontása 1080p 60 Hz lesz. A beállítás nem kompatibilis a 4k 60 Hz felbontású kijelzőn."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"A Dolby Vision nem támogatott a jelenlegi felbontás mellett. Ha manuálisan engedélyezi a Dolby Vision funkciót, a képernyő felbontása 1080p 60 Hz-re változik."</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Módosítja a felbontást 1080p 60 Hz-re?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Mindig legyen kényszerítve a Dolby Visionre való átalakítás"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Ha a Dolby Vision le van tiltva HDR-formátumokban a Speciális kijelzőbeállítások között, a Dolby Visionre való átalakítás kényszerítése újra engedélyezi."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Mindig legyen kényszerítve a HDR10-re való átalakítás"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Ha a HDR10 le van tiltva HDR-formátumokban a Speciális kijelzőbeállítások között, a HDR10-re való átalakítás kényszerítése újra engedélyezi."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Mindig legyen kényszerítve a HLG-re való átalakítás"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Ha a HLG le van tiltva HDR-formátumokban a Speciális kijelzőbeállítások között, a HLG-re való átalakítás kényszerítése újra engedélyezi."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Mindig legyen kényszerítve a HDR10+-ra való átalakítás"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Ha a HDR10+ le van tiltva HDR-formátumokban a Speciális kijelzőbeállítások között, a HDR10+-ra való átalakítás kényszerítése újra engedélyezi."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Mindig legyen kényszerítve az SDR-re való átalakítás"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Az SDR-re való átalakítás kényszerítése az összes formátumot letiltja a HDR-formátumokban a Speciális kijelzőbeállítások között."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Tartalom képkocka-sebességének egyeztetése"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Csak zökkenőmentes"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Zökkenőmentes"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Ha az alkalmazás engedélyt kér rá, az eszköze az éppen nézett tartalom eredeti képkockasebességéhez igazítja a kimenetet, de CSAK akkor, ha a tévéje képes a zökkenőmentes átmenetre."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"A csatlakoztatott kijelző nem támogatja a zökkenőmentes frissítési gyakoriságú átvitelt. A beállítás csak akkor lép érvénybe, ha a funkciót támogató kijelzőre vált."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Mindig"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Nem zökkenőmentes"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Ha az alkalmazás engedélyt kér rá, az eszköze az éppen nézett tartalom eredeti képkockasebességéhez igazítja a kimenetet. Ennek következtében előfordulhat, hogy képernyője egy másodpercre elsötétül, amikor elindul vagy véget ér a videólejátszás."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Soha"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Még ha az alkalmazás engedélyt kér is rá, az eszköze akkor sem fogja megpróbálni az éppen nézett tartalom eredeti képkockasebességéhez igazítani a kimenetet."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Módosítja a felbontást a következőre: %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Válassza az OK gombot, ha mostantól a(z) %1$s felbontást szeretné használni."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"A Dolby Vision nem támogatott itt: %1$s, a rendszer pedig letiltja ezt a módot a „Speciális kijelzőbeállítások” között."</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Ez a mód támogatja a következőt: %1$s\nEgyes tévék esetében előfordulhat, hogy a további HDR-formátumok engedélyezéséhez be kell kapcsolnia a javított HDMI (Enhanced HDMI) lehetőséget. Ellenőrizze a tévé beállításai között, hogy a funkció támogatott-e."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Ez a mód támogatja a következőt: %1$s. Egyes tévék esetében előfordulhat, hogy a további HDR-formátumok engedélyezéséhez be kell kapcsolnia a javított HDMI lehetőséget. Ellenőrizze a tévé beállításai között, hogy a funkció támogatott-e."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Mégse"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Törli a gyorsítótárban tárolt adatokat?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Ez törli minden alkalmazás gyorsítótárban tárolt adatait"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Az eszközt az Ön szervezete kezeli."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Az eszközt a következő szervezet kezeli: <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"További információ"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kameraalkalmazás}other{Kameraalkalmazások}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Naptáralkalmazás"</string>
@@ -652,8 +626,8 @@
     <string name="location_mode_title" msgid="728244518174115443">"Mód"</string>
     <string name="location_category_recent_location_requests" msgid="4541924383164183490">"Legutóbbi helylekérdezések"</string>
     <string name="location_no_recent_apps" msgid="7033474075806435793">"Az utóbbi időben egy alkalmazás sem kért le helyadatokat"</string>
-    <string name="location_high_battery_use" msgid="5325556609027887602">"Magas akkuhasználat"</string>
-    <string name="location_low_battery_use" msgid="728585923412018253">"Alacsony akkuhasználat"</string>
+    <string name="location_high_battery_use" msgid="5325556609027887602">"Magas akkumulátorhasználat"</string>
+    <string name="location_low_battery_use" msgid="728585923412018253">"Alacsony akkumulátorhasználat"</string>
     <string name="location_mode_wifi_description" msgid="84697248707903061">"Wi-Fi használata a tartózkodási hely meghatározásához"</string>
     <string name="location_status" msgid="3037321737386011224">"Helyállapot"</string>
     <string name="location_services" msgid="551503779736382878">"Helyszolgáltatások"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Erősítse meg, hogy nem szeretné, ha a kijelző nézés közben kikapcsoljon. Ez megnövekedett energiafelhasználással járhat."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Inaktivitás esetén"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Lejátszás közben"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Automatikus kikapcsolás"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Automatikus kikapcsolás, amikor inaktív"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Automatikus kikapcsolás tartalomlejátszás közben"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"A TV automatikus kikapcsolása"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"A TV automatikus kikapcsolása, miközben inaktív"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"A TV automatikus kikapcsolása, miközben nézi"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Az „Inaktivitás esetén” időzítő nem lehet hosszabb a „Lejátszás közben” időzítőnél"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"A „Lejátszás közben” időzítő nem lehet rövidebb az „Inaktivitás esetén” időzítőnél"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Hálózat korlátozása készenléti módban"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Bekapcsolási viselkedés"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Visszaállítás"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Ethernet-hálózat párosítókódja"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Energiamódok"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Növeli az energiahatékonyságot, amikor nincs használatban a tévé"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Engedélyezi a következőket:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Vegye figyelembe, hogy ez az üzemmód növelheti az eszköz energiafogyasztását."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"A következő engedélyezése: „<xliff:g id="ENERGYMODENAME">%s</xliff:g>”"</string>
 </resources>
diff --git a/Settings/res/values-hy/energy-modes.xml b/Settings/res/values-hy/energy-modes.xml
deleted file mode 100644
index 0fa0930a8..000000000
--- a/Settings/res/values-hy/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Ցանցի կարևոր գործառույթներ"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Էներգիայի քիչ ծախս"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Անջատել կապը, որբ հեռուստացույցը չի օգտագործվում։"</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Կարևոր թարմացումներ և գործառույթներ"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Առաջարկվող ցանցային գործառույթներ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Էներգիայի օպտիմալ ծախս"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Միացնում է գործառույթները, որոնք արթնացնում են հեռուստացույցը ցանցի միջոցով (սպասման ցանցային ռեժիմ)։"</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Ներմուծել գործառույթ 1-ը]"</item>
-    <item msgid="8724721267222341891">"[Ներմուծել գործառույթ 2-ը]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Ցանցի լրացուցիչ գործառույթներ"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Էներգիայի մեծ ծախս"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Ի լրումն առաջարկվող գործառույթների՝ երբ հեռուստացույցը չի օգտագործվում, այս ընտրանքը միացնում է լրացուցիչ գործառույթներ, ինչի արդյունքում էներգիայի ծախսը կարող է աճել։"</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Ներմուծել գործառույթ 1-ը]"</item>
-    <item msgid="170760143032597722">"[Ներմուծել գործառույթ 2-ը]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-hy/strings.xml b/Settings/res/values-hy/strings.xml
index 7ac02de40..53e8d0645 100644
--- a/Settings/res/values-hy/strings.xml
+++ b/Settings/res/values-hy/strings.xml
@@ -91,7 +91,7 @@
     <string name="connectivity_hint_message" msgid="5638304246522516583">"Միացեք ցանցին"</string>
     <string name="connectivity_network_diagnostics" msgid="4396132865849151854">"Ցանցի դիագնոստիկա"</string>
     <string name="apps_recently_used_category_title" msgid="7877660412428813933">"Վերջերս օգտագործված հավելվածներ"</string>
-    <string name="apps_see_all_apps" msgid="2002886135933443688">"Տեսնել բոլոր հավելվածները"</string>
+    <string name="apps_see_all_apps" msgid="2002886135933443688">"Դիտել բոլոր հավելվածները"</string>
     <string name="apps_permissions_category_title" msgid="8099660060701465267">"Թույլտվություններ"</string>
     <string name="overlay_security_slice_title" msgid="4895032817538300187"></string>
     <string name="update_slice_title" msgid="6553763903108611747"></string>
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Պահուստավորում և վերականգնում"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Վերակայել բոլոր տվյալները"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Չափաբերում"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Անջատման ժամաչափ"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Սահմանեք ժամաչափեր՝ հեռուստացույցն անջատելու և էներգիա խնայելու համար"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Սնուցում և էներգիա"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Էկո ռեժիմի կարգավորումներ"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Սարքեր"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Ընտրեք ձևաչափերը"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Ձայնի լրացուցիչ կարգավորումներ"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Թույլատրեք խաղային ռեժիմը"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Համապատասխանեցնել բովանդակության դինամիկ դիապազոնը"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Երբ այս պարամետրը միացված է, համակարգը փոխարկաբար կօգտագործի դինամիկ դիապազոնի տարբեր ձևաչափեր՝ բովանդակությանը համապատասխանելու համար։ Ձևաչափի փոփոխման ժամանակ էկրանը կարող է սևանալ։\n\nԴինամիկ դիապազոնի այլ տարբերակներ տեսնելու համար անցեք էկրանի լրացուցիչ կարգավորումներ։"</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Նախընտրելի դինամիկ դիապազոն"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Ձևաչափի ավտոմատ կարգավորում"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Թող համակարգը կառավարի ձևաչափի փոխարկումը"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Եթե միացնեք այս պարամետրը, համակարգը կորոշի ձեր էկրանին համապատասխան դինամիկ դիապազոնը և, անհրաժեշտության դեպքում, կցուցադրի բովանդակությունը այդ դիապազոնում։"</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Միշտ համապատասխանում է բովանդակության ձևաչափին"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Հարկադիր փոխակերպում"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Տեսանյութը հարկադրաբար կվերածվի անհրաժեշտ ձևաչափի"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Տեսանյութը հարկադրաբար կվերածվի անհրաժեշտ ձևաչափի։ Ձևաչափի հարկադիր փոխակերպումը կարող է ազդել ցուցադրման ռեժիմի կամ HDR ձևաչափի այլ կարգավորումների վրա։"</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Միշտ SDR ձևաչափով"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Միշտ <xliff:g id="HDR_TYPE">%s</xliff:g> ձևաչափով"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Հարկադրաբար վերածե՞լ HDR ձևաչափի"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Ըստ կանխադրման՝ բովանդակությունը հարկադրաբար կվերածվի <xliff:g id="HDR_TYPE">%s</xliff:g> ձևաչափի։"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Ձեր էկրանի լուծաչափը կլինի 1080 պիքսել, իսկ թարմացման արագությունը՝ 60 Հց։ Այս գործառույթը չի աջակցվում 4K լուծաչափով և թարմացման 60 Հց արագությամբ սարքերում։"</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision-ը չի աջակցվում ընթացիկ լուծաչափով։ Եթե ձեռքով միացնեք Dolby Vision-ը, ձեր էկրանի լուծաչափը կդառնա 1080p 60 Հց։"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Դարձնե՞լ լուծաչափը 1080p 60 Հց"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Միշտ հարկադրաբար փոխակերպել Dolby Vision ձևաչափի"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Եթե Էկրանի լրացուցիչ կարգավորումների «HDR ձևաչափեր» ընտրացանկում Dolby Vision-ն անջատված է, հարկադրաբար փոխակերպումը Dolby Vision-ի նորից կմիացնի այն։"</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Միշտ հարկադրաբար փոխակերպել HDR10 ձևաչափի"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Եթե Էկրանի լրացուցիչ կարգավորումների «HDR ձևաչափեր» ընտրացանկում HDR10-ն անջատված է, հարկադրաբար փոխակերպումը HDR10-ի նորից կմիացնի այն։"</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Միշտ հարկադրաբար փոխակերպել HLG ձևաչափի"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Եթե Էկրանի լրացուցիչ կարգավորումների «HDR ձևաչափեր» ընտրացանկում HLG-ն անջատված է, հարկադրաբար փոխակերպումը HLG-ի նորից կմիացնի այն։"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Միշտ հարկադրաբար փոխակերպել HDR10+ ձևաչափի"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Եթե Էկրանի լրացուցիչ կարգավորումների «HDR ձևաչափեր» ընտրացանկում HDR10+ն անջատված է, հարկադրաբար փոխակերպումը HDR10+ի նորից կմիացնի այն։"</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Միշտ հարկադրաբար փոխակերպել SDR ձևաչափի"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Հարկադրաբար փոխակերպումը SDR-ի կանջատի Էկրանի լրացուցիչ կարգավորումների «HDR ձևաչափեր» ընտրացանկի բոլոր ձևաչափերը։"</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Համապատասխանեցնել բովանդակության կադրերի հաճախականությունը"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Միայն աննկատ"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Սահուն"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Երբ հավելվածը պահանջում է, սարքը կհամապատասխանեցնի իր հաճախականությունը նվագարկվող տեսանյութի կադրերի հաճախականությանը ՄԻԱՅՆ ԱՅՆ ԴԵՊՔՈՒՄ, եթե ձեր հեռուստացույցն աջակցում է սահուն անցում։"</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Ձեր միացված էկրանը չի աջակցում թարմացման հաճախականության սահուն անցումներ։ Այս կարգավորումը չի գործի, մինչև որ չանցնեք այն աջակցող էկրանի։"</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Միշտ"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Ոչ սահուն"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Երբ հավելվածը պահանջում է, սարքը կհամապատասխանեցնի իր հաճախականությունը նվագարկվող տեսանյութի կադրերի հաճախականությանը։ Տեսանյութի նվագարկման սկզբում և վերջում էկրանը մի պահ կարող է սպիտակել։"</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Երբեք"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Նույնիսկ երբ հավելվածը պահանջում է, սարքը չի համապատասխանեցնի իր հաճախականությունը նվագարկվող տեսանյութի կադրերի հաճախականությանը։"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Դարձնե՞լ լուծաչափը %1$s"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Սեղմեք «Եղավ»՝ %1$s լուծաչափն այս պահից սկսած օգտագործելու համար։"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision-ը չի աջակցվում %1$s ռեժիմում և կանջատվի էկրանի ընդլայնված կարգավորումներում։"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Այս ռեժիմն աջակցում է հետևյալ ձևաչափերը՝ %1$s\nՀնարավոր է՝ որոշ հեռուստացույցներում անհրաժեշտ լինի միացնել ընդլայնված HDMI ձևաչափը, որպեսզի ավելի շատ HDR ձևաչափեր համատեղելի լինեն։ Ստուգեք հեռուստացույցի կարգավորումներում՝ արդյոք այս գործառույթն աջակցվում է։"</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Այս ռեժիմն աջակցում է %1$s ձևաչափերը։ Որոշ հեռուստացույցներում, հնարավոր է, անհրաժեշտ լինի միացնել ընդլայնված HDMI ձևաչափը, որպեսզի ավելի շատ HDR ձևաչափեր համատեղելի լինեն։ Ստուգեք հեռուստացույցի կարգավորումներում՝ արդյոք այս գործառույթն աջակցվում է։"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Չեղարկել"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Եղավ"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Հց"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Հց)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Հց)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Ջնջե՞լ քեշավորված տվյալները:"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Սա կմաքրի բոլոր ծրագրերի քեշավորված տվյալները:"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Այս սարքի կառավարիչը ձեր կազմակերպությունն է։"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Այս սարքի կառավարիչն է <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> կազմակերպությունը։"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Մանրամասն"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Տեսախցիկի հավելված}one{Տեսախցիկի հավելված}other{Տեսախցիկի հավելվածներ}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Օրացույցի հավելված"</string>
@@ -783,8 +757,8 @@
     <string name="system_show_hardware_layer" msgid="5833664339844452290">"Ցույց տալ սարքաշարի մակարդակը"</string>
     <string name="system_show_gpu_overdraw" msgid="5073007513540516704">"Ցույց տալ GPU ավելցուկը"</string>
     <string name="system_show_surface_updates" msgid="7680759813613585278">"Ցույց տալ մակերեսի թարմացումները"</string>
-    <string name="system_window_animation_scale" msgid="685477540250939659">"Պատուհանի շարժապատկեր"</string>
-    <string name="system_transition_animation_scale" msgid="7266380208347453619">"Անցումների շարժապատկեր"</string>
+    <string name="system_window_animation_scale" msgid="685477540250939659">"Պատուհանի շարժապատկերի սանդղակ"</string>
+    <string name="system_transition_animation_scale" msgid="7266380208347453619">"Անցումային շարժական սանդղակ"</string>
     <string name="system_animator_duration_scale" msgid="3829445237130423625">"Շարժանկարի տևողության սանդղակ"</string>
     <string name="system_strict_mode_enabled" msgid="7392183793064579588">"Խիստ ռեժիմն ակտիվացված է"</string>
     <string name="system_profile_gpu_rendering" msgid="1113416260742329348">"GPU պրոֆիլի ցուցադրում"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Խնդրում ենք հաստատել, որպեսզի էկրանը չանջատվի դիտման ժամանակ (կարող է ավելի շատ էներգիա սպառվել)։"</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Երբ ակտիվ չէ"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Դիտելու ժամանակ"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Ավտոմատ անջատում"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Ավտոմատ անջատում ոչ ակտիվ լինելու դեպքում"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Ավտոմատ անջատում դիտման ժամանակ"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Հեռուստացույցի ավտոմատ անջատում"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Հեռուստացույցի ավտոմատ անջատում ոչ ակտիվ լինելու դեպքում"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Հեռուստացույցի ավտոմատ անջատում դիտելու ընթացքում"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"«Անգործունության ժամանակ» ժամաչափը պետք է «Դիտելու ժամանակ» ժամաչափից ավելի կարճ լինի"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"«Դիտելու ժամանակ» ժամաչափը պետք է «Անգործունության ժամանակ» ժամաչափից ավելի երկար լինի"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Սահմանափակեք կապը սպասման ռեժիմում"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Կարգավիճակը միացման ժամանակ"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Վերակայել"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Ethernet-ի զուգակցման կոդ"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Էներգիայի սպառման ռեժիմներ"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Օպտիմալացնել էներգիայի սպառումը, երբ հեռուստացույցը չի օգտագործվում"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Միացնում է՝"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Նկատի ունեցեք, որ այս ռեժիմը կարող է մեծացնել սարքի կողմից էներգիայի ծախսը։"</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Միացնել «<xliff:g id="ENERGYMODENAME">%s</xliff:g>» ռեժիմը"</string>
 </resources>
diff --git a/Settings/res/values-in/energy-modes.xml b/Settings/res/values-in/energy-modes.xml
deleted file mode 100644
index fc8b201fe..000000000
--- a/Settings/res/values-in/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Fitur jaringan penting"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Penggunaan energi rendah"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Menonaktifkan koneksi jaringan saat TV sedang tidak digunakan."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Update dan fungsi penting"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Fitur jaringan yang direkomendasikan"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Penggunaan energi yang dioptimalkan"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Mengaktifkan fitur yang mengaktifkan TV melalui jaringan (mode standby berjaringan)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Fitur jaringan tambahan"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Peningkatan penggunaan energi"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Selain fitur yang direkomendasikan, opsi ini mengaktifkan fitur tambahan yang dapat meningkatkan penggunaan energi saat TV sedang tidak digunakan."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-in/strings.xml b/Settings/res/values-in/strings.xml
index 224b6ffd6..4d67dce50 100644
--- a/Settings/res/values-in/strings.xml
+++ b/Settings/res/values-in/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Pencadangan &amp; Pemulihan"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Reset ke setelan pabrik"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibrasi"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Timer untuk Mematikan TV"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Atur timer untuk mematikan TV dan menghemat energi"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Daya &amp; Energi"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Setelan hemat energi"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Perangkat"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Pilih format"</string>
@@ -151,39 +151,12 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Setelan suara lanjutan"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Izinkan mode game"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Sesuaikan rentang dinamis konten"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Saat mengaktifkan opsi ini, sistem akan beralih antara format rentang dinamis yang berbeda untuk menyesuaikan konten. Hal ini dapat menyebabkan layar hitam selama peralihan format.\n\nKlik setelan Tampilan Lanjutan untuk melihat opsi rentang dinamis lainnya."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Rentang dinamis pilihan"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Konversi pilihan sistem"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Memungkinkan sistem mengelola konversi format"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Saat opsi ini dipilih, sistem akan menentukan rentang dinamis yang sesuai untuk ditampilkan di layar Anda dan mengonversi konten ke rentang dinamis ini sesuai kebutuhan."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Selalu sesuaikan format konten"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Paksa konversi"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Memaksa konversi ke format pilihan"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Paksa konversi ke format pilihan. Memaksa konversi dapat memengaruhi setelan lain di Mode Tampilan atau Format HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Selalu konversi ke SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Selalu konversi ke <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Ingin memaksa output HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Secara default, konversi akan dipaksa ke <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Layar Anda akan berjalan pada resolusi 1080p 60 Hz. Opsi ini tidak kompatibel dengan layar Anda saat berjalan pada resolusi 4k 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision tidak didukung pada resolusi saat ini. Jika Anda mengaktifkan Dolby Vision secara manual, resolusi layar akan diubah menjadi 1080p 60Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Ubah resolusi menjadi 1080p 60Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Selalu paksa konversi ke Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Jika Dolby Vision dinonaktifkan dalam Format HDR di Setelan Tampilan Lanjutan, memaksa konversi ke Dolby Vision akan mengaktifkannya lagi."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Selalu paksa konversi ke HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Jika HDR10 dinonaktifkan dalam Format HDR di Setelan Tampilan Lanjutan, memaksa konversi ke HDR10 akan mengaktifkannya lagi."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Selalu paksa konversi ke HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Jika HLG dinonaktifkan dalam Format HDR di Setelan Tampilan Lanjutan, memaksa konversi ke HLG akan mengaktifkannya lagi."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Selalu paksa konversi ke HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Jika HDR10+ dinonaktifkan dalam Format HDR di Setelan Tampilan Lanjutan, memaksa konversi ke HDR10+ akan mengaktifkannya lagi."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Selalu paksa konversi ke SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Memaksa konversi ke SDR akan menonaktifkan semua format dalam Format HDR di Setelan Tampilan Lanjutan."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Sesuaikan kecepatan frame konten"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Transisi yang Lancar"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Lancar"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Jika aplikasi memintanya, perangkat akan mencocokkan outputnya ke kecepatan frame asli konten yang sedang Anda tonton, HANYA jika TV dapat melakukan transisi yang lancar."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Layar yang terhubung tidak mendukung transisi kecepatan refresh yang lancar. Opsi ini tidak akan berpengaruh kecuali jika Anda menggunakan layar yang mendukungnya."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Selalu"</string>
-    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Jika aplikasi memintanya, perangkat akan menyesuaikan outputnya agar cocok dengan kecepatan frame asli dari konten yang sedang Anda tonton. Hal ini dapat membuat layar kosong sebentar saat Anda keluar dari atau masuk ke pemutaran video."</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Tidak lancar"</string>
+    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Jika aplikasi memintanya, perangkat akan mencocokkan outputnya ke kecepatan frame asli konten yang sedang Anda tonton. Hal ini dapat menyebabkan layar kosong sebentar saat keluar dari atau masuk ke pemutaran video."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Jangan pernah"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Meskipun aplikasi memintanya, perangkat tidak akan mencoba mencocokkan outputnya ke kecepatan frame asli konten yang sedang Anda tonton."</string>
     <string name="font_scale_settings_title" msgid="4114019544800225980">"Penskalaan teks"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Ubah resolusi ke %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Pilih Oke untuk menggunakan %1$s mulai sekarang."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision tidak didukung di %1$s dan akan dinonaktifkan di \"Setelan Tampilan Lanjutan\""</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Mode ini mendukung: %1$s\nDi beberapa TV, Anda mungkin perlu mengaktifkan HDMI yang Ditingkatkan untuk memungkinkan lebih banyak format HDR. Periksa setelan TV Anda untuk melihat apakah fitur ini didukung."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Mode ini mendukung %1$s. Di beberapa TV, Anda mungkin perlu mengaktifkan HDMI yang Ditingkatkan untuk memungkinkan lebih banyak format HDR. Periksa setelan TV Anda untuk melihat apakah fitur ini didukung."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Batal"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Oke"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Hapus data dalam cache?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Ini akan menghapus data cache untuk semua apl."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Perangkat ini dikelola oleh organisasi."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Perangkat ini dikelola oleh <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Pelajari lebih lanjut"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplikasi kamera}other{Aplikasi kamera}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"aplikasi Kalender"</string>
@@ -737,7 +711,7 @@
     <string name="color_yellow" msgid="3519470952904560404">"Kuning"</string>
     <string name="color_magenta" msgid="2377854703399624607">"Merah keunguan"</string>
     <string name="accessibility_toggle_audio_description_preference_title" msgid="933923296129403548">"Deskripsi audio"</string>
-    <string name="accessibility_audio_description_summary" msgid="2027813223650517036">"Dengarkan deskripsi tentang hal yang sedang terjadi di layar pada film dan acara TV yang mendukung deskripsi audio"</string>
+    <string name="accessibility_audio_description_summary" msgid="2027813223650517036">"Dengarkan deskripsi tentang hal yang sedang terjadi di layar pada film dan acara TV yang didukung"</string>
     <string name="system_accessibility_status" msgid="8504842254080682515">"Aktifkan"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Konfigurasi"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -752,8 +726,8 @@
     <string name="system_play_sample" msgid="3934369914309865584">"Mainkan sampel"</string>
     <string name="system_install_voice_data" msgid="8016395777968958673">"Instal data suara"</string>
     <string name="system_general" msgid="687760148454147771">"Umum"</string>
-    <string name="system_debugging" msgid="1576324426385458481">"Proses debug"</string>
-    <string name="system_input" msgid="4457152980514604873">"Input"</string>
+    <string name="system_debugging" msgid="1576324426385458481">"Debugging"</string>
+    <string name="system_input" msgid="4457152980514604873">"Masukan"</string>
     <string name="system_drawing" msgid="5802739024643871942">"Gambar"</string>
     <string name="system_monitoring" msgid="7997260748312620855">"Pemantauan"</string>
     <string name="system_apps" msgid="8481888654606868074">"Aplikasi"</string>
@@ -773,7 +747,7 @@
     <string name="system_select_debug_app" msgid="6200987902307533721">"Memilih aplikasi debug"</string>
     <string name="system_wait_for_debugger" msgid="5715878008542589060">"Tunggu debugger"</string>
     <string name="system_verify_apps_over_usb" msgid="7289212844195483932">"Memverifikasi aplikasi melalui USB"</string>
-    <string name="system_desc_verify_apps_over_usb" msgid="7737988681480237094">"Periksa keberadaan perilaku berbahaya di aplikasi yang diinstal melalui ADB/ADT"</string>
+    <string name="system_desc_verify_apps_over_usb" msgid="7737988681480237094">"Memeriksa perilaku berbahaya pada aplikasi yang terinstal melalui ADB/ADT"</string>
     <string name="system_wifi_verbose_logging" msgid="3097788974146704831">"Pencatatan log panjang Wi-Fi"</string>
     <string name="system_desc_wifi_verbose_logging" msgid="3537578245428327314">"Mengaktifkan pencatatan log panjang Wi-Fi"</string>
     <string name="system_show_touches" msgid="8244331695139748286">"Menampilkan sentuhan"</string>
@@ -782,7 +756,7 @@
     <string name="system_show_gpu_view_updates" msgid="1625918928089365222">"Menampilkan pembaruan tampilan GPU"</string>
     <string name="system_show_hardware_layer" msgid="5833664339844452290">"Menampilkan lapisan hardware"</string>
     <string name="system_show_gpu_overdraw" msgid="5073007513540516704">"Menampilkan kelebihan GPU"</string>
-    <string name="system_show_surface_updates" msgid="7680759813613585278">"Tampilkan pembaruan permukaan"</string>
+    <string name="system_show_surface_updates" msgid="7680759813613585278">"Menampilkan pembaruan permukaan"</string>
     <string name="system_window_animation_scale" msgid="685477540250939659">"Skala animasi jendela"</string>
     <string name="system_transition_animation_scale" msgid="7266380208347453619">"Skala animasi transisi"</string>
     <string name="system_animator_duration_scale" msgid="3829445237130423625">"Skala durasi animator"</string>
@@ -790,7 +764,7 @@
     <string name="system_profile_gpu_rendering" msgid="1113416260742329348">"Rendering GPU profil"</string>
     <string name="system_enable_traces" msgid="108745519968154528">"Mengaktifkan jejak"</string>
     <string name="system_dont_keep_activities" msgid="4641165963339846161">"Jangan simpan kegiatan"</string>
-    <string name="system_background_process_limit" msgid="1985373407150771045">"Batas proses di belakang"</string>
+    <string name="system_background_process_limit" msgid="1985373407150771045">"Batas proses latar belakang"</string>
     <string name="system_show_all_anrs" msgid="5353216640638263217">"Menampilkan semua ANR"</string>
     <string name="system_desc_stay_awake" msgid="8485868071929937500">"Menonaktifkan mode tidur"</string>
     <string name="system_desc_hdcp_checking" msgid="1664068008848077241">"Digunakan untuk konten DRM saja"</string>
@@ -798,12 +772,12 @@
     <string name="system_desc_bt_hci_log" msgid="2592649923221658103">"Aktifkan pencatatan log pengintaian HCI Bluetooth"</string>
     <string name="system_desc_usb_debugging" msgid="5672275208185222785">"Mode debug ketika USB terhubung"</string>
     <string name="system_desc_wait_for_debugger" msgid="7213496668606417691">"Aplikasi yang di-debug menunggu debugger menempel sebelum berjalan"</string>
-    <string name="system_desc_show_layout_bounds" msgid="5275008598296135852">"Tampilkan batas klip, margin, dll."</string>
+    <string name="system_desc_show_layout_bounds" msgid="5275008598296135852">"Menampilkan batas klip, margin, dll."</string>
     <string name="system_desc_show_gpu_view_updates" msgid="9088343415389734854">"Mengedipkan tampilan dalam jendela saat digambar dengan GPU"</string>
-    <string name="system_desc_show_hardware_layer" msgid="3483713991865249527">"Buat lapisan hardware berkedip hijau saat update"</string>
+    <string name="system_desc_show_hardware_layer" msgid="3483713991865249527">"Lapisan hardware berkedip hijau saat memperbarui"</string>
     <string name="system_desc_show_gpu_overdraw" msgid="74019834911598588">"Terbaik-terburuk: biru, hijau, merah terang, merah"</string>
-    <string name="system_desc_show_surface_updates" msgid="4018685547515133353">"Buat seluruh permukaan jendela berkedip saat diperbarui"</string>
-    <string name="system_desc_strict_mode_enabled" msgid="1974896408481676324">"Buat layar berkedip saat aplikasi berjalan lama di thread utama"</string>
+    <string name="system_desc_show_surface_updates" msgid="4018685547515133353">"Mengedipkan seluruh permukaan jendela saat memperbarui"</string>
+    <string name="system_desc_strict_mode_enabled" msgid="1974896408481676324">"Layar berkedip saat apl berjalan lama di utas utama"</string>
     <string name="system_desc_profile_gpu_rendering" msgid="1594070211030991">"Mengukur waktu rendering di adb shell dumpsys gfxinfo"</string>
     <string name="security_unknown_sources_title" msgid="2012801664240314305">"Sumber tidak dikenal"</string>
     <string name="security_unknown_sources_desc" msgid="7196715598352173267">"Izinkan penginstalan aplikasi dari sumber selain Google Play Store"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Konfirmasi untuk mencegah layar dinonaktifkan saat menonton, yang berpotensi meningkatkan penggunaan energi."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Saat tidak aktif"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Saat menonton"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Nonaktifkan otomatis"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Nonaktifkan otomatis saat tidak aktif"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Nonaktifkan otomatis saat menonton"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Otomatis nonaktifkan TV"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Otomatis nonaktifkan TV saat tidak ada aktivitas"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Otomatis nonaktifkan TV saat menonton"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Timer \"Saat tidak aktif\" harus lebih singkat daripada timer \"Saat menonton\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Timer \"Saat menonton\" harus lebih lama daripada timer \"Saat tidak aktif\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Batasi koneksi jaringan di mode standby"</string>
@@ -1043,7 +1017,7 @@
     <string name="picture_in_picture_empty_text" msgid="4370198922852736600">"Tidak ada aplikasi terinstal yang mendukung Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="3296649114939705896">"Mengizinkan aplikasi membuat jendela picture-in-picture saat aplikasi terbuka atau setelah Anda membiarkannya terbuka (misalnya, untuk melanjutkan aktivitas menonton video). Jendela ini ditampilkan di atas aplikasi lain yang sedang digunakan."</string>
     <string name="alarms_and_reminders_description" msgid="4063972350154624500">"Izinkan aplikasi menyetel alarm dan menjadwalkan tindakan berjangka waktu. Hal ini memungkinkan aplikasi berjalan di latar belakang, yang dapat menggunakan lebih banyak daya.\n\nJika izin ini nonaktif, alarm dan acara berbasis waktu yang dijadwalkan oleh aplikasi tidak akan berfungsi."</string>
-    <string name="turn_screen_on_title" msgid="5293798529284629011">"Pengaktifan layar"</string>
+    <string name="turn_screen_on_title" msgid="5293798529284629011">"Aktifkan layar"</string>
     <string name="allow_turn_screen_on" msgid="4903401106871656521">"Izinkan pengaktifan layar"</string>
     <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Mengizinkan aplikasi mengaktifkan layar. Jika diizinkan, aplikasi dapat mengaktifkan layar kapan saja tanpa izin eksplisit dari Anda."</string>
     <string name="special_access" msgid="21806055758289916">"Akses aplikasi khusus"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Tampilan saat menyala"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Reset"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Kode penyambungan ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Mode Energi"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Tingkatkan efisiensi energi saat TV sedang tidak digunakan"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Mengaktifkan:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Perhatikan bahwa mode ini dapat meningkatkan konsumsi energi perangkat."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Aktifkan \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/Settings/res/values-is/energy-modes.xml b/Settings/res/values-is/energy-modes.xml
deleted file mode 100644
index a9c2be1a1..000000000
--- a/Settings/res/values-is/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Nauðsynlegir neteiginleikar"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Lítil orkunotkun"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Slökkva á nettengingu þegar sjónvarpið er ekki í notkun."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Áríðandi uppfærslur og eiginleikar"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Neteiginleikar sem mælt er með"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Fínstillt orkunotkun"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Kveikir á eiginleikum sem vekja sjónvarpið yfir netið (nettengd biðstaða)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Viðbótarneteiginleikar"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Aukin orkunotkun"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Auk eiginleika sem mælt er með kveikir þessi eiginleiki á viðbótareiginleikum þegar sjónvarpið er ekki í notkun sem gætu aukið orkunotkunina."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-is/strings.xml b/Settings/res/values-is/strings.xml
index 455251011..b47841a0c 100644
--- a/Settings/res/values-is/strings.xml
+++ b/Settings/res/values-is/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Afritun og endurheimt"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Núllstilling"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kvörðun"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Teljari til að slökkva"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Stilltu teljara til að slökkva á sjónvarpinu og spara orku"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Afl og orka"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Umhverfisvænar stillingar"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Tæki"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Velja snið"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Ítarlegar hljóðstillingar"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Leyfa leikjastillingu"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Nota sama styrkleikasvið og efni"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Þegar kveikt er á þessum valkosti skiptir kerfið á milli mismunandi styrkleikasviðssniða í takt við efnið. Þetta getur orðið til þess að skjárinn verði svartur þegar skipt er á milli sniða.\n\nSmelltu á „Ítarlegar skjástillingar“ til að sjá fleiri valkosti fyrir styrkleikasvið."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Valið styrkleikasvið"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Kerfisvalin umbreyting"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Leyfir kerfinu að stjórna umbreytingu sniðs"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Þegar þessi valkostur er valinn ákvarðar kerfið styrkleikasvið sem hentar til að senda á skjáinn og umbreyta efninu í viðkomandi styrkleikasvið eftir þörfum."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Passar alltaf við snið efnisins"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Þvinga umbreytingu"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Þvingar umbreytingu í valið snið"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Þvinga umbreytingu í valið snið. Þegar umbreyting er þvinguð kann það að hafa áhrif á aðrar stillingar í skjástillingu eða HDR-sniði."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Alltaf í SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Alltaf í <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Viltu þvinga HDR-úttakið?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Umbreytingin verður sjálfkrafa þvinguð í <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Skjárinn mun nota 1080p 60 Hz upplausn. Þessi valkostur er ekki samhæfur skjánum hjá þér þegar 4k 60 Hz upplausn er notuð."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision er ekki stutt í núverandi upplausn. Ef þú kveikir handvirkt á Dolby Vision verður upplausn skjásins breytt í 1080p 60 Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Breyta upplausn í 1080p 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Alltaf þvinga skipti yfir í Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Ef slökkt er á Dolby Vision á HDR-sniði í ítarlegum skjástillingum verður kveikt á því aftur ef skipt er yfir í Dolby Vision með þvingun."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Alltaf þvinga skipti yfir í HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Ef slökkt er á HDR10 á HDR-sniði í ítarlegum skjástillingum verður kveikt á því aftur ef skipt er yfir í HDR10 með þvingun."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Alltaf þvinga skipti yfir í HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Ef slökkt er á HLG á HDR-sniði í ítarlegum skjástillingum verður kveikt á því aftur ef skipt er yfir í HLG með þvingun."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Alltaf þvinga skipti yfir í HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Ef slökkt er á HDR10+ á HDR-sniði í ítarlegum skjástillingum verður kveikt á því aftur ef skipt er yfir í HDR10+ með þvingun."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Alltaf þvinga skipti yfir í SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Ef skipt er yfir í SDR með þvingun verður slökkt á öllum sniðum í HDR-sniðum í ítarlegum skjástillingum."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Samræma rammatíðni efnis"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Aðeins snurðulaust"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Snurðulaust"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Tækið þitt mun nota sömu rammatíðni og var upprunalega notuð í efninu sem þú horfir á ef forritið biður um það en AÐEINS ef sjónvarpið ræður við snurðulausar skiptingar."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Skjárinn sem er tengdur styður ekki flettingu með hnökralausri endurnýjunartíðni. Valkosturinn hefur engin áhrif nema þú skiptir yfir í skjá sem styður hana."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Alltaf"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Ekki snurðulaust"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Tækið þitt mun nota sömu rammatíðni og var upprunalega notuð í efninu sem þú horfir á ef forritið biður um það. Þetta gæti valdið því að allt hverfi af skjánum í augnablik þegar þú byrjar eða hættir að spila myndskeið."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Aldrei"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Tækið þitt mun aldrei reyna að nota sömu rammatíðni og var upprunalega notuð í efninu sem þú horfir á, jafnvel þótt forritið biðji um það."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Breyta upplausn í %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Veldu „Í lagi“ til að nota %1$s framvegis."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision er ekki stutt í %1$s og slökkt verður á því í „Ítarlegum skjástillingum“."</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Þessi stilling styður: %1$s\nÍ sumum sjónvörpum þarf hugsanlega að kveikja á HDMI-aukningu til að virkja fleiri HDR-snið. Skoðaðu stillingar sjónvarpsins til að sjá hvort þetta sé stutt."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Þessi stilling styður %1$s. Í sumum sjónvörpum þarf hugsanlega að kveikja á HDMI-aukningu til að virkja fleiri HDR-snið. Skoðaðu stillingar sjónvarpsins til að sjá hvort þetta sé stutt."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Hætta við"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Í lagi"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Hreinsa gögn í skyndiminni?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Þetta eyðir gögnum allra forrita úr skyndiminni."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Þessu tæki er stýrt af fyrirtækinu þínu."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Þessu tæki er stýrt af <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Frekari upplýsingar"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Myndavélarforrit}one{Myndavélarforrit}other{Myndavélarforrit}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Dagatalsforrit"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Staðfestu til að koma í veg fyrir að skjárinn slökkvi á sér í miðju áhorfi, sem getur leitt til meiri orkunotkunar."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Þegar tæki er óvirkt"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Á meðan áhorfi stendur"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Slökkva sjálfkrafa"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Slökkva sjálfkrafa þegar engin virkni greinist"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Slökkva sjálfkrafa þegar verið er að horfa"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Slökkva sjálfkrafa á sjónvarpi"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Slökkva sjálfkrafa á sjónvarpi þegar það er ekki í notkun"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Slökkva sjálfkrafa á sjónvarpi á meðan horft er"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Tímastilling fyrir „Þegar tæki er óvirkt“ þarf að vera styttri en tímastilling fyrir „Á meðan áhorfi stendur“"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Tímastilling fyrir „Á meðan áhorfi stendur“ þarf að vera lengri en tímastilling fyrir „Þegar tæki er óvirkt“"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Takmarka nettengingu í biðstöðu"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Hegðun þegar kveikt er"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Endurstilla"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Ethernet-pörunarkóði"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Orkustillingar"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Bæta orkunotkun þegar sjónvarpið er ekki í notkun"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Virkjar:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Athugaðu að þessi stilling kann að auka orkunotkun tækisins."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Kveikja á „<xliff:g id="ENERGYMODENAME">%s</xliff:g>“"</string>
 </resources>
diff --git a/Settings/res/values-it/energy-modes.xml b/Settings/res/values-it/energy-modes.xml
deleted file mode 100644
index 96c0e04f2..000000000
--- a/Settings/res/values-it/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Funzionalità di rete essenziali"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Basso consumo di energia"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Disattiva la connessione di rete quando la TV non è in uso."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Aggiornamenti e funzionalità critiche"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Funzionalità di rete consigliate"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Consumo di energia ottimizzato"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Attiva le funzionalità che riattivano la TV attraverso la rete (standby in rete)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Inserisci funzionalità 1]"</item>
-    <item msgid="8724721267222341891">"[Inserisci funzionalità 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Altre funzionalità di rete"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Consumo di energia aumentato"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Oltre alle funzionalità consigliate, questa opzione attiva, quando la TV non è in uso, altre funzionalità che possono aumentare il consumo di energia."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Inserisci funzionalità 1]"</item>
-    <item msgid="170760143032597722">"[Inserisci funzionalità 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-it/strings.xml b/Settings/res/values-it/strings.xml
index 74202b00b..2287fb59d 100644
--- a/Settings/res/values-it/strings.xml
+++ b/Settings/res/values-it/strings.xml
@@ -49,7 +49,7 @@
     <string name="accounts_category_summary_no_account" msgid="3053606166993074648">"Nessun account"</string>
     <string name="accounts_category_summary" msgid="7617932110389860822">"{count,plural, =1{# account}other{# account}}"</string>
     <string name="accounts_slice_summary" msgid="1571012157154521119">"Servizi multimediali, Assistente, Pagamenti"</string>
-    <string name="connectivity_network_category_title" msgid="8226264889892008114">"Rete e internet"</string>
+    <string name="connectivity_network_category_title" msgid="8226264889892008114">"Rete e Internet"</string>
     <string name="sound_category_title" msgid="7899816751041939518">"Suono"</string>
     <string name="applications_category_title" msgid="7112019490898586223">"App"</string>
     <string name="device_pref_category_title" msgid="8292572846154873762">"Preferenze del dispositivo"</string>
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Backup e ripristino"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Ripristino dati di fabbrica"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Calibrazione"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Timer spegnimento"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Imposta timer per spegnere la TV e risparmiare energia"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Alimentazione ed energia"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Impostazioni Eco"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Dispositivi"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Selezione dei formati"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Impostazioni audio avanzate"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Consenti modalità di gioco"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Adatta a intervallo dinamico dei contenuti"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Quando attivi questa opzione, il sistema passerà da uno dei diversi formati di intervallo dinamico all\'altro affinché i contenuti corrispondano. Questa operazione potrebbe causare la visualizzazione di una schermata nera durante il passaggio dei formati.\n\nFai clic su Impostazioni display avanzate per altre opzioni di intervallo dinamico."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Intervallo dinamico preferito"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Conversione preferita dal sistema"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Consente al sistema di gestire la conversione del formato"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Se viene selezionata questa opzione, sarà il sistema a stabilire un intervallo dinamico adatto da inviare al display e a convertire i contenuti in questo intervallo, se necessario."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Corrisponde sempre al formato dei contenuti"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Forza conversione"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Forza la conversione nel formato preferito"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Forza la conversione in un formato preferito. Questa impostazione potrebbe incidere su altre impostazioni in Modalità di visualizzazione o Formato HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Sempre in SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Sempre in <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Vuoi forzare l\'output HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Per impostazione predefinita, verrà effettuata la conversione a <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Per il tuo display verrà usata la risoluzione di 1080p a 60 Hz. Questa opzione non è compatibile se per il display viene usata la risoluzione 4K a 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Il formato Dolby Vision non è supportato alla risoluzione attuale. Se attivi il formato Dolby Vision manualmente, la risoluzione del display verrà modificata in 1080p 60Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Vuoi passare alla risoluzione 1080p 60Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Forza sempre la conversione in Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Se l\'opzione Dolby Vision è disattivata nella sezione Formati HDR delle Impostazioni display avanzate e viene forzata la conversione in Dolby Vision, l\'opzione viene riattivata."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Forza sempre la conversione in HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Se l\'opzione HDR10 è disattivata nella sezione Formati HDR delle Impostazioni display avanzate e viene forzata la conversione in HDR10, l\'opzione viene riattivata."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Forza sempre la conversione in HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Se l\'opzione HLG è disattivata nella sezione Formati HDR delle Impostazioni display avanzate e viene forzata la conversione in HLG, l\'opzione viene riattivata."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Forza sempre la conversione in HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Se l\'opzione HDR10+ è disattivata nella sezione Formati HDR delle Impostazioni display avanzate e viene forzata la conversione in HDR10+, l\'opzione viene riattivata."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Forza sempre la conversione in SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Se viene forzata la conversione in SDR, verranno disattivati tutti i formati nella sezione Formati HDR delle Impostazioni display avanzate."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Adatta alla frequenza fotogrammi dei contenuti"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Solo seamless"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Fluida"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Se l\'app lo richiede, l\'output del dispositivo corrisponderà alla frequenza fotogrammi originale dei contenuti che stai guardando, SOLTANTO se la TV può effettuare una transizione fluida."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Il display collegato non supporta le transizioni della frequenza di aggiornamento senza interruzioni. Questa opzione non avrà alcun effetto se non passi a un display che la supporta."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Sempre"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Non fluida"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Se l\'app lo richiede, l\'output del dispositivo corrisponderà alla frequenza fotogrammi originale dei contenuti che stai guardando. Lo schermo potrebbe oscurarsi per un secondo quando attivi o disattivi la riproduzione di un video."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Mai"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Anche se l\'app lo richiede, l\'output del dispositivo non potrà mai corrispondere alla frequenza fotogrammi originale dei contenuti che stai guardando."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Vuoi passare alla risoluzione %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Seleziona OK per usare %1$s d\'ora in poi."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Il formato Dolby Vision non è supportato nella modalità %1$s e verrà disattivato in \"Impostazioni display avanzate\""</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Questa modalità supporta: %1$s\nSu alcune TV, potrebbe essere necessario attivare l\'HDMI avanzato per abilitare più formati HDR. Controlla le impostazioni della TV per verificare se supporta questo formato."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Questa modalità supporta il formato %1$s. Su alcune TV potrebbe essere necessario attivare l\'HDMI avanzato per abilitare più formati HDR. Controlla le impostazioni della TV per verificare se supporta questo standard."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Annulla"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Cancellare i dati memorizzati nella cache?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Ciò cancella tutti i dati delle app nella cache."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Questo dispositivo è gestito dalla tua organizzazione."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Questo dispositivo è gestito da <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Ulteriori informazioni"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{App fotocamera}other{App fotocamera}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"App di calendario"</string>
@@ -475,7 +449,7 @@
     <string name="wifi_connect" msgid="2206086690065242121">"Collega"</string>
     <string name="wifi_forget_network" msgid="4634016112624305571">"Elimina rete"</string>
     <string name="wifi_forget_network_description" msgid="4146715475962713899">"Verranno cancellate le informazioni utilizzate per connettersi alla rete, inclusa la password salvata"</string>
-    <string name="wifi_scan_qr_code_description" msgid="6620444691131671132">" Collegati a una rete Wi-Fi scansionando il codice QR da un telefono cellulare e segui le istruzioni.\n \n Su un "<b>"telefono Android"</b>", vai a Impostazioni -&gt; Rete e internet -&gt; Wi-Fi -&gt; seleziona una rete Wi-Fi -&gt; Avanzate -&gt; Aggiungi dispositivo e scansiona il codice QR."</string>
+    <string name="wifi_scan_qr_code_description" msgid="6620444691131671132">" Collegati a una rete Wi-Fi scansionando il codice QR da un telefono cellulare e segui le istruzioni.\n \n Su un "<b>"telefono Android"</b>", vai a Impostazioni -&gt; Rete e Internet -&gt; Wi-Fi -&gt; seleziona una rete Wi-Fi -&gt; Avanzate -&gt; Aggiungi dispositivo e scansiona il codice QR."</string>
     <string name="wifi_scan_qr_code_back_description" msgid="8830716278283379280">"Premi il pulsante Indietro per annullare"</string>
     <string name="wifi_action_ok" msgid="6257483288047397880">"OK"</string>
     <string name="wifi_setup_action_dont_change_network" msgid="2999582059217623090">"Continua"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Conferma che il display non deve disattivarsi durante la visione di contenuti. Tieni presente che in questo caso potrebbe aumentare il consumo di energia."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Quando inattivo"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Quando attivo"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Disattiva automaticamente"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Disattiva automaticamente durante l\'inattività"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Disattiva automaticamente durante la riproduzione"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Spegni automaticamente la TV"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Spegni automaticamente la TV quando non è attiva"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Spegni automaticamente la TV quando è attiva"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Il timer \"Quando inattivo\" deve avere una durata minore rispetto al timer \"Quando attivo\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Il timer \"Quando attivo\" deve avere una durata maggiore rispetto al timer \"Quando inattivo\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Limita connessione alla rete in standby"</string>
@@ -976,7 +950,7 @@
     <string name="privacy_backup_data" msgid="3604057980102997914">"Backup dei miei dati"</string>
     <string name="privacy_backup_account" msgid="4527813051841860610">"Account di backup"</string>
     <string name="privacy_automatic_restore" msgid="7117805818589418118">"Ripristino automatico"</string>
-    <string name="factory_reset_device" msgid="6509900821515094361">"Resetta dispositivo"</string>
+    <string name="factory_reset_device" msgid="6509900821515094361">"Reimposta dispositivo"</string>
     <string name="factory_reset_description" msgid="6697396335158766785">"Verranno ripristinate le impostazioni predefinite del dispositivo e verranno cancellati tutti i dati, gli account, i file e le app scaricate."</string>
     <string name="factory_reset_info_description" msgid="5098454670833183487">"Verranno ripristinate le impostazioni predefinite del dispositivo e verranno cancellati tutti i dati, gli account, i file e le app scaricate."</string>
     <string name="factory_reset_content_description" msgid="1677022688420116803">"Ripristino dati di fabbrica, Verranno ripristinate le impostazioni predefinite del dispositivo e verranno cancellati tutti i dati, gli account, i file e le app scaricate."</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Comportamento all\'accensione"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Reimposta"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Codice di accoppiamento Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Modalità di energia"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Migliorare l\'efficienza energetica quando la TV non è in uso"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Attiva:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Nota: questa modalità può aumentare il consumo di energia del dispositivo."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Attiva \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/Settings/res/values-iw/energy-modes.xml b/Settings/res/values-iw/energy-modes.xml
deleted file mode 100644
index 003e1fb29..000000000
--- a/Settings/res/values-iw/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"תכונות רשת חיוניות"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"צריכת אנרגיה נמוכה"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"השבתת החיבור לרשת כשהטלוויזיה לא בשימוש."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"עדכונים קריטיים ופונקציות"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"תכונות רשת מומלצות"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"צריכת אנרגיה אופטימלית"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"הפעלת תכונות שמוציאות את הטלוויזיה ממצב שינה באמצעות הרשת (המתנה ברשת)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"תכונות רשת נוספות"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"צריכת אנרגיה מוגברת"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"כשהטלוויזיה לא בשימוש שעשוי להגדיל את צריכת האנרגיה, האפשרות הזו מפעילה עוד תכונות בנוסף לתכונות המומלצות."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-iw/strings.xml b/Settings/res/values-iw/strings.xml
index 86ae1038a..98c5dd3d9 100644
--- a/Settings/res/values-iw/strings.xml
+++ b/Settings/res/values-iw/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"גיבוי ושחזור"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"איפוס לנתוני היצרן"</string>
     <string name="device_calibration" msgid="2907914144048739705">"כיול"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"טיימר לכיבוי"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"הגדרת טיימרים לכיבוי הטלוויזיה ולחיסכון באנרגיה"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"הפעלה ואנרגיה"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"הגדרות חיסכון באנרגיה"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"מכשירים"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"בחירת פורמטים"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"הגדרות צליל מתקדמות"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"הרשאה למצב משחק"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"התאמה לטווח הדינמי של התוכן"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"כשהאפשרות הזו מופעלת, המערכת תעבור בין פורמטים של טווח דינמי בהתאם לתוכן. המעבר עלול לגרום להצגת מסך שחור בזמן שינוי הפורמט.\n\nיש ללחוץ על הגדרות התצוגה המתקדמות כדי לראות אפשרויות נוספות של טווח דינמי."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"טווח דינמי מועדף"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"המרה בהתאם למערכת"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"ההגדרה הזו מאפשרת למערכת לנהל את המרת הפורמט"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"כשבוחרים באפשרות הזו, המערכת תקבע טווח דינמי מתאים שיישלח לתצוגה שלך ותמיר תוכן לטווח הדינמי הזה לפי הצורך."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"תמיד בהתאמה לפורמט של התוכן"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"אילוץ המרה"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"אילוץ המרה לפורמט מועדף"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"אילוץ המרה לפורמט המועדף. אילוץ ההמרה עשוי להשפיע על הגדרות אחרות ב\'מצב תצוגה\' או ב\'פורמט HDR\'."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"תמיד עבור SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"תמיד עבור <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"רוצה לאלץ את פלט ה-HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"כברירת מחדל ההמרה תיאלץ לפעול במצב <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"התצוגה תפעל ברזולוציית 1080p ‏ 60Hz. האפשרות הזו לא תואמת לתצוגה שלך כשהיא פועלת ברזולוציית 4k‏ 60Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision לא נתמך ברזולוציה הנוכחית. אם מפעילים את Dolby Vision באופן ידני, הרזולוציה של המסך משתנה ל-1080p 60Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"לשנות את הרזולוציה ל-1080p 60Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"תמיד לאלץ המרה לפורמט Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"אם התכונה Dolby Vision מושבתת בקטע \'פורמטים של איכות HDR\' בהגדרות התצוגה המתקדמות, אילוץ ההמרה לפורמט Dolby Vision יפעיל את התכונה מחדש."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"תמיד לאלץ המרה לפורמט HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"אם התכונה HDR10 מושבתת בקטע \'פורמטים של איכות HDR\' בהגדרות התצוגה המתקדמות, אילוץ ההמרה לפורמט HDR10 יפעיל את התכונה מחדש."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"תמיד לאלץ המרה לפורמט HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"אם התכונה HLG מושבתת בקטע \'פורמטים של איכות HDR\' בהגדרות התצוגה המתקדמות, אילוץ ההמרה לפורמט HLG יפעיל את התכונה מחדש."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"תמיד לאלץ המרה לפורמט HDR10+‎"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"אם התכונה HDR10+‎ מושבתת בקטע \'פורמטים של איכות HDR\' בהגדרות התצוגה המתקדמות, אילוץ ההמרה לפורמט HDR10+‎ יפעיל את התכונה מחדש."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"תמיד לאלץ המרה לפורמט SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"אילוץ ההמרה לפורמט SDR ישבית את כל הפורמטים בקטע \'פורמטים של איכות HDR\' בהגדרות התצוגה המתקדמות."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"התאמת התוכן לקצב הפריימים"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"שינוי חלק של קצב הפריימים בלבד"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"שינוי חלק של קצב הפריימים"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"המכשיר ישנה את קצב הפריימים של המסך בהתאם לקצב הפריימים המקורי של התוכן בעקבות בקשה של האפליקציה רק אם הטלוויזיה יכולה לבצע את השינוי בצורה חלקה."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"המסך המחובר שלך לא תומך במעברים עם קצב רענון חלק. לאפשרות זו לא תהיה השפעה אלא אם עוברים למסך שתומך בה."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"תמיד"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"שינוי לא-חלק של קצב הפריימים"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"המכשיר ישנה את קצב הפריימים של המסך בהתאם לקצב הפריימים המקורי של התוכן אם האפליקציה תבקש זאת. במקרה כזה, ייתכן שהמסך יואפל לרגע לפני תחילת הסרטון ובסופו."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"אף פעם"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"המכשיר אף פעם לא ינסה לשנות את קצב הפריימים של המסך כדי להתאים אותו לקצב הפריימים המקורי של התוכן, גם אם האפליקציה תבקש זאת."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"לשנות את הרזולוציה ל-%1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"בוחרים באפשרות \'אישור\' כדי להשתמש ברזולוציה %1$s מעכשיו והלאה."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision לא נתמך ב-%1$s. ניתן להשבית אותו בהגדרות התצוגה המתקדמות"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"המצב הזה תומך ב: %1$s‏\nבחלק מהטלוויזיות ניתן להפעיל HDMI משופר כדי לאפשר הפעלה של עוד פורמטים של איכות HDR. כדאי לבדוק אם התכונה הזו נתמכת בהגדרות של הטלוויזיה."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"המצב הזה תומך ב-%1$s. בחלק מהטלוויזיות ניתן להפעיל HDMI משופר כדי לאפשר הפעלה של עוד פורמטים של איכות HDR. כדאי לבדוק אם התכונה הזו נתמכת בהגדרות של הטלוויזיה."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"ביטול"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"אישור"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"הרץ (Hz)"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ‏(<xliff:g id="REFRESH_RATE">%2$s</xliff:g> הרץ)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ‏(<xliff:g id="REFRESH_RATE">%2$s</xliff:g> הרץ)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"האם לנקות נתונים בקובץ שמור?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"פעולה זו תנקה נתונים בקובץ שמור, לכל האפליקציות."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"מכשיר זה מנוהל על ידי הארגון שלך."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"מכשיר זה מנוהל על ידי <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ."</string>
     <string name="learn_more" msgid="820336467414665686">"מידע נוסף"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{אפליקציית מצלמה}one{אפליקציות מצלמה}two{אפליקציות מצלמה}other{אפליקציות מצלמה}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"אפליקציית יומן"</string>
@@ -696,7 +670,7 @@
     <string name="palette_color_purple" msgid="2123828754639683555">"סגול"</string>
     <string name="palette_color_gray" msgid="4014534773994261194">"אפור"</string>
     <string name="accessibility_shortcut" msgid="5856158637840030531">"קיצור דרך לנגישות"</string>
-    <string name="accessibility_shortcut_enable" msgid="6603542432267329986">"הפעלת קיצור הדרך לנגישות"</string>
+    <string name="accessibility_shortcut_enable" msgid="6603542432267329986">"הפעל את קיצור הדרך לנגישות"</string>
     <string name="accessibility_shortcut_service" msgid="2053250146891420311">"שירות קיצורי הדרך"</string>
     <string name="accessibility_shortcut_description" msgid="2050424178481510046">"כאשר קיצור הדרך מופעל, ניתן ללחוץ בו זמנית על הלחצן \'הקודם\' ועל החץ למטה למשך שלוש שניות כדי להפעיל תכונת נגישות."</string>
     <string name="accessibility_captions" msgid="3411554568812306549">"כתוביות"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"להשבית את כיבוי המסך בזמן הצפייה? השארת המסך דלוק עלולה לגרום לצריכת אנרגיה מוגברת."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"כשאין פעילות"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"בזמן הצפייה"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"כיבוי אוטומטי"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"כיבוי אוטומטי כשאין פעילות"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"כיבוי אוטומטי בזמן הצפייה"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"כיבוי אוטומטי של הטלוויזיה"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"כיבוי אוטומטי של הטלוויזיה כשאין פעילות"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"כיבוי אוטומטי של הטלוויזיה בזמן הצפייה"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"משך הזמן שמוגדר בטיימר \'כשאין פעילות\' צריך להיות קצר יותר ממשך הזמן שמוגדר בטיימר \'בזמן הצפייה\'"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"משך הזמן שמוגדר בטיימר \'בזמן הצפייה\' צריך להיות ארוך יותר ממשך הזמן שמוגדר בטיימר \'כשאין פעילות\'"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"הגבלת החיבור לרשת במצב המתנה"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"התנהגות בהפעלה"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"איפוס"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"קוד התאמה לאתרנט"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"מצבי אנרגיה"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"שיפור החיסכון באנרגיה כשהטלוויזיה לא בשימוש"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"תכונות מופעלות:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"יש לשים לב שהמצב הזה עשוי להגדיל את צריכת החשמל של המכשיר."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"הפעלת מצב \'<xliff:g id="ENERGYMODENAME">%s</xliff:g>\'"</string>
 </resources>
diff --git a/Settings/res/values-ja/energy-modes.xml b/Settings/res/values-ja/energy-modes.xml
deleted file mode 100644
index e62636214..000000000
--- a/Settings/res/values-ja/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"必須のネットワーク機能"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"少ないエネルギー使用量"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"テレビを使用していないときにネットワーク接続を無効にします。"</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"重要なアップデートと機能"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"おすすめのネットワーク機能"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"最適化されたエネルギー使用量"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ネットワーク経由でテレビを起動する機能を有効にします（ネットワーク スタンバイ）。"</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[機能 1 を挿入]"</item>
-    <item msgid="8724721267222341891">"[機能 2 を挿入]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"追加のネットワーク機能"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"増加したエネルギー使用量"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"このオプションでは、テレビを使用していないときに、おすすめの機能に加えて追加機能も有効になります（エネルギー使用量が増える場合があります）。"</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[機能 1 を挿入]"</item>
-    <item msgid="170760143032597722">"[機能 2 を挿入]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-ja/strings.xml b/Settings/res/values-ja/strings.xml
index f321ebdae..40881d650 100644
--- a/Settings/res/values-ja/strings.xml
+++ b/Settings/res/values-ja/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"バックアップと復元"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"データの初期化"</string>
     <string name="device_calibration" msgid="2907914144048739705">"キャリブレーション"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"シャットダウン タイマー"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"テレビの電源を切るタイマーを設定し、節電します"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"電源と省エネ設定"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"エコ設定"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"デバイス"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"形式の選択"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"音の詳細設定"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"ゲームモードを有効にする"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"コンテンツのダイナミック レンジと一致"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"このオプションを有効にすると、コンテンツに合わせてダイナミック レンジの形式が切り替わります。切り替え中に画面が黒くなることがあります。\n\nその他のダイナミック レンジ オプションを設定するには、[ディスプレイの詳細設定] をクリックしてください。"</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"優先されるダイナミック レンジ"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"システム設定の変換"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"形式の変換を自動で管理できます"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"このオプションを選択すると、ディスプレイに送信する適切なダイナミック レンジが自動的に判断され、必要に応じてそのダイナミック レンジにコンテンツが変換されます。"</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"コンテンツの形式と常に一致します"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"強制変換"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"ご希望の形式に強制変換されます"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"ご希望の形式に強制変換されます。強制変換は、表示モードや HDR 形式のその他の設定に影響することがあります。"</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"常に SDR に変換する"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"常に <xliff:g id="HDR_TYPE">%s</xliff:g> に変換する"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"HDR 出力に強制しますか？"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"デフォルトでは、<xliff:g id="HDR_TYPE">%s</xliff:g>に強制変換されます。"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"ディスプレイの解像度は 1080p 60Hz になります。このオプションは、解像度が 4K 60Hz のディスプレイには対応していません。"</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"ドルビー ビジョンは現在の解像度ではサポートされていません。ドルビー ビジョンを手動で有効にした場合、ディスプレイの解像度が 1080p 60 Hz に変更されます"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"解像度を 1080p 60 Hz に変更しますか？"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"常にドルビー ビジョンに強制変換する"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"[ディスプレイの詳細設定] で HDR 形式のドルビー ビジョンが無効になっている場合、ドルビー ビジョンに強制変換すると、ドルビー ビジョンが有効になります。"</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"常に HDR10 に強制変換する"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"[ディスプレイの詳細設定] で HDR 形式の HDR10 が無効になっている場合、HDR10 に強制変換すると、HDR10 が有効になります。"</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"常に HLG に強制変換する"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"[ディスプレイの詳細設定] で HDR 形式の HLG が無効になっている場合、HLG に強制変換すると、HLG が有効になります。"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"常に HDR10+ に強制変換する"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"[ディスプレイの詳細設定] で HDR 形式の HDR10+ が無効になっている場合、HDR10+ に強制変換すると、HDR10+ が有効になります。"</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"常に SDR に強制変換する"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"SDR に強制変換すると、[ディスプレイの詳細設定] で HDR 形式のすべての形式が無効になります。"</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"コンテンツのフレームレートを合わせる"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"シームレスのみ"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"シームレス"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"視聴中のテレビでシームレスな移行が可能である場合に限り、アプリからリクエストがあった場合、デバイスは、再生しているコンテンツのオリジナルのフレームレートに出力を合わせます。"</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"接続済みのディスプレイがリフレッシュ レートのシームレスな移行をサポートしていません。対応のディスプレイに変更しない限り、このオプションは機能しません。"</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"常時"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"非シームレス"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"アプリからリクエストがあった場合、デバイスは、再生しているコンテンツのオリジナルのフレームレートに出力を合わせます。そのため、動画再生の開始時または終了時に画面が一瞬空白になる場合があります。"</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"なし"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"アプリからリクエストがあっても、デバイスでは、再生しているコンテンツのオリジナルのフレームレートに出力を合わせることはありません。"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"解像度を %1$s に変更しますか？"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"これから %1$s を使用するには、[OK] を選択してください。"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"ドルビー ビジョンは %1$s ではサポートされていないため、[ディスプレイの詳細設定] で無効になります"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"このモードは以下をサポートしています: %1$s\nテレビによっては、拡張 HDMI を ON にして他の HDR 形式を有効にする必要があります。テレビの設定で、この機能に対応しているかどうかをご確認ください。"</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"このモードは %1$s をサポートしています。テレビによっては、拡張 HDMI を ON にして他の HDR 形式を有効にする必要があります。テレビの設定で、この機能に対応しているかどうかをご確認ください。"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"キャンセル"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g>（<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz）"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g>（<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz）"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"キャッシュデータを削除しますか？"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"すべてのアプリのキャッシュデータが削除されます。"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"このデバイスは組織によって管理されています。"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"このデバイスは <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> により管理されています。"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">"、"</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"詳細"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{カメラアプリ}other{カメラアプリ}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"カレンダー アプリ"</string>
@@ -894,7 +868,7 @@
     <string name="restricted_profile_delete_title" msgid="7153982195273379506">"制限付きプロファイルを削除"</string>
     <string name="restricted_profile_create_title" msgid="700322590579894058">"制限付きプロファイルの作成"</string>
     <string name="restricted_profile_configure_title" msgid="3327502517511010296">"設定"</string>
-    <string name="restricted_profile_configure_apps_title" msgid="2244201859522056827">"許可されているアプリ"</string>
+    <string name="restricted_profile_configure_apps_title" msgid="2244201859522056827">"許可されたアプリ"</string>
     <string name="restricted_profile_allowed" msgid="970921490464867884">"許可済み"</string>
     <string name="restricted_profile_not_allowed" msgid="8184983064118036268">"許可しない"</string>
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"制限をカスタマイズ"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"エネルギーの使用が増える可能性あがるため、再生中にディスプレイがオフにならないよう、設定をご確認ください。"</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"動作していないとき"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"視聴しているとき"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"自動的に OFF にする"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"動作していないときに自動的に OFF にする"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"再生時に自動的に OFF にする"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"テレビを自動的に OFF にする"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"使用していないときにテレビを自動的に OFF にする"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"視聴時にテレビを自動的に OFF にする"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"[動作していないとき] タイマーは [視聴しているとき] タイマーより短くしてください"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"[視聴しているとき] タイマーは [動作していないとき] タイマーより長くしてください"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"スタンバイ時のネットワーク接続を制限"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"電源オン時の画面"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"リセット"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"イーサネット ペア設定コード"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"エネルギー モード"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"テレビを使用していないときにエネルギー効率を向上させます"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"有効になる機能:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"このモードにより、デバイスの電力消費量が増える場合があります。"</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"「<xliff:g id="ENERGYMODENAME">%s</xliff:g>」の有効化"</string>
 </resources>
diff --git a/Settings/res/values-ka/energy-modes.xml b/Settings/res/values-ka/energy-modes.xml
deleted file mode 100644
index 3ea534a97..000000000
--- a/Settings/res/values-ka/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"ქსელის ძირითადი ფუნქციები"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ენერგიის მცირე მოხმარება"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"გამორთეთ ქსელთან კავშირი, როცა ტელევიზორი არ გამოიყენება."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"კრიტიკული განახლებები და ფუნქციები"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"ქსელის რეკომენდებული ფუნქციები"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ენერგიის ოპტიმალური გამოყენება"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ჩართავს ფუნქციებს, რაც გამოაღვიძებს ტელევიზორს სხვა ქსელზე (ქსელი მოლოდინის რეჟიმში)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[ფუნქცია 1-ის ჩასმა]"</item>
-    <item msgid="8724721267222341891">"[ფუნქცია 2-ის ჩასმა]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"ქსელის დამატებითი ფუნქციები"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"ენერგიის გაზრდილი მოხმარება"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"რეკომენდებული ფუნქციების გარდა ეს ვარიანტი ჩართავს დამატებით ფუნქციებს, როცა ტელევიზორი არ გამოიყენება, რამაც შესაძლოა გაზარდოს ენერგიის მოხმარება."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[ფუნქცია 1-ის ჩასმა]"</item>
-    <item msgid="170760143032597722">"[ფუნქცია 2-ის ჩასმა]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-ka/strings.xml b/Settings/res/values-ka/strings.xml
index bdaa0d6fe..73836c899 100644
--- a/Settings/res/values-ka/strings.xml
+++ b/Settings/res/values-ka/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"დარეზერვება და აღდგენა"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"ქარხნული მონაცემების აღდგენა"</string>
     <string name="device_calibration" msgid="2907914144048739705">"კალიბრაცია"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"გამორთვის ტაიმერი"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"დააყენეთ ტაიმერები ტელევიზორის გამორთვის და ენერგიის დაზოგვისთვის"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"დენი და ენერგია"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"ეკო პარამეტრები"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"მოწყობილობები"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"აირჩიეთ ფორმატები"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"ხმის გაფართოებული პარამეტრები"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"თამაშის რეჟიმის დაშვება"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"კონტენტის დინამიკური დიაპაზონის დამთხვევა"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"ამ პარამეტრის ჩართვისას, სისტემა გადაერთვება სხვადასხვა დინამიკური დიაპაზონის ფორმატებს შორის, რათა შეესაბამებოდეს შინაარსს. ეს შეიძლება გამოწვეული იყოს შავი ეკრანი ფორმატის გადართვის დროს.\n\nმეტი დინამიკური დიაპაზონის ვარიანტებისთვის, დააწკაპუნეთ ეკრანის გაფართოებულ პარამეტრებზე."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"სასურველი დინამიკური დიაპაზონი"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"სისტემის უპირატესი გარდაქმნა"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"სისტემამ მართოს ფორმატის გარდაქმნა"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"როცა ეს პარამეტრია მონიშნული, სისტემა გადაწყვეტს ეკრანისთვის გასაგზავნ შესაბამის დინამიკურ დიაპაზონს და საჭიროებისამებრ გარდაქმნის კონტენტს."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"ყოველთვის დაემთხვეს კონტენტის ფორმატს"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"იძულებით გარდაქმნა"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"აიძულებს გარჩევადობის გარდაქმნას უპირატეს ფორმატში"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"აიძულებს გარჩევადობის გარდაქმნას უპირატეს ფორმატში. გარჩევადობის იძულებით გარდაქმნამ შესაძლოა იმოქმედოს ჩვენების რეჟიმის ან HDR ფორმატის სხვა პარამეტრებზე."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"ყოველთვის SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"ყოველთვის <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"გსურთ, მაინც იყოს გამომავალი სიგნალი HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"ნაგულისხმევად, გარჩევადობის შეცვლა სავალდებულოდ მოხდება <xliff:g id="HDR_TYPE">%s</xliff:g>-ზე."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"თქვენი ეკრანი იმუშავებს 1080p 60Hz გარჩევადობით. ეს ვარიანტი არ არის თავსებადი თქვენს ეკრანთან, რომელიც მუშაობს 4k 60Hz გარჩევადობით."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision არ არის მხარდაჭერილი მიმდინარე გარჩევადობით. თუ Dolby Vision-ს ხელით ჩართავთ, თქვენი ეკრანის გარჩევადობა შეიცვლება 1080p-დან 60Hz-ზე"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"რეზოლუციის შეცვლა 1080p-დან 60Hz-ზე?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"ყოველთვის განხორციელდეს კონვერსიის ფორსირება Dolby Vision-ზე"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"თუ Dolby Vision გამორთულია HDR ფორმატებში ეკრანის გაფართოებულ პარამეტრებში, Dolby Vision-ზე კონვერსიის ფორსირებით, ხელახლა ჩაირთვება."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"ყოველთვის განხორციელდეს კონვერსიის ფორსირება HDR10-ზე"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"თუ HDR10 გამორთულია HDR ფორმატებში ეკრანის გაფართოებულ პარამეტრებში, კონვერსიის HDR10-ზე ფორსირებით ხელახლა ჩაირთვება."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"ყოველთვის განხორციელდეს კონვერსიის ფორსირება HLG-ზე"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"თუ HLG გამორთულია HDR ფორმატებში ეკრანის გაფართოებულ პარამეტრებში, კონვერსიის HLG-ზე ფორსირებით ხელახლა ჩაირთვება."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"ყოველთვის განხორციელდეს კონვერსიის ფორსირება HDR10+-ზე"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"თუ HDR10+ გამორთულია HDR ფორმატებში ეკრანის გაფართოებულ პარამეტრებში, კონვერსიის HDR10+-ზე ფორსირებით ხელახლა ჩაირთვება."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"ყოველთვის განხორციელდეს კონვერსიის ფორსირება SDR-ზე"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"HLG-ზე ფორსირებით გამოირთვება HDR ფორმატების ყველა ფორმატი ეკრანის გაფართოებულ პარამეტრებში."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"კონტენტის კადრების სიჩქარესთან შესაბამისობა"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"მხოლოდ დაუბრკოლებელი"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"დაუბრკოლებელი"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"თუ აპი ამას მოითხოვს, თქვენი მოწყობილობა დაამთხვევს თავის გამოსავალს იმ კონტენტის კადრების ორიგინალურ სიჩქარეს, რომელსაც უყურებთ, მხოლოდ იმ შემთხვევაში, თუ თქვენს ტელევიზორს დაუბრკოლებლად გადასვლა შეუძლია."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"თქვენი დაკავშირებული ეკრანი არ უჭერს მხარს განახლების სიხშირის მდოვრე გადასვლას. ეს ვარიანტი არანაირ გავლენას მოახდენს, თუ ისეთი ეკრანით არ ჩაანაცვლებთ, რომელიც მხარს უჭერს ამას."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"ყოველთვის"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"არადაუბრკოლებელი"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"თუ აპი ამას მოითხოვს, თქვენი მოწყობილობა დაამთხვევს თავის გამოსავალს იმ კონტენტის კადრების ორიგინალურ სიჩქარეს, რომელსაც უყურებთ. ამის გამო, შეიძლება, ვიდეოს დაკვრის დაწყებისას ან გათიშვისას ეკრანზე ერთი წამით ყველაფერი გაქრეს."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"არასოდეს"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"თუნდაც აპი ითხოვდეს ამას, თქვენი მოწყობილობა არასოდეს შეეცდება თავისი გამოსავლის დამთხვევას იმ კონტენტის კადრების ორიგინალურ სიჩქარესთან, რომელსაც უყურებთ."</string>
@@ -215,14 +188,14 @@
     <string name="resolution_selection_title" msgid="2873993320284587853">"გარჩევადობა"</string>
     <string name="resolution_selection_auto_title" msgid="4738671207331027385">"ავტომატური"</string>
     <string name="resolution_selection_dialog_title" msgid="4029798035133645272">"გარჩევადობა შეიცვალა"</string>
-    <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"გსურთ, შეიცვალოს გარჩევადობა და გახდეს %1$s?"</string>
-    <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"თუ გსურთ, ამიერიდან გამოიყენოთ %1$s, აირჩიეთ „კარგი“."</string>
-    <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision-ს არ აქვს მხარდაჭერა %1$s გარჩევადობაში და გაითიშება „ეკრანის დამატებითი პარამეტრებიდან“"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"ამ რეჟიმით მხარდაჭერილია: %1$s\nზოგიერთ ტელევიზორზე შესაძლოა დაგჭირდეთ გაძლიერებული HDMI-ის ჩართვა, მეტი HDR ფორმატის ჩასართავად. ამისთვის შეამოწმეთ თქვენი ტელევიზორის პარამეტრები."</string>
+    <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"გსურთ გარჩევადობის %1$s-ით შეცვლა?"</string>
+    <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"ამიერიდან %1$s-ის გამოსაყენებლად აირჩიეთ „კარგი“."</string>
+    <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision-ს არ აქვს მხარდაჭერა %1$s-ში და გაითიშება „ეკრანის დამატებითი პარამეტრებიდან“"</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"ეს რეჟიმი მხარს უჭერს %1$s-ს. სხვა HDR ფორმატების ჩასართავად, ზოგ ტელევიზორზე შეიძლება დაგჭირდეთ გაძლიერებული HDMI-ს გააქტიურება. ამისთვის შეამოწმეთ თქვენი ტელევიზორის პარამეტრები."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"გაუქმება"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"კარგი"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"ჰც"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> ჰც)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> ჰც)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"წაიშალოს ქეშირებული მონაცემები?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"წაიშლება ქეშირებული მონაცემები ყველა აპისთვის."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"ამ მოწყობილობას მართავს თქვენი ორგანიზაცია."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"ამ მოწყობილობას მართავს <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"შეიტყვეთ მეტი"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{კამერის აპი}other{კამერის აპები}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"კალენდრის აპი"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"დაადასტურეთ, რათა თავიდან აიცილოთ ეკრანის გამორთვა ყურების პროცესში, რაც პოტენციურად ენერგიის მოხმარების გაზრდას იწვევს."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"უმოქმედობისას"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"ყურებისას"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"ავტომატურად გამორთვა"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"ავტომატურად გამორთვა უმოქმედობისას"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"ავტომატური გამორთვა ყურებისას"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"ტელევიზორის ავტომატურად გამორთვა"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"ტელევიზორის ავტომატურად გამორთვა, როდესაც არ არის აქტიური"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"ტელევიზორის ავტომატურად გამორთვა ყურებისას"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"„არააქტივობის“ ტაიმერი უფრო ხანმოკლე უნდა იყოს, ვიდრე „ყურებისას“ ტაიმერი"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"„ყურებისას“ ტაიმერი უფრო ხანგრძლივი უნდა იყოს, ვიდრე „არააქტივობის“ ტაიმერი"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"შეზღუდეთ ქსელთან კავშირი მოლოდინის რეჟიმში"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"ქცევა ჩართვისას"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"გადაყენება"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Ethernet-ის დაკავშირების კოდი"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"ენერგიის რეჟიმები"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"ენერგიის ეფექტურობის გაუმჯობესება, როცა ტელევიზორი არ გამოიყენება"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"ჩაირთვება:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"გახსოვდეთ, რომ ამ რეჟიმმა შესაძლოა გაზარდოს ელექტროენერგიის მოხმარება."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"ჩაირთოს „<xliff:g id="ENERGYMODENAME">%s</xliff:g>“?"</string>
 </resources>
diff --git a/Settings/res/values-kk/energy-modes.xml b/Settings/res/values-kk/energy-modes.xml
deleted file mode 100644
index fa2a4cc76..000000000
--- a/Settings/res/values-kk/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Негізгі желі функциялары"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Аз энергия тұтыну режимі"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Теледидар пайдаланылмаған кезде, желі байланысын ажыратыңыз."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Аса маңызды жаңартулар мен функциялар"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Ұсынылатын желі функциялары"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Энергияны оңтайлы пайдалану режимі"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Теледидарды желі арқылы оятатын функцияларды қосады (желілік күту режимі)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Қосымша желі функциялары"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Жоғары энергия тұтыну режимі"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Ұсынылған функциялардан басқа, бұл опция теледидар пайдаланылмаған кезде қосымша функцияларды қосады және бұл энергия тұтыну деңгейін арттыруы мүмкін."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-kk/strings.xml b/Settings/res/values-kk/strings.xml
index f69938bc9..70df7a6d4 100644
--- a/Settings/res/values-kk/strings.xml
+++ b/Settings/res/values-kk/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Сақтық көшірме жасау және қалпына келтіру"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Зауыттық деректерді қалпына келтіру"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Калибрлеу"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Өшіру таймері"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Теледидарды өшіру және энергияны үнемдеу үшін таймерлер орнату."</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Қуат және энергия"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Eco параметрлері"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Құрылғылар"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Форматтарды таңдау"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Қосымша дыбыс параметрлері"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Ойын режиміне рұқсат ету"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Контенттің динамикалық ауқымын сәйкестендіру"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Бұл опция таңдалғанда, жүйе контентпен сәйкестену үшін әр түрлі динамикалық ауқым форматтары арасында ауысады. Формат ауысқанда, қара экран қосылуы мүмкін.\n\nДинамикалық ауқымның толық опцияларын қарау үшін дисплейдің қосымша параметрлеріне өтіңіз."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Қажетті динамикалық ауқым"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Жүйеге қолайлы конверсия"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Жүйенің формат конверсиясын басқаруына жол беру"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Осы опция таңдалған кезде жүйе дисплейге жіберілетін аралықты анықтайды және керек жағдайда мазмұнды осы динамикалық аралықта түрлендіреді"</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Әрқашан мазмұнның форматына сәйкес келеді"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Мәжбүрлі конверсия"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Қолайлы форматты мәжбүрлі конверсиялау"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Қолайлы форматты мәжбүрлі конверсиялау Конверсяны мәжбүрлеу Display Mode немесе HDR фарматындағы басқа параметрлерге әсер етуі мүмкін"</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Әрқашан SDR-да"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Әрқашан <xliff:g id="HDR_TYPE">%s</xliff:g>-те"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"HDR шығысын мәжбүрлі түрде алғыңыз келе ме?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Әдепкі бойынша конверсия <xliff:g id="HDR_TYPE">%s</xliff:g> түрлендіруге мәжбүр болады."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Сіздің дисплейіңіз 1080p 60Hz ажыратымдылығында жұмыс жасайды. Бұл опция 4k 60Hz ажыратымдылығында жұмыс жасаған кезде дисплейніңізбен үйлесімді болмайды."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision қазіргі ажыратымдылықта қолжетімді емес. Егер сіз Dolby Vision форматын қолмен қоссаңыз, дисплейдің ажыратымдылығы 1080p 60 Гц өлшеміне дейін өзгереді."</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Ажыратымдылықты 1080p 60 Гц өлшеміне дейін өзгерту қажет пе?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Dolby Vision форматына әрқашан күштеп түрлендіру"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Егер Dolby Vision форматы кеңейтілген дисплей параметрлеріндегі HDR форматтарында өшірілген болса, Dolby Vision форматына күштеп түрлендіру оны қайта қосады."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"HDR10 форматына әрқашан күштеп түрлендіру"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Егер HDR10 форматы кеңейтілген дисплей параметрлеріндегі HDR форматтарында өшірілген болса, HDR10 форматына күштеп түрлендіру оны қайта қосады."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"HLG форматына әрқашан күштеп түрлендіру"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Егер HLG форматы кеңейтілген дисплей параметрлеріндегі HDR форматтарында өшірілген болса, HLG форматына күштеп түрлендіру оны қайта қосады."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"HDR10+ форматына әрқашан күштеп түрлендіру"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Егер HDR10+ форматы кеңейтілген дисплей параметрлеріндегі HDR форматтарында өшірілген болса, HDR10+ форматына күштеп түрлендіру оны қайта қосады."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"SDR форматына әрқашан күштеп түрлендіру"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"SDR форматына күштеп түрлендіру кеңейтілген дисплей параметрлеріндегі HDR форматтарындағы барлық форматты өшіреді."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Контенттің кадр жиілігін сәйкестендіру"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Тек үзіліссіз"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Үздіксіз"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Теледидарыңыз үздіксіз тасымалдай алған жағдайда ҒАНА, қолданба сұраған кезде, құрылғыңыз өзінің шығыс кадр жиілігін көріп жатқан мазмұныңыздың түпнұсқа кадр жиілігіне сәйкестендіреді."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Жалғанған дисплейде жаңарту жиілігін біртіндеп өзгерту қарастырылмаған. Мұндай опция қолжетімді дисплейге ауыспайынша, ол қолданылмайды."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Әрқашан"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Кідіріспен"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Қолданба сұраған жағдайда, құрылғыңыз өзінің шығыс кадр жиілігін көріп жатқан мазмұныңыздың түпнұсқа кадр жиілігіне сәйкестендіреді. Мұндайда бейнені ойнату режимінен шығу немесе оған кіру кезінде экраныңыз бір сәтке өшіп қалуы мүмкін."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Ешқашан"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Тіпті қолданба сұраған жағдайда да, құрылғыңыз ешқашан өзінің шығыс кадр жиілігін көріп жатқан мазмұныңыздың түпнұсқа кадр жиілігіне сәйкестендіруге талпынбайды."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Ажыратымдылықты %1$s дейін өзгерту қажет пе?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Қазірден бастап %1$s рұқсатын пайдалану үшін \"Жарайды\" түймесін басыңыз."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision %1$s кезінде қолжетімді емес. Ол \"Дисплейдің қосымша параметрлерінде\" өшіріледі."</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Бұл режимнің ажыратымдылығы - %1$s.\nHDR форматының басқа да түрлерін қосу үшін кейбір теледидар параметрлерінен жақсартылған HDMI қосу қажет болуы мүмкін. Бұл опцияның қолжетімділігін тексеру үшін теледидарыңыздың параметрлерін қараңыз."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Бұл режим %1$s қолдайды. Көбірек HDR форматтарын пайдалану үшін кейбір теледидарларда күшейтілген HDMI қажет болуы мүмкін. Бұл опцияның қолжетімділігін тексеру үшін теледидарыңыздың параметрлерін қараңыз."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Бас тарту"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Жарайды"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Гц"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Гц)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Гц)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Кэштелген деректер өшірілсін бе?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Бұл барлық қолданбалардың кэштелген деректерін тазартады."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Бұл құрылғыны ұйым басқарады."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Бұл құрылғыны <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> басқарады."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Толығырақ"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Камера қолданбасы}other{Камера қолданбалары}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Күнтізбе қолданбасы"</string>
@@ -447,7 +421,7 @@
     <string name="wifi_security_type_wep" msgid="6407712450924151962">"WEP"</string>
     <string name="wifi_security_type_wpa" msgid="9205358644485448199">"WPA/WPA2 PSK"</string>
     <string name="wifi_security_type_eap" msgid="3948280751219829163">"802.1x EAP"</string>
-    <string name="title_wifi_no_networks_available" msgid="3696700321170616981">"Ізделіп жатыр…"</string>
+    <string name="title_wifi_no_networks_available" msgid="3696700321170616981">"Ізделуде…"</string>
     <string name="title_wifi_could_not_save" msgid="7549912968719395764">"<xliff:g id="SSID">%1$s</xliff:g> үшін конфигурацияны сақтау мүмкін болмады"</string>
     <string name="title_wifi_could_not_connect" msgid="6654031057635481872">"<xliff:g id="SSID">%1$s</xliff:g> желісіне қосылу мүмкін болмады"</string>
     <string name="title_wifi_could_not_connect_timeout" msgid="7825788623604214601">"<xliff:g id="SSID">%1$s</xliff:g> табу мүмкін болмады"</string>
@@ -736,7 +710,7 @@
     <string name="color_cyan" msgid="3172130225116530998">"Көкшіл"</string>
     <string name="color_yellow" msgid="3519470952904560404">"Сары"</string>
     <string name="color_magenta" msgid="2377854703399624607">"Қызылкүрең"</string>
-    <string name="accessibility_toggle_audio_description_preference_title" msgid="933923296129403548">"Аудиосипаттама"</string>
+    <string name="accessibility_toggle_audio_description_preference_title" msgid="933923296129403548">"Аудио сипаттама"</string>
     <string name="accessibility_audio_description_summary" msgid="2027813223650517036">"Қолдау көрсетілетін фильмдер мен сериалдарда экрандағы әрекеттің аудио сипаттамасын есту"</string>
     <string name="system_accessibility_status" msgid="8504842254080682515">"Қосу"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Конфигурация"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Көру кезінде дисплейдің өшірілмеуін растаңыз (мұндайда қуат шығыны артуы мүмкін)."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Ешқандай әрекет болмағанда"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Көріп жатқанда"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Автоматты сөну"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Белсенді емес кезде автоматты сөну"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Қарау кезінде автоматты сөну"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Теледидарды автоматты түрде өшіру"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Теледидар пайдаланылмаған кезде автоматты түрде өшіру"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Теледидарды көрген кезде автоматты түрде өшіру"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"Теледидар өшірулі\" таймері \"теледидар қосулы\" таймерінен қысқа болуы керек"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"Теледидар қосулы\" таймері \"теледидар өшірулі\" таймерінен ұзағырақ болуы керек"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Күту режимінде желі байланысын шектеу"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Қосылу кезіндегі әрекет"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Қайтару"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Ethernet жұптау коды"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Энергия режимдері"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Теледидар пайдаланылмаған кезде энергияның тиімдірек қолданылуын қамтамасыз етіңіз"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Келесілер қосылады:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Бұл режим құрылғының қуат тұтынуын арттыруы мүмкін екенін ескеріңіз."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" режимін қосу"</string>
 </resources>
diff --git a/Settings/res/values-km/energy-modes.xml b/Settings/res/values-km/energy-modes.xml
deleted file mode 100644
index 999b4af53..000000000
--- a/Settings/res/values-km/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"មុខងារបណ្ដាញចាំបាច់"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ការប្រើប្រាស់ថាមពលទាប"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"បិទការតភ្ជាប់បណ្ដាញ នៅពេលមិនប្រើទូរទស្សន៍។"</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"ការដំឡើងកំណែ និងមុខងារសំខាន់ខ្លាំង"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"មុខងារបណ្ដាញដែលបានណែនាំ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ការប្រើប្រាស់ថាមពលដែលបានបង្កើនប្រសិទ្ធភាព"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"បើកមុខងារដែលដាស់ទូរទស្សន៍តាមបណ្ដាញ (សម្ងំលើបណ្ដាញ)។"</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[បញ្ចូលមុខងារទី 1]"</item>
-    <item msgid="8724721267222341891">"[បញ្ចូលមុខងារទី 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"មុខងារបណ្ដាញបន្ថែម"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"ការប្រើប្រាស់ថាមពលកើនឡើង"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"បន្ថែមលើមុខងារដែលបានណែនាំ ជម្រើសនេះបើកមុខងារបន្ថែមនៅពេលមិនប្រើទូរទស្សន៍ ដែលអាចបង្កើនការប្រើប្រាស់ថាមពល។"</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[បញ្ចូលមុខងារទី 1]"</item>
-    <item msgid="170760143032597722">"[បញ្ចូលមុខងារទី 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-km/strings.xml b/Settings/res/values-km/strings.xml
index ab8fc8595..4c03ed0ba 100644
--- a/Settings/res/values-km/strings.xml
+++ b/Settings/res/values-km/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"បម្រុងទុក និងស្ដារ"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"កំណត់ទិន្នន័យដូចចេញពីរោងចក្រ"</string>
     <string name="device_calibration" msgid="2907914144048739705">"ការក្រិតតាមខ្នាត"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"កម្មវិធីកំណត់ម៉ោងដែលបិទ"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"កំណត់កម្មវិធីកំណត់ម៉ោង ដើម្បីបិទទូរទស្សន៍ និងសន្សំសំចៃថាមពល"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"កម្លាំង និងថាមពល"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"ការកំណត់អេកូ"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"ឧបករណ៍"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"ជ្រើសរើសទម្រង់"</string>
@@ -151,41 +151,14 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"ការកំណត់សំឡេងកម្រិតខ្ពស់"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"អនុញ្ញាតមុខងារហ្គេម"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"ផ្គូផ្គងកម្រិតឌីណាមិកខ្លឹមសារ"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"នៅពេលបើកជម្រើសនេះ ប្រព័ន្ធនឹងប្ដូររវាងទម្រង់កម្រិតឌីណាមិកផ្សេងៗ ដើម្បីឱ្យត្រូវគ្នានឹងខ្លឹមសារ។ ការធ្វើបែបនេះអាចបណ្ដាលឱ្យអេក្រង់ពណ៌ខ្មៅ ក្នុងអំឡុងពេលប្ដូរទម្រង់។\n\nចុចការកំណត់ផ្ទាំងអេក្រង់កម្រិតខ្ពស់ ដើម្បីទទួលបានជម្រើសកម្រិតឌីណាមិកច្រើនទៀត។"</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"កម្រិតឌីណាមិកដែលចង់បាន"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"ការបំប្លែងជាអាទិភាពនៃប្រព័ន្ធ"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"សូមឱ្យប្រព័ន្ធគ្រប់គ្រងការបំប្លែងទម្រង់"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"នៅពេលជម្រើសនេះត្រូវបានជ្រើសរើស ប្រព័ន្ធនឹងកំណត់ចន្លោះឌីណាមិកសមរម្យមួយដែលត្រូវបានផ្ញើទៅកាន់ផ្ទាំងអេក្រង់របស់អ្នក ហើយបំប្លែងខ្លឹមសារទៅជាចន្លោះឌីណាមិកនេះតាមតម្រូវការ។"</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"ត្រូវគ្នានឹងទម្រង់ខ្លឹមសារជានិច្ច"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"បង្ខំការបំប្លែង"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"បង្ខំការបំប្លែងទៅជាទម្រង់ដែលពេញចិត្ត"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"បង្ខំការបំប្លែងទៅជាទម្រង់ដែលពេញចិត្ត។ ការបង្ខំការបំប្លែងអាចប៉ះពាល់ដល់ការកំណត់ផ្សេងទៀតនៅក្នុងមុខងារផ្ទាំងអេក្រង់ ឬទម្រង់ HDR។"</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"ទៅជា SDR ជានិច្ច"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"ទៅជា <xliff:g id="HDR_TYPE">%s</xliff:g> ជានិច្ច"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"តើអ្នកចង់បង្ខំធាតុចេញកម្រិត HDR មែនទេ?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"តាមលំនាំដើម ការបំប្លែងនឹងត្រូវបានបង្ខំឱ្យទៅជា <xliff:g id="HDR_TYPE">%s</xliff:g>។"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"ផ្ទាំងអេក្រង់របស់អ្នកនឹងដំណើរការក្នុងកម្រិតគុណភាព 1080p 60Hz។ ជម្រើសនេះមិនត្រូវគ្នាជាមួយផ្ទាំងអេក្រង់របស់អ្នកទេ នៅពេលដំណើរការក្នុងកម្រិតគុណភាព 4k 60Hz។"</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"មិនអាចប្រើ Dolby Vision នៅកម្រិតគុណភាពបច្ចុប្បន្ននេះបានទេ។ ប្រសិនបើអ្នកបើក Dolby Vision ដោយដៃផ្ទាល់ កម្រិតគុណភាពនៃការបង្ហាញរបស់អ្នកនឹងត្រូវបានប្ដូរទៅ 1080p 60Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"ប្ដូរកម្រិតគុណភាពទៅ 1080p 60Hz ឬ?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"បង្ខំការបំប្លែងទៅ Dolby Vision ជានិច្ច"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"ប្រសិនបើ Dolby Vision ត្រូវបានបិទក្នុងទម្រង់ HDR នៅក្នុងការកំណត់ផ្ទាំងអេក្រង់កម្រិតខ្ពស់ ការបង្ខំការបំប្លែងទៅ Dolby Vision នឹងបើកវាឡើងវិញ។"</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"បង្ខំការបំប្លែងទៅ HDR10 ជានិច្ច"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"ប្រសិនបើ HDR10 ត្រូវបានបិទក្នុងទម្រង់ HDR នៅក្នុងការកំណត់ផ្ទាំងអេក្រង់កម្រិតខ្ពស់ ការបង្ខំការបំប្លែងទៅ HDR10 នឹងបើកវាឡើងវិញ។"</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"បង្ខំការបំប្លែងទៅ HLG ជានិច្ច"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"ប្រសិនបើ HLG ត្រូវបានបិទក្នុងទម្រង់ HDR នៅក្នុងការកំណត់ផ្ទាំងអេក្រង់កម្រិតខ្ពស់ ការបង្ខំការបំប្លែងទៅ HLG នឹងបើកវាឡើងវិញ។"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"បង្ខំការបំប្លែងទៅ HDR10+ ជានិច្ច"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"ប្រសិនបើ HDR10+ ត្រូវបានបិទក្នុងទម្រង់ HDR នៅក្នុងការកំណត់ផ្ទាំងអេក្រង់កម្រិតខ្ពស់ ការបង្ខំការបំប្លែងទៅ HDR10+ នឹងបើកវាឡើងវិញ។"</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"បង្ខំការបំប្លែងទៅ SDR ជានិច្ច"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"ការបង្ខំការបំប្លែងទៅ SDR នឹងបិទទម្រង់ទាំងអស់នៅក្នុងទម្រង់ HDR នៅក្នុងការកំណត់ផ្ទាំងអេក្រង់កម្រិតខ្ពស់។"</string>
-    <string name="match_content_frame_rate_title" msgid="153291168560947689">"ផ្គូផ្គងអត្រាហ្វ្រេមរបស់ខ្លឹមសារ"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"រលូនតែប៉ុណ្ណោះ"</string>
-    <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"ប្រសិនបើកម្មវិធីស្នើសុំវា ឧបករណ៍របស់អ្នកនឹងផ្គូផ្គងធាតុចេញរបស់វាជាមួយអត្រាហ្វ្រេមដើមនៃខ្លឹមសារដែលអ្នកកំពុងមើល លុះត្រាតែទូរទស្សន៍របស់អ្នកអាចដើរយ៉ាងរលូនប៉ុណ្ណោះ។"</string>
+    <string name="match_content_frame_rate_title" msgid="153291168560947689">"ផ្គូផ្គងអត្រាស៊ុមរបស់ខ្លឹមសារ"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"រលូន"</string>
+    <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"ប្រសិនបើកម្មវិធីស្នើសុំវា ឧបករណ៍របស់អ្នកនឹងផ្គូផ្គងលទ្ធផលរបស់វាជាមួយអត្រាស៊ុមដើមនៃខ្លឹមសារដែលអ្នកកំពុងមើល លុះត្រាតែទូរទស្សន៍របស់អ្នកអាចធ្វើចលនាផ្លាស់ប្ដូរដោយរលូនប៉ុណ្ណោះ។"</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"ផ្ទាំងអេក្រង់ដែលបានភ្ជាប់របស់អ្នកមិនអាចភ្ជាប់ឈុតឆាកក្នុងអត្រាផ្ទុកឡើងវិញដ៏រលូនបានទេ។ ជម្រើសនេះនឹងមិនមានប្រសិទ្ធភាពឡើយ ប្រសិនបើអ្នកមិនប្ដូរទៅប្រើផ្ទាំងអេក្រង់ដែលអាចភ្ជាប់ឈុតឆាកក្នុងអត្រាផ្ទុកឡើងវិញដ៏រលូនទេ។"</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"ជានិច្ច"</string>
-    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"ប្រសិនបើកម្មវិធីស្នើសុំវា ឧបករណ៍របស់អ្នកនឹងផ្គូផ្គងធាតុចេញរបស់វាជាមួយអត្រាហ្វ្រេមដើមនៃខ្លឹមសារដែលអ្នកកំពុងមើល។ ការធ្វើបែបនេះអាចបណ្ដាលឱ្យអេក្រង់របស់អ្នកងងឹតមួយភ្លែត នៅពេលចាកចេញ ឬចូលចាក់វីដេអូ។"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"មិនរលូន"</string>
+    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"ប្រសិនបើកម្មវិធីស្នើសុំវា ឧបករណ៍របស់អ្នកនឹងផ្គូផ្គងលទ្ធផលរបស់វាជាមួយអត្រាស៊ុមដើមនៃខ្លឹមសារដែលអ្នកកំពុងមើល។ ការធ្វើបែបនេះអាចបណ្ដាលឱ្យអេក្រង់របស់អ្នកងងឹតមួយភ្លែត នៅពេលចាកចេញ ឬចូលចាក់វីដេអូ។"</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"កុំឱ្យសោះ"</string>
-    <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"ទោះបីកម្មវិធីស្នើសុំវាក៏ដោយ ឧបករណ៍របស់អ្នកនឹងមិនព្យាយាមផ្គូផ្គងធាតុចេញរបស់វាជាមួយអត្រាហ្វ្រេមដើមនៃខ្លឹមសារដែលអ្នកកំពុងមើលទេ។"</string>
+    <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"ទោះបីជាកម្មវិធីស្នើសុំវាក៏ដោយ ឧបករណ៍របស់អ្នកនឹងមិនព្យាយាមផ្គូផ្គងលទ្ធផលរបស់វាជាមួយអត្រាស៊ុមដើមនៃខ្លឹមសារដែលអ្នកកំពុងមើលទេ។"</string>
     <string name="font_scale_settings_title" msgid="4114019544800225980">"ការប្ដូរទំហំអក្សរ"</string>
     <string name="font_scale_item_detail" msgid="1558315053348778805">"ប្ដូរទំហំទៅ <xliff:g id="SCALE">%1$d</xliff:g>%%"</string>
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"អត្ថបទគំរូ"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"ប្ដូរកម្រិតគុណភាពទៅ %1$s ឬ?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"ជ្រើសរើស \"យល់ព្រម\" ដើម្បីប្រើ %1$s ចាប់ពីពេលនេះតទៅ។"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision មិនអាចប្រើបាននៅ %1$s ទេ ហើយនឹងត្រូវបានបិទនៅក្នុង \"ការកំណត់ការបង្ហាញកម្រិតខ្ពស់\""</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"មុខងារនេះស្គាល់៖ %1$s\nនៅលើទូរទស្សន៍មួយចំនួន អ្នកប្រហែលជាត្រូវបើក HDMI ដែលបានធ្វើឱ្យប្រសើរឡើង ដើម្បីបើកទម្រង់ HDR ច្រើនទៀត។ សូមពិនិត្យមើលការកំណត់ទូរទស្សន៍របស់អ្នក ដើម្បីមើលថាតើស្គាល់ HDMI នេះឬអត់។"</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"មុខងារនេះអាចប្រើ %1$s បាន។ នៅលើទូរទស្សន៍មួយចំនួន អ្នកប្រហែលជាត្រូវបើក HDMI ដែលបានធ្វើឱ្យប្រសើរឡើង ដើម្បីបើកទម្រង់ HDR ច្រើនទៀត។ ពិនិត្យមើលការកំណត់ទូរទស្សន៍របស់អ្នក ដើម្បីមើលថាតើមុខងារនេះអាចប្រើបានដែរឬអត់។"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"បោះបង់"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"យល់ព្រម"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"ជម្រះទិន្នន័យក្នុងឃ្លាំងសម្ងាត់?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"វានឹងជម្រះទិន្នន័យឃ្លាំងសម្រាប់កម្មវិធីទាំងអស់។"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"ឧបករណ៍នេះស្ថិតក្រោមការគ្រប់គ្រងរបស់ស្ថាប័នអ្នក។"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"ឧបករណ៍នេះស្ថិតក្រោមការគ្រប់គ្រងរបស់ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ។"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"ស្វែងយល់បន្ថែម"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{កម្មវិធីកាមេរ៉ា}other{កម្មវិធីកាមេរ៉ា}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"កម្មវិធីប្រតិទិន"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"សូមបញ្ជាក់ ដើម្បីទប់ស្កាត់កុំឱ្យបិទការបង្ហាញខណៈពេលកំពុងមើល ដែលអាចនឹងធ្វើឱ្យការប្រើប្រាស់ថាមពលមានការកើនឡើង។"</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"ពេលអសកម្ម"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"ពេលកំពុងមើល"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"បិទដោយស្វ័យប្រវត្តិ"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"បិទដោយស្វ័យប្រវត្តិនៅពេលអសកម្ម"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"បិទដោយស្វ័យប្រវត្តិនៅពេលកំពុងមើល"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"បិទទូរទស្សន៍ដោយស្វ័យប្រវត្តិ"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"បិទទូរទស្សន៍ដោយស្វ័យប្រវត្តិនៅពេលអសកម្ម"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"បិទទូរទស្សន៍ដោយស្វ័យប្រវត្តិនៅពេលកំពុងមើល"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"កម្មវិធីកំណត់ម៉ោងសម្រាប់ \"ពេលអសកម្ម\" ត្រូវតែខ្លីជាងកម្មវិធីកំណត់ម៉ោងសម្រាប់ \"ពេលកំពុងមើល\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"កម្មវិធីកំណត់ម៉ោងសម្រាប់ \"ពេលកំពុងមើល\" ត្រូវតែវែងជាងកម្មវិធីកំណត់ម៉ោងសម្រាប់ \"ពេលអសកម្ម\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"ដាក់កំហិតការតភ្ជាប់បណ្ដាញក្នុងមុខងារសម្ងំ"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"សកម្មភាពនៅពេលបើក"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"កំណត់ឡើងវិញ"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"កូដផ្គូផ្គងអ៊ីសឺរណិត"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"មុខងារថាមពល"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"បង្កើនប្រសិទ្ធភាពថាមពល នៅពេលមិនប្រើទូរទស្សន៍"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"បើក៖"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"សូមកត់ចំណាំថា មុខងារនេះអាចបង្កើនការប្រើប្រាស់ថាមពលរបស់ឧបករណ៍។"</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"បើក \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/Settings/res/values-kn/energy-modes.xml b/Settings/res/values-kn/energy-modes.xml
deleted file mode 100644
index 873956771..000000000
--- a/Settings/res/values-kn/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"ಅಗತ್ಯ ನೆಟ್‌ವರ್ಕ್ ಫೀಚರ್‌ಗಳು"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ಕಡಿಮೆ ವಿದ್ಯುತ್ ಬಳಕೆ"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"ಟಿವಿ ಬಳಕೆಯಲ್ಲಿ ಇಲ್ಲದಿದ್ದಾಗ ನೆಟ್‌ವರ್ಕ್ ಕನೆಕ್ಷನ್ ಅನ್ನು ಆಫ್ ಮಾಡಿ."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"ಮಹತ್ವದ ಅಪ್‌ಡೇಟ್‌ಗಳು ಹಾಗೂ ಫಂಕ್ಷನ್‌ಗಳು"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"ಶಿಫಾರಸು ಮಾಡಲಾದ ನೆಟ್‌ವರ್ಕ್ ಫೀಚರ್‌ಗಳು"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾದ ವಿದ್ಯುತ್ ಬಳಕೆ"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ನೆಟ್‌ವರ್ಕ್ ಮೂಲಕ ಟಿವಿಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಫೀಚರ್‌ಗಳನ್ನು ಆನ್ ಮಾಡುತ್ತದೆ (ಸ್ಟ್ಯಾಂಡ್‌ಬೈ ಮೋಡ್)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[ಫೀಚರ್ 1 ಸೇರಿಸಿ]"</item>
-    <item msgid="8724721267222341891">"[ಫೀಚರ್ 2 ಸೇರಿಸಿ]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"ಹೆಚ್ಚುವರಿ ನೆಟ್‌ವರ್ಕ್ ಫೀಚರ್‌ಗಳು"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"ಹೆಚ್ಚಿನ ವಿದ್ಯುತ್ ಬಳಕೆ"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"ಶಿಫಾರಸು ಮಾಡಲಾದ ಫೀಚರ್‌ಗಳ ಜೊತೆಗೆ, ಟಿವಿ ಬಳಕೆಯಲ್ಲಿ ಇಲ್ಲದಿದ್ದಾಗ ಈ ಆಯ್ಕೆಯು ಹೆಚ್ಚುವರಿ ಫೀಚರ್‌ಗಳನ್ನು ಆನ್ ಮಾಡುತ್ತದೆ, ಅದು ವಿದ್ಯುತ್ ಬಳಕೆಯನ್ನು ಹೆಚ್ಚಿಸಬಹುದು."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[ಫೀಚರ್ 1 ಸೇರಿಸಿ]"</item>
-    <item msgid="170760143032597722">"[ಫೀಚರ್ 2 ಸೇರಿಸಿ]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-kn/strings.xml b/Settings/res/values-kn/strings.xml
index f69ffa0b4..7e4fb4519 100644
--- a/Settings/res/values-kn/strings.xml
+++ b/Settings/res/values-kn/strings.xml
@@ -41,7 +41,7 @@
     <string name="hotwording_summary" msgid="2170375928302175449">"ಯಾವುದೇ ಸಮಯದಲ್ಲಿ Google Assistant ಜೊತೆಗೆ ಮಾತನಾಡಿ"</string>
     <string name="header_category_device" msgid="3023893663454705969">"ಸಾಧನ"</string>
     <string name="header_category_preferences" msgid="3738388885555798797">"ಪ್ರಾಶಸ್ತ್ಯಗಳು"</string>
-    <string name="header_category_accessories" msgid="6479803330480847199">"ರಿಮೋಟ್ ಮತ್ತು ಆ್ಯಕ್ಸೆಸರಿಗಳು"</string>
+    <string name="header_category_accessories" msgid="6479803330480847199">"ರಿಮೋಟ್ &amp; ಪರಿಕರಗಳು"</string>
     <string name="header_category_personal" msgid="7880053929985150368">"ವೈಯಕ್ತಿಕ"</string>
     <string name="connect_to_network" msgid="4133686359319492392">"ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಿ"</string>
     <string name="add_an_account" msgid="2601275122685226096">"ಖಾತೆಯನ್ನು ಸೇರಿಸಿ"</string>
@@ -54,7 +54,7 @@
     <string name="applications_category_title" msgid="7112019490898586223">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="device_pref_category_title" msgid="8292572846154873762">"ಸಾಧನದ ಪ್ರಾಶಸ್ತ್ಯಗಳು"</string>
     <string name="accessibility_category_title" msgid="1552664829936369592">"ಆ್ಯಕ್ಸೆಸ್ಸಿಬಿಲಿಟಿ"</string>
-    <string name="remotes_and_accessories_category_title" msgid="4795119810430255047">"ರಿಮೋಟ್‌ಗಳು ಮತ್ತು ಆ್ಯಕ್ಸೆಸರಿಗಳು"</string>
+    <string name="remotes_and_accessories_category_title" msgid="4795119810430255047">"ರಿಮೋಟ್‌ಗಳು ಮತ್ತು ಪರಿಕರಗಳು"</string>
     <string name="display_and_sound_category_title" msgid="9203309625380755860">"ಡಿಸ್‌ಪ್ಲೇ ಮತ್ತು ಧ್ವನಿ"</string>
     <string name="help_and_feedback_category_title" msgid="7036505833991003031">"ಸಹಾಯ ಮತ್ತು ಪ್ರತಿಕ್ರಿಯೆ"</string>
     <string name="privacy_category_title" msgid="8552430590908463601">"ಗೌಪ್ಯತೆ"</string>
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"ಬ್ಯಾಕಪ್ ಮಾಡಿ &amp; ಮರುಸ್ಥಾಪಿಸಿ"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ರಿಸೆಟ್"</string>
     <string name="device_calibration" msgid="2907914144048739705">"ಕ್ಯಾಲಿಬರೇಶನ್"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"ಶಟ್-ಆಫ್ ಟೈಮರ್"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"ಟಿವಿಯನ್ನು ಆಫ್ ಮಾಡಲು ಮತ್ತು ಶಕ್ತಿಯನ್ನು ಉಳಿಸಲು ಟೈಮರ್‌ಗಳನ್ನು ಸೆಟ್ ಮಾಡಿ"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"ವಿದ್ಯುತ್ ಮತ್ತು ಎನರ್ಜಿ"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"ಪರಿಸರ-ಸ್ನೇಹಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"ಸಾಧನಗಳು"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"ಸ್ವರೂಪಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
@@ -151,39 +151,12 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"ಸುಧಾರಿತ ಧ್ವನಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"ಗೇಮ್ ಮೋಡ್‌ಗೆ ಅನುಮತಿಸಿ"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"ಹೊಂದಾಣಿಕೆಯಾಗುವ ವಿಷಯದ ಡೈನಾಮಿಕ್ ಶ್ರೇಣಿ"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"ಈ ಆಯ್ಕೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವಾಗ, ಸಿಸ್ಟಂ ವಿಷಯವನ್ನು ಹೊಂದಾಣಿಕೆ ಮಾಡಲು ವಿಭಿನ್ನ ಡೈನಾಮಿಕ್ ಶ್ರೇಣಿಯ ಫಾರ್ಮ್ಯಾಟ್‌ಗಳ ನಡುವೆ ಬದಲಿಸುತ್ತದೆ. ಇದು ಫಾರ್ಮ್ಯಾಟ್ ಬದಲಾವಣೆ ಸಮಯದಲ್ಲಿ ಬ್ಲ್ಯಾಕ್ ಸ್ಕ್ರೀನ್‌ಗೆ ಕಾರಣವಾಗಬಹುದು.\n\nಇನ್ನಷ್ಟು ಡೈನಾಮಿಕ್ ಶ್ರೇಣಿಯ ಆಯ್ಕೆಗಳಿಗಾಗಿ ಸುಧಾರಿತ ಡಿಸ್‌ಪ್ಲೇ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"ಆದ್ಯತೆಯ ಡೈನಾಮಿಕ್ ಶ್ರೇಣಿ"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"ಸಿಸ್ಟಂ-ಆದ್ಯತೆಯ ಪರಿವರ್ತನೆ"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"ಫಾರ್ಮ್ಯಾಟ್ ಪರಿವರ್ತನೆಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ನಿರ್ವಹಿಸಿ"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"ಈ ಆಯ್ಕೆಯನ್ನು ಆರಿಸುವುದರಿಂದ ಡಿಸ್‌ಪ್ಲೇಗೆ ಕಳುಹಿಸಲು ಸೂಕ್ತವಾದ ಡೈನಾಮಿಕ್ ಶ್ರೇಣಿಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ನಿರ್ಧರಿಸುತ್ತದೆ ಮತ್ತು ಅಗತ್ಯವಿದ್ದರೆ ಆ ಡೈನಾಮಿಕ್ ಶ್ರೇಣಿಗೆ ವಿಷಯವನ್ನು ಪರಿವರ್ತಿಸುತ್ತದೆ."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"ಯಾವಾಗಲೂ ವಿಷಯದ ಫಾರ್ಮ್ಯಾಟ್‌ಗೆ ಹೊಂದಿಕೆಯಾಗುತ್ತದೆ"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"ಒತ್ತಾಯದ ಪರಿವರ್ತನೆ"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"ಆದ್ಯತೆಯ ಫಾರ್ಮ್ಯಾಟ್‌ಗೆ ಪರಿವರ್ತನೆಯನ್ನು ಒತ್ತಾಯಿಸುತ್ತದೆ"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"ಆದ್ಯತೆಯ ಫಾರ್ಮ್ಯಾಟ್‌ಗೆ ಪರಿವರ್ತನೆಯನ್ನು ಒತ್ತಾಯಿಸುತ್ತದೆ. ಒತ್ತಾಯದ ಪರಿವರ್ತನೆಯು ಡಿಸ್‌ಪ್ಲೇ ಮೋಡ್ ಅಥವಾ HDR ಫಾರ್ಮ್ಯಾಟ್‌ನಲ್ಲಿನ ಇತರ ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಮೇಲೆ ಪರಿಣಾಮ ಬೀರಬಹುದು."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"ಯಾವಾಗಲೂ SDR ಗೆ"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"ಯಾವಾಗಲೂ <xliff:g id="HDR_TYPE">%s</xliff:g> ಗೆ"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"ನೀವು HDR ಔಟ್‌ಪುಟ್ ಅನ್ನು ಒತ್ತಾಯಿಸಲು ಬಯಸುತ್ತೀರಾ?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"ಡಿಫಾಲ್ಟ್ ಆಗಿ <xliff:g id="HDR_TYPE">%s</xliff:g> ಗೆ ಪರಿವರ್ತಿಸಲು ಒತ್ತಾಯಿಸಲಾಗುತ್ತದೆ."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"ನಿಮ್ಮ ಡಿಸ್‌ಪ್ಲೇ 1080p 60 Hz ರೆಸಲ್ಯೂಶನ್‌ನಲ್ಲಿ ರನ್ ಆಗುತ್ತದೆ. 4k 60Hz ರೆಸಲ್ಯೂಶನ್‌ನಲ್ಲಿ ರನ್ ಆಗುವಾಗ ಈ ಆಯ್ಕೆಯು ನಿಮ್ಮ ಡಿಸ್‌ಪ್ಲೇ ಜೊತೆಗೆ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"ಪ್ರಸ್ತುತ ರೆಸಲ್ಯೂಷನ್‌ನಲ್ಲಿ Dolby Vision ಬೆಂಬಲಿತವಾಗಿಲ್ಲ. ನೀವು Dolby Vision ಅನ್ನು ಹಸ್ತಚಾಲಿತವಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸಿದರೆ, ನಿಮ್ಮ ಡಿಸ್‌ಪ್ಲೇನ ರೆಸಲ್ಯೂಷನ್ ಅನ್ನು 1080p 60Hz ಗೆ ಬದಲಾಯಿಸಲಾಗುತ್ತದೆ"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"ರೆಸಲ್ಯೂಷನ್ ಅನ್ನು 1080p 60Hz ಗೆ ಬದಲಾಯಿಸಬೇಕೇ?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"ಯಾವಾಗಲೂ Dolby Vision ಗೆ ಬಲವಂತವಾಗಿ ಪರಿವರ್ತಿಸಿ"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"ಸುಧಾರಿತ ಡಿಸ್‌ಪ್ಲೇ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿರುವ HDR ಫಾರ್ಮ್ಯಾಟ್‌ಗಳಲ್ಲಿ Dolby Vision ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದ್ದರೆ, Dolby ಗೆ ಬಲವಂತವಾಗಿ ಪರಿವರ್ತಿಸುವುದರಿಂದ ಅದು ಮರು-ಸಕ್ರಿಯಗೊಳ್ಳುತ್ತದೆ."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"ಯಾವಾಗಲೂ HDR10 ಗೆ ಬಲವಂತವಾಗಿ ಪರಿವರ್ತಿಸಿ"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"ಸುಧಾರಿತ ಡಿಸ್‌ಪ್ಲೇ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿರುವ HDR ಫಾರ್ಮ್ಯಾಟ್‌ಗಳಲ್ಲಿ HDR10 ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದ್ದರೆ, HDR10 ಗೆ ಬಲವಂತವಾಗಿ ಪರಿವರ್ತಿಸುವುದರಿಂದ ಅದು ಮರು-ಸಕ್ರಿಯಗೊಳ್ಳುತ್ತದೆ."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"ಯಾವಾಗಲೂ HLG ಗೆ ಬಲವಂತವಾಗಿ ಪರಿವರ್ತಿಸಿ"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"ಸುಧಾರಿತ ಡಿಸ್‌ಪ್ಲೇ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿರುವ HDR ಫಾರ್ಮ್ಯಾಟ್‌ಗಳಲ್ಲಿ HLG ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದ್ದರೆ, HLG ಗೆ ಬಲವಂತವಾಗಿ ಪರಿವರ್ತಿಸುವುದರಿಂದ ಅದು ಮರು-ಸಕ್ರಿಯಗೊಳ್ಳುತ್ತದೆ."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"ಯಾವಾಗಲೂ HDR10+ ಗೆ ಬಲವಂತವಾಗಿ ಪರಿವರ್ತಿಸಿ"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"ಸುಧಾರಿತ ಡಿಸ್‌ಪ್ಲೇ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿರುವ HDR ಫಾರ್ಮ್ಯಾಟ್‌ಗಳಲ್ಲಿ HDR10+ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದ್ದರೆ, HDR10+ ಗೆ ಬಲವಂತವಾಗಿ ಪರಿವರ್ತಿಸುವುದರಿಂದ ಅದು ಮರು-ಸಕ್ರಿಯಗೊಳ್ಳುತ್ತದೆ."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"ಯಾವಾಗಲೂ SDR ಗೆ ಬಲವಂತವಾಗಿ ಪರಿವರ್ತಿಸಿ"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"SDR ಗೆ ಬಲವಂತವಾಗಿ ಪರಿವರ್ತಿಸುವುದರಿಂದ, ಸುಧಾರಿತ ಡಿಸ್‌ಪ್ಲೇ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿನ HDR ಫಾರ್ಮ್ಯಾಟ್‌ಗಳಲ್ಲಿರುವ ಎಲ್ಲಾ ಫಾರ್ಮ್ಯಾಟ್‌ಗಳು ನಿಷ್ಕ್ರಿಯಗೊಳ್ಳುತ್ತವೆ."</string>
-    <string name="match_content_frame_rate_title" msgid="153291168560947689">"ಕಂಟೆಂಟ್‌ ಫ್ರೇಮ್ ರೇಟ್ ಅನ್ನು ಮ್ಯಾಚ್‌ ಮಾಡಿ"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"ಸೀಮ್‌ಲೆಸ್ ಮಾತ್ರ"</string>
+    <string name="match_content_frame_rate_title" msgid="153291168560947689">"ವಿಷಯ ಫ್ರೇಮ್ ರೇಟ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"ತಡೆರಹಿತ"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"ಆ್ಯಪ್ ಅದನ್ನು ವಿನಂತಿಸಿದರೆ, ನಿಮ್ಮ ಟಿವಿ ತಡೆರಹಿತ ಪರಿವರ್ತನೆ ಮಾಡಲು ಸಾಧ್ಯವಾದರೆ ಮಾತ್ರ, ನಿಮ್ಮ ಸಾಧನವು ಅದರ ಔಟ್‌ಪುಟ್ ಅನ್ನು ನೀವು ವೀಕ್ಷಿಸುತ್ತಿರುವ ವಿಷಯದ ಮೂಲ ಫ್ರೇಮ್ ರೇಟ್‌ಗೆ ಮಾತ್ರ ಹೊಂದಿಸುತ್ತದೆ."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"ನಿಮ್ಮ ಕನೆಕ್ಟ್ ಮಾಡಿದ ಡಿಸ್‌ಪ್ಲೇ ತಡೆರಹಿತ ರಿಫ್ರೆಶ್ ರೇಟ್ ಪರಿವರ್ತನೆಗಳನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ. ನೀವು ಅದನ್ನು ಬೆಂಬಲಿಸುವ ಡಿಸ್‌ಪ್ಲೇಗೆ ಬದಲಾಯಿಸದ ಹೊರತು ಈ ಆಯ್ಕೆಯು ಯಾವುದೇ ಪರಿಣಾಮವನ್ನು ಬೀರುವುದಿಲ್ಲ."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"ಯಾವಾಗಲೂ"</string>
-    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"ಆ್ಯಪ್ ಅದನ್ನು ವಿನಂತಿಸಿದರೆ, ನಿಮ್ಮ ಸಾಧನವು ಅದರ ಔಟ್‌ಪುಟ್ ಅನ್ನು ನೀವು ವೀಕ್ಷಿಸುತ್ತಿರುವ ಕಂಟೆಂಟ್‌ನ ಮೂಲ ಫ್ರೇಮ್ ರೇಟ್‌ಗೆ ಮ್ಯಾಚ್‌ ಮಾಡುತ್ತದೆ. ವೀಡಿಯೊ ಪ್ಲೇಬ್ಯಾಕ್‌ನಿಂದ ನಿರ್ಗಮಿಸುವಾಗ ಅಥವಾ ಪ್ರವೇಶಿಸುವಾಗ ಇದು ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಒಂದು ಸೆಕೆಂಡ್‌ವರೆಗೆ ನಿಷ್ಕ್ರಿಯವಾಗಲು ಕಾರಣವಾಗಬಹುದು."</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"ತಡೆರಹಿತವಲ್ಲದ"</string>
+    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"ಆ್ಯಪ್ ಅದನ್ನು ವಿನಂತಿಸಿದರೆ, ನಿಮ್ಮ ಸಾಧನವು ಅದರ ಔಟ್‌ಪುಟ್ ಅನ್ನು ನೀವು ವೀಕ್ಷಿಸುತ್ತಿರುವ ವಿಷಯದ ಮೂಲ ಫ್ರೇಮ್ ರೇಟ್‌ಗೆ ಹೊಂದಿಸುತ್ತದೆ. ವೀಡಿಯೊ ಪ್ಲೇಬ್ಯಾಕ್‌ನಿಂದ ನಿರ್ಗಮಿಸುವಾಗ ಅಥವಾ ಪ್ರವೇಶಿಸುವಾಗ ಇದು ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಒಂದು ಸೆಕೆಂಡ್‌ಗೆ ನಿಷ್ಕ್ರಿಯವಾಗಲು ಕಾರಣವಾಗಬಹುದು."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"ಎಂದಿಗೂ ಇಲ್ಲ"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"ಆ್ಯಪ್ ಅದನ್ನು ವಿನಂತಿಸಿದರೂ ಸಹ, ನಿಮ್ಮ ಸಾಧನವು ಅದರ ಔಟ್‌ಪುಟ್ ಅನ್ನು ನೀವು ವೀಕ್ಷಿಸುತ್ತಿರುವ ವಿಷಯದ ಮೂಲ ಫ್ರೇಮ್ ರೇಟ್‌ಗೆ ಹೊಂದಿಸಲು ಎಂದಿಗೂ ಪ್ರಯತ್ನಿಸುವುದಿಲ್ಲ."</string>
     <string name="font_scale_settings_title" msgid="4114019544800225980">"ಪಠ್ಯ ಸ್ಕೇಲಿಂಗ್"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"ರೆಸಲ್ಯೂಷನ್‌‌ ಅನ್ನು %1$s ಗೆ ಬದಲಾಯಿಸುವುದೇ?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"ಈಗಿನಿಂದ %1$s ಬಳಸಲು ಸರಿ ಎಂಬುದನ್ನು ಆಯ್ಕೆಮಾಡಿ."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s ನಲ್ಲಿ ಡಾಲ್ಬಿ ವಿಷನ್ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ ಮತ್ತು ಅದನ್ನು \"ಸುಧಾರಿತ ಡಿಸ್‌ಪ್ಲೇ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ\" ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತದೆ"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"ಈ ಮೋಡ್ ಇವುಗಳನ್ನು ಬೆಂಬಲಿಸುತ್ತದೆ: %1$s\nಕೆಲವು ಟಿವಿಗಳಲ್ಲಿ, ಹೆಚ್ಚಿನ HDR ಫಾರ್ಮ್ಯಾಟ್‌ಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ನೀವು ವರ್ಧಿತ HDMI ಅನ್ನು ಆನ್ ಮಾಡಬೇಕಾಗಬಹುದು. ಇದು ಬೆಂಬಲಿತವಾಗಿದೆಯೇ ಎಂದು ನೋಡಲು ನಿಮ್ಮ ಟಿವಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಪರಿಶೀಲಿಸಿ."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"ಈ ಮೋಡ್ %1$s ಅನ್ನು ಬೆಂಬಲಿಸುತ್ತದೆ. ಕೆಲವು ಟಿವಿಗಳಲ್ಲಿ, ಹೆಚ್ಚಿನ HDR ಫಾರ್ಮ್ಯಾಟ್‌ಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ನೀವು ವರ್ಧಿತ HDMI ಅನ್ನು ಆನ್ ಮಾಡಬೇಕಾಗಬಹುದು. ಇದು ಬೆಂಬಲಿತವಾಗಿದೆಯೇ ಎಂದು ನೋಡಲು ನಿಮ್ಮ ಟಿವಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಪರಿಶೀಲಿಸಿ."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"ರದ್ದುಗೊಳಿಸಿ"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ಸರಿ"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"ಸಂಗ್ರಹ ಡೇಟಾವನ್ನು ತೆರುವುಗೊಳಿಸುವುದೇ?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"ಎಲ್ಲ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸಂಗ್ರಹ ಡೇಟಾವನ್ನು ಇದು ತೆರುವುಗೊಳಿಸುತ್ತದೆ."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -246,7 +219,7 @@
     <string name="error_action_not_supported" msgid="5377532621386080296">"ಈ ಕ್ರಮ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ"</string>
     <string name="bluetooth_pairing_request" msgid="6120176967230348092">"ಬ್ಲೂಟೂತ್ ಜೋಡಣೆ ವಿನಂತಿ"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="7397401633869153520">"ಇದರೊಂದಿಗೆ ಜೋಡಿಸಲು: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, ಈ ಪಾಸ್‌ಕೀಯನ್ನು ಅದು ತೋರಿಸುತ್ತಿದೆಯೇ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ: &lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_incoming_pairing_msg" msgid="8587851808387685613">"ಇಂದ: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;ಈ ಸಾಧನದ ಜೊತೆಗೆ ಜೋಡಿ ಮಾಡಬೇಕೆ?"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="8587851808387685613">"ಇಂದ: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;ಈ ಸಾಧನದ ಜೊತೆಗೆ ಜೋಡಿ ಮಾಡುವುದೇ?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="6934651048757228432">"ಇದರ ಜೊತೆಗೆ ಜೋಡಿ ಮಾಡಲು: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;ಇದರಲ್ಲಿ ಟೈಪ್ ಮಾಡಿ: &lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, ನಂತರ ಹಿಂತಿರುಗು ಅಥವಾ ನಮೂದಿಸು ಒತ್ತಿರಿ."</string>
     <string name="bluetooth_enter_pin_msg" msgid="8905524093007140634">"ಇದರ ಜೊತೆಗೆ ಜೋಡಿ ಮಾಡಲು: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, &lt;br&gt;ಸಾಧನಕ್ಕೆ ಅಗತ್ಯವಿರುವ PIN ಟೈಪ್ ಮಾಡಿ:"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="889584097447402492">"ಇದರೊಂದಿಗೆ ಜೋಡಿ ಮಾಡಲು: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, &lt;br&gt;ಸಾಧನದ ಅಗತ್ಯವಿರುವ ಪಾಸ್‌ಕೀಲಿ ಟೈಪ್ ಮಾಡಿ:"</string>
@@ -255,12 +228,12 @@
     <string name="bluetooth_cancel" msgid="4415185529332987034">"ರದ್ದುಮಾಡಿ"</string>
     <string name="bluetooth_device_connected_toast" msgid="1896195197089204806">"%1$s ಅನ್ನು ಕನೆಕ್ಟ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="bluetooth_device_disconnected_toast" msgid="7459239447363156499">"%1$s ಅನ್ನು ಡಿಸ್‌ಕನೆಕ್ಟ್ ಮಾಡಲಾಗಿದೆ"</string>
-    <string name="connected_devices_slice_pref_title" msgid="6761921505544005991">"ರಿಮೋಟ್‌ಗಳು ಮತ್ತು ಆ್ಯಕ್ಸೆಸರಿಗಳು"</string>
+    <string name="connected_devices_slice_pref_title" msgid="6761921505544005991">"ರಿಮೋಟ್‌ಗಳು ಮತ್ತು ಪರಿಕರಗಳು"</string>
     <string name="bluetooth_toggle_title" msgid="3808904783456336104">"ಬ್ಲೂಟೂತ್"</string>
     <string name="bluetooth_toggle_confirmation_dialog_title" msgid="3906746631391295717">"ಬ್ಲೂಟೂತ್ ಆಫ್ ಮಾಡಿ"</string>
     <string name="bluetooth_toggle_confirmation_dialog_summary" msgid="9017044450625172698">"ಬ್ಲೂಟೂತ್ ಆಫ್ ಆಗಿರುವಾಗ, ನಿಮ್ಮ ರಿಮೋಟ್‌ನಿಂದ Google Assistant ಅನ್ನು ಪ್ರವೇಶಿಸಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="bluetooth_pair_accessory" msgid="5508750142754420984">"ಪರಿಕರವನ್ನು ಜೋಡಿಸಿ"</string>
-    <string name="bluetooth_known_devices_category" msgid="6895470515631452961">"ಆ್ಯಕ್ಸೆಸರಿಗಳು"</string>
+    <string name="bluetooth_known_devices_category" msgid="6895470515631452961">"ಪರಿಕರಗಳು"</string>
     <string name="bluetooth_official_remote_category" msgid="5817814488268307170">"ರಿಮೋಟ್ ನಿಯಂತ್ರಣ"</string>
     <string name="bluetooth_official_remote_entry_title" msgid="6699700335229570038">"ರಿಮೋಟ್ ನಿಯಂತ್ರಣದ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"ರಿಮೋಟ್ ಬಟನ್‌ಗಳನ್ನು ಸೆಟಪ್ ಮಾಡಿ"</string>
@@ -306,10 +279,10 @@
     <string name="enterprise_privacy_settings" msgid="8226765895133003202">"ನಿರ್ವಹಿಸುವ ಸಾಧನದ ಮಾಹಿತಿ"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5719549523275019419">"ನಿಮ್ಮ ಸಂಸ್ಥೆಯು ನಿರ್ವಹಿಸುವ ಬದಲಾವಣೆಗಳು ಮತ್ತು ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="2866704039759872293">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ನಿರ್ವಹಿಸುವ ಬದಲಾವಣೆಗಳು ಮತ್ತು ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="enterprise_privacy_header" msgid="9221881402582661521">"ನಿಮ್ಮ ಕೆಲಸದ ಡೇಟಾಗೆ ಆ್ಯಕ್ಸೆಸ್ ಒದಗಿಸಲು, ನಿಮ್ಮ ಸಂಸ್ಥೆಯು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಬಹುದು ಮತ್ತು ಸಾಫ್ಟ್‌ವೇರ್ ಸ್ಥಾಪಿಸಬಹುದು.\n\nಹೆಚ್ಚಿನ ವಿವರಗಳಿಗಾಗಿ, ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
+    <string name="enterprise_privacy_header" msgid="9221881402582661521">"ನಿಮ್ಮ ಕೆಲಸದ ಡೇಟಾಗೆ ಪ್ರವೇಶ ಒದಗಿಸಲು, ನಿಮ್ಮ ಸಂಸ್ಥೆಯು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಬಹುದು ಮತ್ತು ಸಾಫ್ಟ್‌ವೇರ್ ಸ್ಥಾಪಿಸಬಹುದು.\n\nಹೆಚ್ಚಿನ ವಿವರಗಳಿಗಾಗಿ, ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
     <string name="enterprise_privacy_exposure_category" msgid="1555735251238636669">"ನಿಮ್ಮ ಸಂಸ್ಥೆಯು ನೋಡಬಹುದಾದ ಮಾಹಿತಿಯ ವಿಧಗಳು"</string>
     <string name="enterprise_privacy_exposure_changes_category" msgid="7750498604032318318">"ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ನಿರ್ವಾಹಕರು ಮಾಡಿರುವ ಬದಲಾವಣೆಗಳು"</string>
-    <string name="enterprise_privacy_device_access_category" msgid="7397106369136259850">"ಈ ಸಾಧನಕ್ಕೆ ನಿಮ್ಮ ಆ್ಯಕ್ಸೆಸ್"</string>
+    <string name="enterprise_privacy_device_access_category" msgid="7397106369136259850">"ಈ ಸಾಧನಕ್ಕೆ ನಿಮ್ಮ ಪ್ರವೇಶ"</string>
     <string name="enterprise_privacy_enterprise_data" msgid="8135491104894522008">"ಇಮೇಲ್‌ ಮತ್ತು ಕ್ಯಾಲೆಂಡರ್‌‌ನಂತಹ ನಿಮ್ಮ ಕೆಲಸದ ಖಾತೆಯ ಜೊತೆಗೆ ಸಂಯೋಜಿತವಾಗಿರುವ ಡೇಟಾ"</string>
     <string name="enterprise_privacy_installed_packages" msgid="5012554762299490994">"ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಪಟ್ಟಿ"</string>
     <string name="enterprise_privacy_usage_stats" msgid="7062422823174345793">"ಪ್ರತಿ ಅಪ್ಲಿಕೇಶನ್‌ನಲ್ಲಿ ವ್ಯಯಿಸಿದ ಸಮಯ ಮತ್ತು ದಿನಾಂಕ"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"ಈ ಸಾಧನವನ್ನು ನಿಮ್ಮ ಸಂಸ್ಥೆ ನಿರ್ವಹಿಸುತ್ತಿದೆ."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"ಈ ಸಾಧನವನ್ನು <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ನಿರ್ವಹಿಸುತ್ತಿದೆ."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{ಕ್ಯಾಮರಾ ಆ್ಯಪ್}one{ಕ್ಯಾಮರಾ ಆ್ಯಪ್‌ಗಳು}other{ಕ್ಯಾಮರಾ ಆ್ಯಪ್‌ಗಳು}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"ಕ್ಯಾಲೆಂಡರ್ ಅಪ್ಲಿಕೇಶನ್"</string>
@@ -453,7 +427,7 @@
     <string name="title_wifi_could_not_connect_timeout" msgid="7825788623604214601">"<xliff:g id="SSID">%1$s</xliff:g> ಹುಡುಕಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
     <string name="title_wifi_could_not_connect_authentication_failure" msgid="6626386897327862432">"ವೈ-ಫೈ ಪಾಸ್‌ವರ್ಡ್ ಮಾನ್ಯವಾಗಿಲ್ಲ"</string>
     <string name="title_wifi_could_not_connect_ap_reject" msgid="5182833781690447828">"ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್ ಸಂಪರ್ಕವನ್ನು ಸಮ್ಮತಿಸಿಲ್ಲ"</string>
-    <string name="title_wifi_advanced_options" msgid="371185991282743258">"<xliff:g id="SSID">%1$s</xliff:g> ಪ್ರಾಕ್ಸಿ ಮತ್ತು IP ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಕಾನ್ಫಿಗರ್ ಮಾಡಬೇಕೆ?"</string>
+    <string name="title_wifi_advanced_options" msgid="371185991282743258">"<xliff:g id="SSID">%1$s</xliff:g> ಪ್ರಾಕ್ಸಿ ಮತ್ತು IP ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಕಾನ್ಫಿಗರ್ ಮಾಡುವುದೇ?"</string>
     <string name="title_wifi_proxy_settings" msgid="1933444342984660569">"ಪ್ರಾಕ್ಸಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="title_wifi_proxy_hostname" msgid="1242297002220870385">"ಪ್ರಾಕ್ಸಿ ಹೋಸ್ಟ್‌ಹೆಸರು:"</string>
     <string name="title_wifi_proxy_port" msgid="566244407030390328">"ಪ್ರಾಕ್ಸಿ ಪೋರ್ಟ್:"</string>
@@ -628,12 +602,12 @@
     <string name="microphone" msgid="7893752847683941214">"ಮೈಕ್ರೊಫೋನ್"</string>
     <string name="mic_toggle_title" msgid="7193417007060235665">"ಮೈಕ್ರೊಫೋನ್ ಪ್ರವೇಶದ ಅನುಮತಿ"</string>
     <string name="mic_remote_toggle_title" msgid="7153283895012570080">"ನಿಮ್ಮ ರಿಮೋಟ್‌ನಲ್ಲಿ ಮೈಕ್ರೊಫೋನ್ ಆ್ಯಕ್ಸೆಸ್"</string>
-    <string name="open_mic_permissions" msgid="8121871594807641073">"ಮೈಕ್ರೊಫೋನ್‌ಗೆ ಆ್ಯಪ್‌ನ ಆ್ಯಕ್ಸೆಸ್"</string>
+    <string name="open_mic_permissions" msgid="8121871594807641073">"ಮೈಕ್ರೊಫೋನ್‌ಗೆ ಆ್ಯಪ್‌ನ ಪ್ರವೇಶ"</string>
     <string name="microphone_physical_privacy_enabled_title" msgid="6135130916399886772">"ಮೈಕ್ರೊಫೋನ್ ಪ್ರವೇಶವನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
     <string name="microphone_physical_privacy_enabled_text" msgid="401238365312924088">"ನಿರ್ಬಂಧವನ್ನು ತೆಗೆದುಹಾಕಲು, ಮೈಕ್ರೊಫೋನ್‌ಗೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸುವುದಕ್ಕಾಗಿ ನಿಮ್ಮ ಸಾಧನದ ಗೌಪ್ಯತೆ ಸ್ವಿಚ್ ಅನ್ನು ಮೈಕ್ರೊಫೋನ್ ಆನ್ ಸ್ಥಾನಕ್ಕೆ ಸರಿಸಿ."</string>
     <string name="camera" msgid="1226671478936288283">"ಕ್ಯಾಮರಾ"</string>
     <string name="camera_toggle_title" msgid="5566469574224956142">"ಕ್ಯಾಮರಾ ಪ್ರವೇಶದ ಅನುಮತಿ"</string>
-    <string name="open_camera_permissions" msgid="301360297337141591">"ಕ್ಯಾಮರಾ‌ಗೆ ಆ್ಯಪ್‌ನ ಆ್ಯಕ್ಸೆಸ್"</string>
+    <string name="open_camera_permissions" msgid="301360297337141591">"ಕ್ಯಾಮರಾ‌ಗೆ ಆ್ಯಪ್‌ನ ಪ್ರವೇಶ"</string>
     <string name="camera_physical_privacy_enabled_title" msgid="1944155695921165511">"ಕ್ಯಾಮರಾ ಪ್ರವೇಶವನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
     <string name="camera_physical_privacy_enabled_text" msgid="6692088634676282779">"ನಿರ್ಬಂಧವನ್ನು ತೆಗೆದುಹಾಕಲು, ಕ್ಯಾಮರಾಗೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸುವುದಕ್ಕಾಗಿ ನಿಮ್ಮ ಸಾಧನದ ಗೌಪ್ಯತೆ ಸ್ವಿಚ್ ಅನ್ನು ಕ್ಯಾಮರಾ ಆನ್ ಸ್ಥಾನಕ್ಕೆ ಸರಿಸಿ."</string>
     <string name="mic_toggle_info_title" msgid="1086545614315873599">"ಮೈಕ್ರೊಫೋನ್‌ ಪ್ರವೇಶದ ಅನುಮತಿ: <xliff:g id="SENSOR_STATE">%s</xliff:g>"</string>
@@ -696,9 +670,9 @@
     <string name="palette_color_purple" msgid="2123828754639683555">"ನೇರಳೆ"</string>
     <string name="palette_color_gray" msgid="4014534773994261194">"ಬೂದು"</string>
     <string name="accessibility_shortcut" msgid="5856158637840030531">"ಪ್ರವೇಶ ಶಾರ್ಟ್‌ಕಟ್‌"</string>
-    <string name="accessibility_shortcut_enable" msgid="6603542432267329986">"ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ಶಾರ್ಟ್‌ಕಟ್‌ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="accessibility_shortcut_enable" msgid="6603542432267329986">"ಪ್ರವೇಶಿಸುವಿಕೆ ಶಾರ್ಟ್‌ಕಟ್‌ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="accessibility_shortcut_service" msgid="2053250146891420311">"ಶಾರ್ಟ್‌ಕಟ್ ಸೇವೆ"</string>
-    <string name="accessibility_shortcut_description" msgid="2050424178481510046">"ಶಾರ್ಟ್‌ಕಟ್ ಆನ್ ಆಗಿರುವಾಗ, 3 ಸೆಕೆಂಡ್‌ಗಳ ಕಾಲ ಹಿಂದಿನ ಮತ್ತು ಕೆಳಗಿನ ಬಟನ್‌ಗಳನ್ನು ಒತ್ತುವುದು ಆ್ಯಕ್ಸೆಸ್ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಆರಂಭಿಸುತ್ತದೆ."</string>
+    <string name="accessibility_shortcut_description" msgid="2050424178481510046">"ಶಾರ್ಟ್‌ಕಟ್ ಆನ್ ಆಗಿರುವಾಗ, 3 ಸೆಕೆಂಡ್‌ಗಳ ಕಾಲ ಹಿಂದಿನ ಮತ್ತು ಕೆಳಗಿನ ಬಟನ್‌ಗಳನ್ನು ಒತ್ತುವುದು ಪ್ರವೇಶ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಆರಂಭಿಸುತ್ತದೆ."</string>
     <string name="accessibility_captions" msgid="3411554568812306549">"ಶೀರ್ಷಿಕೆಗಳು"</string>
     <string name="accessibility_captions_description" msgid="3827820027578548160">"ವೀಡಿಯೊದಲ್ಲಿ ಮುಚ್ಚಿದ ಶೀರ್ಷಿಕೆ ಪಠ್ಯದ ಓವರ್‌ಲೇಗಾಗಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="captions_display" msgid="2598662495450633375">"ಪ್ರದರ್ಶನ"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"ವೀಕ್ಷಿಸುವಾಗ ಡಿಸ್‌ಪ್ಲೇ ಆಫ್ ಆಗುವುದನ್ನು ತಡೆಯಲು ಖಚಿತಪಡಿಸಿ ಏಕೆಂದರೆ ಅದು ಹೆಚ್ಚಿನ ಶಕ್ತಿಯನ್ನು ಬಳಸಬಹುದು."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"ನಿಷ್ಕ್ರಿಯವಾಗಿರುವಾಗ"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"ವೀಕ್ಷಿಸುತ್ತಿರುವಾಗ"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಫ್ ಮಾಡಿ"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"ನಿಷ್ಕ್ರಿಯವಾಗಿರುವಾಗ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಫ್ ಮಾಡಿ"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"ವೀಕ್ಷಿಸುವಾಗ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಫ್ ಮಾಡಿ"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"ಟಿವಿಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಫ್ ಮಾಡಿ"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"ನಿಷ್ಕ್ರಿಯವಾಗಿರುವಾಗ ಟಿವಿಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಫ್ ಮಾಡಿ"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"ವೀಕ್ಷಿಸುವಾಗ ಟಿವಿಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಫ್ ಮಾಡಿ"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"ನಿಷ್ಕ್ರಿಯವಾಗಿರುವಾಗ\" ಎಂಬ ಟೈಮರ್ \"ವೀಕ್ಷಿಸುತ್ತಿರುವಾಗ\" ಎಂಬ ಟೈಮರ್‌ಗಿಂತ ಕಡಿಮೆಯಿರಬೇಕು"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"ವೀಕ್ಷಿಸುತ್ತಿರುವಾಗ\" ಎಂಬ ಟೈಮರ್, \"ನಿಷ್ಕ್ರಿಯವಾಗಿರುವಾಗ\" ಎಂಬ ಟೈಮರ್‌ಗಿಂತ ಹೆಚ್ಚಿರಬೇಕು"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"ಸ್ಟ್ಯಾಂಡ್‌ಬೈ ಮೋಡ್‌ನಲ್ಲಿ ನೆಟ್‌ವರ್ಕ್ ಕನೆಕ್ಷನ್ ಅನ್ನು ಮಿತಿಗೊಳಿಸಿ"</string>
@@ -1012,7 +986,7 @@
     <string name="manage_keyboards" msgid="7983890675377321912">"ಕೀಬೋರ್ಡ್‌ಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
     <string name="app_permission_summary_allowed" msgid="5359622119044147500">"ಅನುಮತಿಸಲಾಗಿದೆ"</string>
     <string name="app_permission_summary_not_allowed" msgid="5131611341738385303">"ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ"</string>
-    <string name="usage_access" msgid="8402350645248312782">"ಬಳಕೆ ಆ್ಯಕ್ಸೆಸ್"</string>
+    <string name="usage_access" msgid="8402350645248312782">"ಬಳಕೆ ಪ್ರವೇಶ"</string>
     <string name="usage_access_description" msgid="3276026988575551587">"ಬಳಕೆ ಪ್ರವೇಶವು ನೀವು ಇತರ ಯಾವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬಳಸುತ್ತಿರುವಿರಿ ಮತ್ತು ಎಷ್ಟು ಬಾರಿ ಎಂಬುದನ್ನು ಅಲ್ಲದೆ ನಿಮ್ಮ ವಾಹಕ, ಭಾಷೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಹಾಗೂ ಇತರ ವಿವರಗಳನ್ನು ಟ್ರ್ಯಾಕ್ ಮಾಡಲು ಅನುಮತಿಸುತ್ತದೆ."</string>
     <string name="high_power_apps" msgid="5841073958519976562">"ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಷನ್‌"</string>
     <string name="high_power_apps_description" msgid="8651692364795060525">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಆಪ್ಟಿಮೈಸ್‌ ಮಾಡಿ"</string>
@@ -1020,33 +994,33 @@
     <string name="high_power_on" msgid="3120162683093360951">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗಿಲ್ಲ"</string>
     <string name="high_power_off" msgid="3588854600942236231">"ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಆಪ್ಟಿಮೈಸ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="high_power_system" msgid="6263052626979462255">"ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಷನ್‌ ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="manage_notification_access_title" msgid="8659254371564990084">"ನೋಟಿಫಿಕೇಶನ್ ಆ್ಯಕ್ಸೆಸ್"</string>
-    <string name="no_notification_listeners" msgid="5119406452675724448">"ಯಾವುದೇ ಸ್ಥಾಪಿಸಿದ ಆ್ಯಪ್‍ಗಳು ನೋಟಿಫಿಕೇಶನ್ ಆ್ಯಕ್ಸೆಸ್ ಅನ್ನು ವಿನಂತಿಸಿಲ್ಲ."</string>
+    <string name="manage_notification_access_title" msgid="8659254371564990084">"ಅಧಿಸೂಚನೆ ಪ್ರವೇಶ"</string>
+    <string name="no_notification_listeners" msgid="5119406452675724448">"ಯಾವುದೇ ಸ್ಥಾಪಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಧಿಸೂಚನೆ ಪ್ರವೇಶವನ್ನು ವಿನಂತಿಸಿಲ್ಲ."</string>
     <string name="notification_listener_security_warning_summary" msgid="8602907284276088658">"ಸಂಪರ್ಕ ಹೆಸರುಗಳು ಮತ್ತು ನೀವು ಸ್ವೀಕರಿಸುವ ಸಂದೇಶಗಳ ಪಠ್ಯದಂತಹ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿ ಸೇರಿದಂತೆ ಈ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಎಲ್ಲ ಅಧಿಸೂಚನೆಗಳನ್ನು ಓದಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ. ಇವುಗಳಿಗೆ ಅಧಿಸೂಚನೆಗಳನ್ನು ವಜಾ ಮಾಡಲು ಅಥವಾ ಅವುಗಳು ಹೊಂದಿರುವಂತಹ ಕ್ರಿಯೆ ಬಟನ್‌ಗಳನ್ನು ಟ್ರಿಗ್ಗರ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ."</string>
     <string name="default_notification_access_package_summary" msgid="1354775994781420222">"ಸಿಸ್ಟಂಗೆ ಅಗತ್ಯವಿದೆ"</string>
-    <string name="directory_access" msgid="7338555825237012006">"ಡೈರೆಕ್ಟರಿ ಆ್ಯಕ್ಸೆಸ್"</string>
+    <string name="directory_access" msgid="7338555825237012006">"ಡೈರೆಕ್ಟರಿ ಪ್ರವೇಶ"</string>
     <string name="directory_access_description" msgid="3630855858552422012">"ಕೆಲವು ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಪ್ರವೇಶಿಸಲು ಈ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಅನುಮತಿ ಇದೆ."</string>
     <string name="directory_on_volume" msgid="5628089584970521703">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
     <string name="system_alert_window_settings" msgid="5790572489650085051">"ಇತರ ಅಪ್ಲಿಕೇಶನ್ ಮೇಲೆ ಡಿಸ್‌ಪ್ಲೇ"</string>
-    <string name="permit_draw_overlay" msgid="5312730681030266735">"‍ಇತರ ಆ್ಯಪ್ ಮೇಲೆ ಡಿಸ್‌ಪ್ಲೇ ಮಾಡಲು ಅನುಮತಿಸಿ"</string>
+    <string name="permit_draw_overlay" msgid="5312730681030266735">"‍ಇತರ ಅಪ್ಲಿಕೇಶನ್ ಮೇಲೆ ಡಿಸ್‌ಪ್ಲೇ ಮಾಡಲು ಅನುಮತಿಸಿ"</string>
     <string name="allow_overlay_description" msgid="5152329837278240259">"ನೀವು ಬಳಸುತ್ತಿರುವ ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಮೇಲೆ ಪ್ರದರ್ಶಿಸಲು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿ ನೀಡಿ. ನೀವು ಆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬಳಸುವುದರ ಮೇಲೆ ಇದು ಪರಿಣಾಮ ಬೀರಬಹುದು ಅಥವಾ ಅವು ಕಾಣಿಸುವ ಅಥವಾ ವರ್ತಿಸುವ ರೀತಿಯನ್ನು ಬದಲಾಯಿಸಬಹುದು."</string>
     <string name="write_system_settings" msgid="4284654265954461890">"ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್‍ಗಳನ್ನು ಮಾರ್ಪಡಿಸಿ"</string>
     <string name="write_settings_title" msgid="2361816483383105754">"ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮಾರ್ಪಡಿಸಬಹುದು"</string>
     <string name="write_settings_description" msgid="7382397926674265937">"ಈ ಅನುಮತಿಯು ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
     <string name="write_settings_on" msgid="71675710746513956">"ಹೌದು"</string>
     <string name="write_settings_off" msgid="6730113471695092167">"ಇಲ್ಲ"</string>
-    <string name="manage_external_storage_title" msgid="8139593207533811077">"ಎಲ್ಲಾ ಫೈಲ್‌ಗಳ ಆ್ಯಕ್ಸೆಸ್"</string>
+    <string name="manage_external_storage_title" msgid="8139593207533811077">"ಎಲ್ಲಾ ಫೈಲ್‌ಗಳ ಪ್ರವೇಶ"</string>
     <string name="permit_manage_external_storage" msgid="1776899171934627417">"ಎಲ್ಲಾ ಫೈಲ್‌ ನಿರ್ವಹಿಸಲು, ಪ್ರವೇಶಕ್ಕೆ ಅನುಮತಿಸಿ"</string>
     <string name="allow_manage_external_storage_description" msgid="4288250228151617611">"ಈ ಸಾಧನ ಅಥವಾ ಕನೆಕ್ಟ್ ಮಾಡಿದ ಶೇಖರಣಾ ವಾಲ್ಯೂಮ್‌ಗಳಲ್ಲಿ ಎಲ್ಲಾ ಫೈಲ್‌ಗಳನ್ನು ಓದಲು, ಮಾರ್ಪಡಿಸಲು ಮತ್ತು ಅಳಿಸಲು ಈ ಆ್ಯಪ್‌ಗೆ ಅನುಮತಿಸಿ. ಅನುಮತಿಸಿದರೆ, ಬಳಕೆದಾರರ ಪೂರ್ವಾನುಮತಿ ಇಲ್ಲದೆ ಆ್ಯಪ್‌ಗಳು ಫೈಲ್‌ಗಳನ್ನು ಪ್ರವೇಶಿಸಬಹುದು."</string>
     <string name="picture_in_picture_title" msgid="2636935591386702348">"ಚಿತ್ರದಲ್ಲಿ ಚಿತ್ರ"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="3688997906817583854">"ಚಿತ್ರದಲ್ಲಿ ಚಿತ್ರಕ್ಕೆ ಅನುಮತಿಸಿ"</string>
     <string name="picture_in_picture_empty_text" msgid="4370198922852736600">"ಯಾವುದೇ ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಚಿತ್ರದಲ್ಲಿ ಚಿತ್ರವನ್ನು ಬೆಂಬಲಿಸುತ್ತಿಲ್ಲ"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="3296649114939705896">"ಅಪ್ಲಿಕೇಶನ್ ತೆರೆದೇ ಇರುವಾಗ ಅಥವಾ ನೀವು ಈ ಅಪ್ಲಿಕೇಶನ್ ತೊರೆದ ಬಳಿಕ (ಉದಾಹರಣೆಗೆ, ವೀಡಿಯೊ ವೀಕ್ಷಿಸುವುದನ್ನು ಮುಂದುವರಿಸಲು), ಚಿತ್ರದಲ್ಲಿ ಚಿತ್ರ ವಿಂಡೋ ರಚಿಸಲು ಈ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಅನುಮತಿ ನೀಡಿ. ನೀವು ಬಳಸುತ್ತಿರುವ ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಮೇಲೆ ಈ ವಿಂಡೋ ಡಿಸ್‌ಪ್ಲೇ ಆಗುತ್ತದೆ."</string>
-    <string name="alarms_and_reminders_description" msgid="4063972350154624500">"ಅಲಾರಂಗಳನ್ನು ಸೆಟ್ ಮಾಡಲು ಮತ್ತು ಸಮಯ-ಸೂಕ್ಷ್ಮ ಈವೆಂಟ್‌ಗಳನ್ನು ನಿಗದಿಪಡಿಸಲು ಆ್ಯಪ್‌ಗಳಿಗೆ ಅನುಮತಿಸಿ. ಇದು ಹಿನ್ನೆಲೆಯಲ್ಲಿ ರನ್ ಆಗಲು ಆ್ಯಪ್‌ಗಳಿಗೆ ಅನುಮತಿಸುತ್ತದೆ, ಆದ್ದರಿಂದ ಹೆಚ್ಚಿನ ಪವರ್ ಬಳಕೆಯಾಗಬಹುದು.\n\nಈ ಅನುಮತಿ ಆಫ್ ಆಗಿದ್ದರೆ, ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಅಲಾರಂಗಳು ಮತ್ತು ಈ ಆ್ಯಪ್ ನಿಗದಿಪಡಿಸಿದ ಸಮಯಾಧಾರಿತ ಈವೆಂಟ್‌ಗಳು ಕೆಲಸ ಮಾಡುವುದಿಲ್ಲ."</string>
+    <string name="alarms_and_reminders_description" msgid="4063972350154624500">"ಅಲಾರಂಗಳನ್ನು ಸೆಟ್ ಮಾಡಲು ಮತ್ತು ಸಮಯ-ಸೂಕ್ಷ್ಮ ಈವೆಂಟ್‌ಗಳನ್ನು ನಿಗದಿಪಡಿಸಲು ಆ್ಯಪ್‌ಗಳಿಗೆ ಅನುಮತಿಸಿ. ಇದು ಹಿನ್ನೆಲೆಯಲ್ಲಿ ರನ್ ಆಗಲು ಆ್ಯಪ್‌ಗಳಿಗೆ ಅನುಮತಿಸುತ್ತದೆ, ಅದರಿಂದ ಹೆಚ್ಚಿನ ಪವರ್ ಬಳಕೆಯಾಗಬಹುದು.\n\nಈ ಅನುಮತಿ ಆಫ್ ಆಗಿದ್ದರೆ, ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಅಲಾರಂಗಳು ಮತ್ತು ಈ ಆ್ಯಪ್ ನಿಗದಿಪಡಿಸಿದ ಸಮಯ-ಸೂಕ್ಷ್ಮ ಈವೆಂಟ್‌ಗಳು ಕೆಲಸ ಮಾಡುವುದಿಲ್ಲ."</string>
     <string name="turn_screen_on_title" msgid="5293798529284629011">"ಸ್ಕ್ರೀನ್ ಅನ್ನು ಆನ್ ಮಾಡಿ"</string>
     <string name="allow_turn_screen_on" msgid="4903401106871656521">"ಸ್ಕ್ರೀನ್ ಅನ್ನು ಆನ್ ಮಾಡಲು ಅನುಮತಿಸಿ"</string>
     <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"ಸ್ಕ್ರೀನ್ ಅನ್ನು ಆನ್ ಮಾಡಲು ಆ್ಯಪ್‌ಗೆ ಅನುಮತಿಸಿ. ಅನುಮತಿಸಿದರೆ, ನಿಮ್ಮ ಅಗತ್ಯವಿಲ್ಲದಿದ್ದಾಗಲೂ ಆ್ಯಪ್ ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ಸ್ಕ್ರೀನ್ ಅನ್ನು ಆನ್ ಮಾಡಬಹುದು."</string>
-    <string name="special_access" msgid="21806055758289916">"ವಿಶೇಷ ಅಪ್ಲಿಕೇಶನ್ ಆ್ಯಕ್ಸೆಸ್"</string>
+    <string name="special_access" msgid="21806055758289916">"ವಿಶೇಷ ಅಪ್ಲಿಕೇಶನ್ ಪ್ರವೇಶ"</string>
     <string name="string_concat" msgid="5213870180216051497">"<xliff:g id="PART1">%1$s</xliff:g>, <xliff:g id="PART2">%2$s</xliff:g>"</string>
     <string name="audio_category" msgid="6143623109624947993">"ಆಡಿಯೋ"</string>
     <string name="record_audio" msgid="5035689290259575229">"ಆಡಿಯೋ ರೆಕಾರ್ಡ್‌ ಮಾಡಿ"</string>
@@ -1078,9 +1052,9 @@
     <string name="disabled_by_policy_title_suspend_packages" msgid="6500185610058872758">"ಈ ಅಪ್ಲಿಕೇಶನ್ ತೆರೆಯಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="default_admin_support_msg" msgid="7913455019068370350">"ನಿಮಗೆ ಯಾವುದೇ ಪ್ರಶ್ನೆಗಳಿದ್ದರೆ, ನಿಮ್ಮ IT ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ"</string>
     <string name="admin_support_more_info" msgid="9053232166115098434">"ಇನ್ನಷ್ಟು ವಿವರಗಳು"</string>
-    <string name="admin_profile_owner_message" msgid="5729169873349157622">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಅನುಮತಿಗಳು, ಕಾರ್ಪೊರೇಟ್‌ ಆ್ಯಕ್ಸೆಸ್, ನೆಟ್‌ವರ್ಕ್‌ ಚಟುವಟಿಕೆ ಮತ್ತು ಸಾಧನದ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಂತೆ ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್‌ಗೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string>
-    <string name="admin_profile_owner_user_message" msgid="6431405126322617268">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಅನುಮತಿಗಳು, ಕಾರ್ಪೊರೇಟ್‌ ಆ್ಯಕ್ಸೆಸ್, ನೆಟ್‌‌ವರ್ಕ್‌ ಚಟುವಟಿಕೆ ಮತ್ತು ಸಾಧನದ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಂತೆ ಈ ಬಳಕೆದಾರರಿಗೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string>
-    <string name="admin_device_owner_message" msgid="1935507216776040907">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಅನುಮತಿಗಳು, ಕಾರ್ಪೊರೇಟ್‌ ಆ್ಯಕ್ಸೆಸ್, ನೆಟ್‌ವರ್ಕ್‌ ಚಟುವಟಿಕೆ ಮತ್ತು ಸಾಧನದ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಂತೆ ಈ ಸಾಧನಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string>
+    <string name="admin_profile_owner_message" msgid="5729169873349157622">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಅನುಮತಿಗಳು, ಕಾರ್ಪೊರೇಟ್‌ ಪ್ರವೇಶ, ನೆಟ್‌ವರ್ಕ್‌ ಚಟುವಟಿಕೆ ಮತ್ತು ಸಾಧನದ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಂತೆ ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್‌ಗೆ ಸಂಬಂಧಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string>
+    <string name="admin_profile_owner_user_message" msgid="6431405126322617268">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಅನುಮತಿಗಳು, ಕಾರ್ಪೊರೇಟ್‌ ಪ್ರವೇಶ, ನೆಟ್‌‌ವರ್ಕ್‌ ಚಟುವಟಿಕೆ ಮತ್ತು ಸಾಧನದ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಂತೆ ಈ ಬಳಕೆದಾರರಿಗೆ ಸಂಬಂಧಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string>
+    <string name="admin_device_owner_message" msgid="1935507216776040907">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಅನುಮತಿಗಳು, ಕಾರ್ಪೊರೇಟ್‌ ಪ್ರವೇಶ, ನೆಟ್‌ವರ್ಕ್‌ ಚಟುವಟಿಕೆ ಮತ್ತು ಸಾಧನದ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಂತೆ ಈ ಸಾಧನಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string>
     <string name="remove_managed_profile_label" msgid="8950011141359605612">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್‌ ತೆಗೆದುಹಾಕಿ"</string>
     <string name="active_device_admin_msg" msgid="185537304726228624">"ಸಾಧನ ನಿರ್ವಹಣೆ ಅಪ್ಲಿಕೇಶನ್"</string>
     <string name="remove_device_admin" msgid="2623866073546295104">"ಈ ಸಾಧನ ನಿರ್ವಹಣಾ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"ಪವರ್ ಆನ್ ನಡವಳಿಕೆ"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"ಮರುಹೊಂದಿಸಿ"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"ಇಥರ್ನೆಟ್ ಜೋಡಣೆ ಕೋಡ್‌"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"ವಿದ್ಯುತ್ ಮೋಡ್‌ಗಳು"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"ಟಿವಿ ಬಳಕೆಯಲ್ಲಿ ಇಲ್ಲದಿದ್ದಾಗ ವಿದ್ಯುತ್ ದಕ್ಷತೆಯನ್ನು ಸುಧಾರಿಸಿ"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"ಇವುಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ಈ ಮೋಡ್, ಸಾಧನದ ವಿದ್ಯುತ್ ಬಳಕೆಯನ್ನು ಹೆಚ್ಚಿಸಬಹುದು ಎಂಬುದನ್ನು ಗಮನಿಸಿ."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
 </resources>
diff --git a/Settings/res/values-ko/energy-modes.xml b/Settings/res/values-ko/energy-modes.xml
deleted file mode 100644
index 33a74313d..000000000
--- a/Settings/res/values-ko/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"필수 네트워크 기능"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"적은 에너지 사용량"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"TV를 사용하지 않을 때는 네트워크 연결을 사용 중지합니다."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"중요 업데이트 및 기능"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"권장 네트워크 기능"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"최적화된 에너지 사용"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"네트워크를 통해 TV의 절전 모드를 해제하는 기능(네트워크 대기 모드)을 사용 설정합니다."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[기능 1 삽입]"</item>
-    <item msgid="8724721267222341891">"[기능 2 삽입]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"추가 네트워크 기능"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"에너지 사용량 증가"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"이 옵션은 TV를 사용하지 않을 때도 권장 기능 외에 추가 기능을 사용 설정하며, 이에 따라 에너지 사용량이 증가할 수 있습니다."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[기능 1 삽입]"</item>
-    <item msgid="170760143032597722">"[기능 2 삽입]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-ko/strings.xml b/Settings/res/values-ko/strings.xml
index 742a3fbf4..91deb8d5b 100644
--- a/Settings/res/values-ko/strings.xml
+++ b/Settings/res/values-ko/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"백업 및 복원"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"초기화"</string>
     <string name="device_calibration" msgid="2907914144048739705">"보정"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"전원 끄기 타이머"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"TV 전원을 끄는 타이머를 설정하여 에너지를 절약합니다."</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"전원 및 에너지"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"절전 설정"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"기기"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"형식 선택"</string>
@@ -151,40 +151,13 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"고급 소리 설정"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"게임 모드 허용"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"다이내믹 레인지 콘텐츠와 맞춤"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"이 옵션을 사용 설정하면 시스템에서 콘텐츠에 맞추어 다이내믹 레인지 형식을 전환합니다. 형식을 전환하는 중 검은색 화면이 표시될 수 있습니다.\n\n고급 디스플레이 설정을 클릭하여 더 많은 다이내믹 레인지 옵션을 확인하세요."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"선호하는 다이내믹 레인지"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"시스템 선호 전환"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"시스템에서 형식 전환을 관리하도록 함"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"이 옵션이 선택되면 시스템에서 디스플레이에 전송할 적절한 동적 범위를 결정하고 필요에 따라 콘텐츠를 이 동적 범위로 전환합니다."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"항상 콘텐츠 형식에 맞춤"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"강제 전환"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"원하는 형식으로 강제로 전환됩니다."</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"원하는 형식으로 강제로 전환됩니다. 강제로 전환하면 디스플레이 모드 또는 HDR 형식의 다른 설정에 영향을 미칠 수도 있습니다."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"항상 SDR로 전환"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"항상 <xliff:g id="HDR_TYPE">%s</xliff:g> 형식으로 전환"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"강제로 HDR을 출력하시겠습니까?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"기본적으로 <xliff:g id="HDR_TYPE">%s</xliff:g> 형식으로 강제 전환됩니다."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"디스플레이가 1,080p 60Hz 해상도에서 실행됩니다. 이 옵션은 4k 60Hz에서 실행될 때 내 디스플레이와 호환되지 않습니다."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"현재 해상도에서는 Dolby Vision이 지원되지 않습니다. Dolby Vision을 수동으로 사용 설정하면 디스플레이 해상도가 1080p 60Hz로 변경됩니다."</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"해상도를 1080p 60Hz로 변경하시겠습니까?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"항상 Dolby Vision으로 강제 전환"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"고급 디스플레이 설정의 HDR 포맷에서 Dolby Vision이 사용 중지되어 있을 때 Dolby Vision으로 강제 전환하면 다시 사용 설정됩니다."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"항상 HDR10으로 강제 전환"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"고급 디스플레이 설정의 HDR 포맷에서 HDR10이 사용 중지되어 있을 때 HDR10으로 강제 전환하면 다시 사용 설정됩니다."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"항상 HLG로 강제 전환"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"고급 디스플레이 설정의 HDR 포맷에서 HLG가 사용 중지되어 있을 때 HLG로 강제 전환하면 다시 사용 설정됩니다."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"항상 HDR10+로 강제 전환"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"고급 디스플레이 설정의 HDR 포맷에서 HDR10+가 사용 중지되어 있을 때 HDR10+로 강제 전환하면 다시 사용 설정됩니다."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"항상 SDR로 강제 전환"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"SDR로 강제 전환하면 고급 디스플레이 설정의 HDR 포맷에서 모든 포맷이 사용 중지됩니다."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"콘텐츠 프레임 속도 일치시키기"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"자동만"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"원활한 전환 사용"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"앱에서 요청하면 TV에서 원활한 전환을 실행할 수 있는 경우에만 기기에서 시청 중인 콘텐츠의 원래 프레임 속도에 출력을 맞춥니다."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"연결된 디스플레이에서 원활한 화면 재생 빈도 전환을 지원하지 않습니다. 이를 지원하는 디스플레이로 변경하지 않는 한 이 옵션은 아무런 영향을 미치지 않습니다."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"항상"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"원활한 전환 사용 안함"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"앱에서 요청할 경우 기기에서 시청 중인 콘텐츠의 원래 프레임 속도에 출력을 맞춥니다. 이로 인해 동영상 재생을 실행하거나 중지할 때 잠시 화면에 아무 내용도 나타나지 않을 수 있습니다."</string>
-    <string name="match_content_frame_rate_never" msgid="1678354793095148423">"콘텐츠 프레임 속도에 맞추지 않음"</string>
+    <string name="match_content_frame_rate_never" msgid="1678354793095148423">"사용 안함"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"앱에서 요청하더라도 기기에서는 시청 중인 콘텐츠의 원래 프레임 속도에 출력을 맞추려고 하지 않습니다."</string>
     <string name="font_scale_settings_title" msgid="4114019544800225980">"텍스트 크기 조정"</string>
     <string name="font_scale_item_detail" msgid="1558315053348778805">"<xliff:g id="SCALE">%1$d</xliff:g>%%로 크기 조정"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"해상도를 %1$s(으)로 변경하시겠습니까?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"지금부터 %1$s 해상도를 사용하려면 확인을 선택하세요."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision은 %1$s에서 지원되지 않으므로 \'고급 디스플레이 설정\'에서 사용 중지됩니다."</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"이 모드에서 지원하는 형식: %1$s\n일부 TV에서 더 많은 HDR 형식을 사용하려면 향상된 HDMI를 사용 설정해야 할 수 있습니다. TV 설정에서 지원 여부를 확인하세요."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"이 모드는 %1$s 유형을 지원합니다. 일부 TV에서 더 많은 HDR 형식을 사용하려면 향상된 HDMI를 사용 설정해야 할 수 있습니다. TV 설정에서 지원 여부를 확인하세요."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"취소"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"확인"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g>(<xliff:g id="REFRESH_RATE">%2$s</xliff:g>Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g>(<xliff:g id="REFRESH_RATE">%2$s</xliff:g>Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"캐시된 데이터를 지우시겠습니까?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"모든 앱의 캐시된 데이터가 지워집니다."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"조직에서 관리하는 기기입니다."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>에서 관리하는 기기입니다."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"자세히 알아보기"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{카메라 앱}other{카메라 앱}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"캘린더 앱"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"영상을 보는 동안 화면이 꺼지지 않도록 설정합니다. 설정하지 않으면 에너지 사용량이 증가할 수 있습니다."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"절전 모드 시"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"시청 시"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"자동 사용 중지"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"사용하지 않을 때 자동 사용 중지"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"시청 중에 자동 사용 중지"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"자동으로 TV 끄기"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"사용 중이 아닐 때 자동으로 TV 끄기"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"시청 중에 자동으로 TV 끄기"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\'절전 모드 시\' 타이머 시간은 \'시청 시\' 타이머 시간보다 짧아야 합니다."</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\'시청 시\' 타이머 시간은 \'절전 모드 시\' 타이머 시간보다 길어야 합니다."</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"대기 모드에서 네트워크 연결 제한"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"전원이 켜질 때 동작"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"초기화"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"이더넷 페어링 코드"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"에너지 모드"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"TV를 사용하지 않는 동안 에너지 효율 향상"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"사용 설정된 기능:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"이 모드로 인해 기기의 전력 소비량이 증가할 수 있습니다."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\'<xliff:g id="ENERGYMODENAME">%s</xliff:g>\' 사용 설정"</string>
 </resources>
diff --git a/Settings/res/values-ky/energy-modes.xml b/Settings/res/values-ky/energy-modes.xml
deleted file mode 100644
index 72c0c84c9..000000000
--- a/Settings/res/values-ky/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Тармактын керектүү функциялары"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Электр кубаты азыраак керектелет"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Сыналгы өчүп турганда тармактан ажыратыңыз."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Маанилүү жаңыртуулар жана функциялар"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Тармактын сунушталган функциялары"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Электр кубатынын колдонулушу оптималдаштырылды"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Сыналгыны тармак аркылуу ойготкон функцияларды күйгүзөт (тармактык күтүү режими)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Тармактын кошумча функциялары"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Электр кубаты көбүрөөк керектелет"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Сунушталган функцияларга кошумча, бул параметр сыналгы өчүп турганда электр кубатын көбүрөөк керектеген кошумча функцияларлы иштетет."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-ky/strings.xml b/Settings/res/values-ky/strings.xml
index ec1e83697..dd658e409 100644
--- a/Settings/res/values-ky/strings.xml
+++ b/Settings/res/values-ky/strings.xml
@@ -26,7 +26,7 @@
     <string name="action_off_title" msgid="3598665702863436597">"Өчүк"</string>
     <string name="action_on_description" msgid="9146557891514835767">"Күйүк"</string>
     <string name="action_off_description" msgid="1368039592272701910">"Өчүк"</string>
-    <string name="agree" msgid="8155497436593889753">"Жарайт"</string>
+    <string name="agree" msgid="8155497436593889753">"Макул"</string>
     <string name="disagree" msgid="7402998517682194430">"Жок"</string>
     <string name="enabled" msgid="5127188665060746381">"Күйүк"</string>
     <string name="disabled" msgid="4589065923272201387">"Өчүк"</string>
@@ -34,13 +34,13 @@
     <string name="allow" msgid="6982558814345894019">"Уруксат берүү"</string>
     <string name="deny" msgid="8291577308813053917">"Четке кагуу"</string>
     <string name="header_category_suggestions" msgid="106077820663753645">"Сунуштар"</string>
-    <string name="header_category_quick_settings" msgid="3785334008768367890">"Ыкчам параметрлер"</string>
+    <string name="header_category_quick_settings" msgid="3785334008768367890">"Ыкчам жөндөөлөр"</string>
     <string name="header_category_general_settings" msgid="3897615781153506434">"Жалпы жөндөөлөр"</string>
     <string name="dismiss_suggestion" msgid="6200814545590126814">"Сунушту четке кагуу"</string>
     <string name="hotwording_title" msgid="2606899304616599026">"\"Ok Google\" аныктоо функциясы"</string>
     <string name="hotwording_summary" msgid="2170375928302175449">"Google Жардамчы менен каалаган убакта сүйлөшүңүз"</string>
     <string name="header_category_device" msgid="3023893663454705969">"Түзмөк"</string>
-    <string name="header_category_preferences" msgid="3738388885555798797">"Жеке параметрлер"</string>
+    <string name="header_category_preferences" msgid="3738388885555798797">"Жеке жөндөөлөр"</string>
     <string name="header_category_accessories" msgid="6479803330480847199">"Пульттар жана аксессуарлар"</string>
     <string name="header_category_personal" msgid="7880053929985150368">"Жеке"</string>
     <string name="connect_to_network" msgid="4133686359319492392">"Тармакка туташуу"</string>
@@ -96,7 +96,7 @@
     <string name="overlay_security_slice_title" msgid="4895032817538300187"></string>
     <string name="update_slice_title" msgid="6553763903108611747"></string>
     <string name="all_apps_title" msgid="3717294436135280133">"Бардык колдонмолор"</string>
-    <string name="all_apps_show_system_apps" msgid="1260688031005374302">"Система колдонмолорун көрсөтүү"</string>
+    <string name="all_apps_show_system_apps" msgid="1260688031005374302">"Тутум колдонмолорун көрсөтүү"</string>
     <string name="all_apps_installed" msgid="8217778476185598971">"Орнотулган колдонмолор"</string>
     <string name="all_apps_other" msgid="4420174882983813158">"Системанын колдонмолору"</string>
     <string name="all_apps_disabled" msgid="2776041242863791053">"Өчүрүлгөн колдонмолор"</string>
@@ -105,15 +105,15 @@
     <string name="device_display_sound" msgid="7399153506435649193">"Дисплей жана добуш"</string>
     <string name="device_sound" msgid="8616320533559404963">"Үн"</string>
     <string name="device_surround_sound" msgid="1889436002598316470">"Айланадагы үндөр"</string>
-    <string name="device_sound_effects" msgid="2000295001122684957">"Система добуштары"</string>
+    <string name="device_sound_effects" msgid="2000295001122684957">"Тутум добуштары"</string>
     <string name="device_apps" msgid="2134756632245008919">"Колдонмолор"</string>
     <string name="device_storage" msgid="8540243547121791073">"Сактагыч"</string>
     <string name="device_reset" msgid="6115282675800077867">"Баштапкы абалга кайтаруу"</string>
     <string name="device_backup_restore" msgid="3634531946308269398">"Калыбына келтирүү жана камдык көчүрмөнү сактоо"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Баштапкы абалга кайтаруу"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Калибрдөө аяктады"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Өчүрүү таймери"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Сыналгыны өчүрүп, электр кубатын үнөмдөө үчүн таймерлерди коюңуз"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Кубат жана энергия"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Эко параметрлери"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Түзмөктөр"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Форматтарды тандоо"</string>
@@ -151,39 +151,12 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Өркүндөтүлгөн добуштун параметрлери"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Оюн режимине уруксат берүү"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Контенттин динамикалык диапазонуна дал келтирүү"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Бул параметр иштетилсе, контентке дал келүү үчүн тутум ар түрдүү динамикалык диазапондун форматтарына которулат. Форматка которулуп жатканда экран карарып калышы мүмкүн.\n\nДинамикалык диапазондун варианттарын көрүү үчүн Экрандын өркүндөтүлгөн параметрлерине өтүңүз."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Тандалган динамикалык диапазон"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Система тарабынан тандалган формат"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Формат өзгөртүүсүн тутум башкарсын"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Бул параметр тандалганда, тутум ылайыктуу динамикалык диапазонду таап, экраныңыздын форматына жараша мазмун форматын өзгөртүшү мүмкүн."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Ар дайым мазмундун форматына дал келет"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Башка форматка өзгөртүү"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Тандалган форматка өзгөртөт"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Тандалган форматка өзгөртүлсүн. Өзгөртүү Көрсөтүү режиминдеги же HDR форматындагы башка параметрлерге таасир этиши мүмкүн."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Ар дайым SDR сакталсын"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Ар дайым <xliff:g id="HDR_TYPE">%s</xliff:g> форматы сакталсын"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"HDR форматына өзгөртүүнү улантасызбы?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Демейки шартта формат <xliff:g id="HDR_TYPE">%s</xliff:g> форматына өзгөртүлөт."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Экраныңыз 1080p 60 Гц дааналыгында көрсөтүлөт. Экраныңыз 4K 60 Гц дааналыгында көрсөтүлсө, бул параметр туура келбейт."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision учурдагы резолюцияда колдоого алынбайт. Эгер Dolby Vision форматын кол менен иштетсеңиз, экрандын резолюциясы 1080p 60 Гц болуп өзгөрөт"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Резолюция 1080p 60 Гц болуп өзгөрсүнбү?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Dolby Vision форматына ар дайым мажбурлап өзгөртүү"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Эгер Экрандын өркүндөтүлгөн параметрлериндеги HDR форматтарында Dolby Vision өчүрүлгөн болсо, башка форматка мажбурлап өзгөртүү аны кайрадан иштетет."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"HDR10 форматына ар дайым мажбурлап өзгөртүү"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Эгер Экрандын өркүндөтүлгөн параметрлериндеги HDR форматтарында HDR10 өчүрүлгөн болсо, башка форматка мажбурлап өзгөртүү аны кайрадан иштетет."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"HLG форматына ар дайым мажбурлап өзгөртүү"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Эгер Экрандын өркүндөтүлгөн параметрлериндеги HDR форматтарында HLG өчүрүлгөн болсо, башка форматка мажбурлап өзгөртүү аны кайрадан иштетет."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"HDR10+ форматына ар дайым мажбурлап өзгөртүү"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Эгер Экрандын өркүндөтүлгөн параметрлериндеги HDR форматтарында HDR10+ өчүрүлгөн болсо, башка форматка мажбурлап өзгөртүү аны кайрадан иштетет."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"SDR форматына ар дайым мажбурлап өзгөртүү"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"SDR форматына мажбурлап өзгөртүү Экрандын өркүндөтүлгөн параметрлеринде бардык HDR форматтарын өчүрөт."</string>
-    <string name="match_content_frame_rate_title" msgid="153291168560947689">"Контенттин кадрлар жыштыгын колдонуу"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Жай которулуу менен гана"</string>
-    <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Эгер колдонмо суранса, түзмөгүңүз видеону баштапкы кадрлар жыштыгы боюнча көрсөтөт, бирок ал үчүн сыналгы үзгүлтүксүз өтүшү керек."</string>
+    <string name="match_content_frame_rate_title" msgid="153291168560947689">"Мазмундун кадрлар жыштыгын дал келтирүү"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Үзгүлтүксүз"</string>
+    <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Эгер колдонмо суранса, түзмөгүңүз ойнотулуп жаткан видеонун баштапкы кадрларынын жыштыгын тууралайт. Бул TV үзгүлтүксүз өтүүнү аткара алса гана мүмкүн."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Туташкан экранда жаңыруу жыштыгына жай которулуу мүмкүн эмес. Бул параметрди иштетүү үчүн колдоого алынган экранга өтүңүз."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Ар дайым"</string>
-    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Эгер колдонмо суранса, түзмөгүңүз видеону баштапкы кадрлар жыштыгы боюнча көрсөтөт. Видео көрүнүп жатканда же көрүнүп бүткөндөн кийин экран бир азга өчүп калышы мүмкүн."</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Үзгүлтүксүз эмес"</string>
+    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Эгер колдонмо суранса, түзмөгүңүз ойнотулуп жаткан видеонун баштапкы кадрларынын жыштыгын тууралайт. Видеону ойноткучка кирип же чыгып жатканда экран бир секундга өчүп калышы мүмкүн."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Эч качан"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Колдонмо суранган учурда да, түзмөгүңүз ойнотулуп жаткан видеонун баштапкы кадрларынын жыштыгын тууралоого эч качан аракет кылбайт."</string>
     <string name="font_scale_settings_title" msgid="4114019544800225980">"Тексттин өлчөмүн тууралоо"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Резолюция %1$s болуп өзгөрсүнбү?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Мындан ары %1$s колдонуу үчүн \"Жарайт\" баскычын басыңыз."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s режиминде Dolby Vision колдоого алынбайт жана \"Экрандын өркүндөтүлгөн параметрлеринде\" өчүрүлөт"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Бул режимде төмөнкү форматтар колдоого алынат: %1$s\nАйрым сыналгыларда кошумча HDR форматтарын иштетүү үчүн Жакшыртылган HDMI\'ды күйгүзүү керектелиши мүмкүн. Сыналгынын параметрлерине өтүп, анын колдоого алынарын текшериңиз."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Бул режимде %1$s колдоого алынат. Айрым сыналгыларда кошумча HDR форматтарын иштетүү үчүн Жакшыртылган HDMI\'ды күйгүзүү керектелиши мүмкүн. Сыналгынын параметрлерине өтүп, анын колдоого алынарын текшериңиз."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Жокко чыгаруу"</string>
-    <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Жарайт"</string>
+    <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Макул"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Герц"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Герц)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Герц)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Кеш берилиштери тазалансынбы?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Бул бардык колдонмолордун кештелген берилиштерин тазалайт."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -263,7 +236,7 @@
     <string name="bluetooth_known_devices_category" msgid="6895470515631452961">"Көмөкчү жабдыктар"</string>
     <string name="bluetooth_official_remote_category" msgid="5817814488268307170">"Пульт"</string>
     <string name="bluetooth_official_remote_entry_title" msgid="6699700335229570038">"Пульттун параметрлери"</string>
-    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"Пульттун баскычтарын тууралоо"</string>
+    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"Пульттун баскычтарын жөндөө"</string>
     <string name="bluetooth_ir_entry_subtitle" msgid="4606207128353416151">"Сыналгыларда, ресиверлерде жана үн такталарында үндүн катуулугун, күйгүзүү/өчүрүүнү жана киргизүүнү башкаруу"</string>
     <string name="bluetooth_connect_action_title" msgid="7715342395313781643">"Туташтыруу"</string>
     <string name="bluetooth_connect_confirm" msgid="4769958536295137386">"%1$s түзмөгүнө туташуу"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Бул түзмөк уюмуңуз тарабынан башкарылат."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Бул түзмөк <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> тарабынан башкарылат."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Кеңири маалымат"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Камера колдонмосу}other{Камера колдонмолору}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Жылнаама колдонмосу"</string>
@@ -389,7 +363,7 @@
     <string name="manual" msgid="5683935624321864999">"Кол менен"</string>
     <string name="regulatory_information" msgid="9107675969694713391">"Башкаруучу маалыматтар"</string>
     <string name="device_feedback" msgid="4871903271442960465">"Түзмөк тууралуу пикир билдирүү"</string>
-    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4641790432171693921">"Иш системасын жүктөгүчтүн кулпусу мурунтан эле ачылган"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4641790432171693921">"Иш тутумун жүктөгүчтүн кулпусу мурунтан эле ачылган"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="2979556699380115576">"Адегенде Интернетке туташыңыз"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="1946089732305102622">"Интернетке туташыңыз же операторуңуз менен байланышыңыз"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="5634005787486307657">"Байланыш оператору кулпулаган түзмөктөрдө жеткиликтүү эмес"</string>
@@ -411,7 +385,7 @@
     <string name="webview_license_title" msgid="5370270485188947540">"System WebView уруксаттамасы"</string>
     <string name="consumer_information_title" msgid="7729729568416672733">"Кардарга арналган маалымат"</string>
     <string name="consumer_information_message" msgid="205236637689468764">"Android TV кызматындагы мазмун колдонмолорду иштеп чыгуучулар жана киностудиялар сыяктуу үчүнчү тарапттагы өнөктөштөр тарабынан камсыздалат. Көбүрөөк маалымат алуу үчүн "<a href="g.co/tv/androidtvinfo">"g.co/tv/androidtvinfo"</a>" бөлүмүнө өтүңүз"</string>
-    <string name="consumer_information_button_ok" msgid="6979480064600038080">"Жарайт"</string>
+    <string name="consumer_information_button_ok" msgid="6979480064600038080">"Макул"</string>
   <string-array name="wifi_signal_strength">
     <item msgid="4475363344103354364">"Начар"</item>
     <item msgid="2098818614362343532">"Орто"</item>
@@ -475,7 +449,7 @@
     <string name="wifi_connect" msgid="2206086690065242121">"Туташуу"</string>
     <string name="wifi_forget_network" msgid="4634016112624305571">"Тармак унутулсун"</string>
     <string name="wifi_forget_network_description" msgid="4146715475962713899">"Ушуну менен бул тармакка туташуу үчүн колдонулган маалымат, ошондой эле сакталган сырсөз тазаланат"</string>
-    <string name="wifi_scan_qr_code_description" msgid="6620444691131671132">" Мобилдик телефондун камерасы менен QR кодун скандап, Wi-Fi тармагына туташып, нускамаларды аткарыңыз.\n \n "<b>"Android телефонунан"</b>" Параметрлерге -&gt; Тармак жана Интернет -&gt; Wi-Fi -&gt; бөлүмүнө өтүп, Wi-Fi -&gt; Өркүндөтүлгөн -&gt; Түзмөктү кошууну тандап, QR кодун скандаңыз."</string>
+    <string name="wifi_scan_qr_code_description" msgid="6620444691131671132">" Мобилдик телефондун камерасы менен QR кодун скандап, Wi-Fi тармагына туташып, нускамаларды аткарыңыз.\n \n "<b>"Android телефонунан"</b>" Жөндөөлөргө -&gt; Тармак жана Интернет -&gt; Wi-Fi -&gt; бөлүмүнө өтүп, Wi-Fi -&gt; Өркүндөтүлгөн -&gt; Түзмөктү кошууну тандап, QR кодун скандаңыз."</string>
     <string name="wifi_scan_qr_code_back_description" msgid="8830716278283379280">"Жокко чыгаруу үчүн \"Артка\" баскычын басыңыз"</string>
     <string name="wifi_action_ok" msgid="6257483288047397880">"OK"</string>
     <string name="wifi_setup_action_dont_change_network" msgid="2999582059217623090">"Улантуу"</string>
@@ -931,9 +905,9 @@
     <string name="device_apps_app_management_storage_used_desc" msgid="8928632612101487179">"<xliff:g id="VOLUME">%2$s</xliff:g> ичинен <xliff:g id="SIZE">%1$s</xliff:g> колдонулат"</string>
     <string name="device_apps_app_management_clear_data" msgid="7305471678286735600">"Маалыматты өчүрүү"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="170972356946852847">"Бул колдонмонун файлдар, жөндөөлөр, каттоо эсептери, маалыматтар базасы \nсыяктуу бардык маалыматтары биротоло жок болот."</string>
-    <string name="device_apps_app_management_clear_default" msgid="4566187319647111484">"Демейки параметрлерди тазалап салуу"</string>
+    <string name="device_apps_app_management_clear_default" msgid="4566187319647111484">"Демейки жөндөөлөрдү тазалап салуу"</string>
     <string name="device_apps_app_management_clear_default_set" msgid="1649974109123107390">"Бул колдонмо айрым аракеттер үчүн ишке киргизилет деп коюлган"</string>
-    <string name="device_apps_app_management_clear_default_none" msgid="5935252537185381597">"Демейки параметрлер коюлган жок"</string>
+    <string name="device_apps_app_management_clear_default_none" msgid="5935252537185381597">"Демейки жөндөөлөр коюлган жок"</string>
     <string name="device_apps_app_management_clear_cache" msgid="2678301483598915479">"Кештерди тазалоо"</string>
     <string name="device_apps_app_management_notifications" msgid="1687529279264810317">"Билдирмелер"</string>
     <string name="device_apps_app_management_licenses" msgid="4809737266551899869">"Үчүнчү тараптын булагы"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Көрүп жатканда экрандын өчүп калуусунун алдын алуу үчүн ырастаңыз. Бул энергиянын көбүрөөк сарпталышына алып келет."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Иштебей турганда"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Көрүп жатканда"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Автоматтык түрдө өчүрүү"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Иштебей турганда автоматтык түрдө өчүрүү"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Көрүп жатканда автоматтык түрдө өчүрүү"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Сыналгыны автоматтык түрдө өчүрүү"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Жигерсиз турган сыналгыны автоматтык түрдө өчүрүү"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Көрүп жатканда сыналгыны автоматтык түрдө өчүрүү"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"Иштебей турганда\" таймери \"Көрүп жатканда\" таймеринен кыскараак болушу керек"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"Көрүп жатканда\" таймери \"Иштебей турганда\" таймеринен узагыраак болушу керек"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Көшүү режиминде тармакка туташууну чектөө"</string>
@@ -972,14 +946,14 @@
     <string name="limit_network_in_standby_confirm_message" msgid="7176699480768019689">"Көшүү режиминде тармакка туташууга уруксат берсеңиз, көшүү режиминде электр энергиясы көбүрөөк колдонулат."</string>
     <string name="backup_configure_account_default_summary" msgid="2170733614341544296">"Дайындардын камдык көчүрмөсүн сактап жаткан аккаунт жок"</string>
     <string name="backup_erase_dialog_title" msgid="6008454053276987100"></string>
-    <string name="backup_erase_dialog_message" msgid="222169533402624861">"Wi-Fi сырсөздөрүнүн, кыстармалардын жана башка параметрлердин, ошондой эле колдонмолордун дайындарынын камдык көчүрмөлөрүн сактоо аракети токтотулуп, Google серверлериндеги бардык көчүрмөлөр өчүрүлсүнбү?"</string>
+    <string name="backup_erase_dialog_message" msgid="222169533402624861">"Wi-Fi сырсөздөрүнүн, кыстармалардын жана башка жөндөөлөрдүн, ошондой эле колдонмолордун дайындарынын камдык көчүрмөлөрүн сактоо аракети токтотулуп, Google серверлериндеги бардык көчүрмөлөр өчүрүлсүнбү?"</string>
     <string name="privacy_backup_data" msgid="3604057980102997914">"Дайындарымдын камдык көчүрмөсүн сактоо"</string>
     <string name="privacy_backup_account" msgid="4527813051841860610">"Камдык көчүрмө каттоо эсеби"</string>
     <string name="privacy_automatic_restore" msgid="7117805818589418118">"Авто калыбына келтирүү"</string>
     <string name="factory_reset_device" msgid="6509900821515094361">"Түзмөктү баштапкы абалга келтирүү"</string>
-    <string name="factory_reset_description" msgid="6697396335158766785">"Бул аракет түзмөгүңүздү демейки параметрлерге кайтарып, бардык маалыматты, аккаунттарды, файлдарды жана жүктөлүп алынган колдонмолорду өчүрөт."</string>
-    <string name="factory_reset_info_description" msgid="5098454670833183487">"Бул аракет түзмөгүңүздү демейки параметрлерге кайтарып, бардык маалыматты, аккаунттарды, файлдарды жана жүктөлүп алынган колдонмолорду өчүрөт."</string>
-    <string name="factory_reset_content_description" msgid="1677022688420116803">"Баштапкы абалга кайтаруу. Бул аракет түзмөгүңүздү демейки параметрлерге кайтарып, бардык маалыматты, аккаунттарды, файлдарды жана жүктөлүп алынган колдонмолорду өчүрөт."</string>
+    <string name="factory_reset_description" msgid="6697396335158766785">"Бул аракет түзмөгүңүздү демейки жөндөөлөргө кайтарып, бардык маалыматты, аккаунттарды, файлдарды жана жүктөлүп алынган колдонмолорду өчүрөт."</string>
+    <string name="factory_reset_info_description" msgid="5098454670833183487">"Бул аракет түзмөгүңүздү демейки жөндөөлөргө кайтарып, бардык маалыматты, аккаунттарды, файлдарды жана жүктөлүп алынган колдонмолорду өчүрөт."</string>
+    <string name="factory_reset_content_description" msgid="1677022688420116803">"Баштапкы абалга кайтаруу. Бул аракет түзмөгүңүздү демейки жөндөөлөргө кайтарып, бардык маалыматты, аккаунттарды, файлдарды жана жүктөлүп алынган колдонмолорду өчүрөт."</string>
     <string name="confirm_factory_reset_description" msgid="1337483463207721713">"Жеке маалыматыңыз менен жүктөп алган колдонмолоруңузду өчүрөсүзбү? Аларды кайра калыбына келтире албайсыз."</string>
     <string name="confirm_factory_reset_device" msgid="4308646529880718465">"Баарын өчүрүү"</string>
     <string name="select_device_name_title" msgid="3045019448327493634">"<xliff:g id="DEVICEMODEL">%1$s</xliff:g> үчүн ат тандаңыз"</string>
@@ -1023,7 +997,7 @@
     <string name="manage_notification_access_title" msgid="8659254371564990084">"Эскертмелерге уруксат"</string>
     <string name="no_notification_listeners" msgid="5119406452675724448">"Орнотулган колдонмолор үчүн билдирмелерди колдонууга уруксат суралган жок."</string>
     <string name="notification_listener_security_warning_summary" msgid="8602907284276088658">"Бул колдонмолор билдирмелердин баарын, ошону менен катар байланыштардын аты-жөнү жана алынган билдирүүлөр сыяктуу жеке маалыматты окуй алышат. Мындан тышкары, алар бул билдирмелерди жок кылып же алардагы баскычтарды баса алышат."</string>
-    <string name="default_notification_access_package_summary" msgid="1354775994781420222">"Система талап кылат"</string>
+    <string name="default_notification_access_package_summary" msgid="1354775994781420222">"Тутум талап кылат"</string>
     <string name="directory_access" msgid="7338555825237012006">"Каталогго мүмкүнчүлүк алуу"</string>
     <string name="directory_access_description" msgid="3630855858552422012">"Бул колдонмолордун айрым каталогдорго кирүүгө уруксаттары бар."</string>
     <string name="directory_on_volume" msgid="5628089584970521703">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Сыналгы күйүп тургандагы иштөө режими"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Кайра коюу"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Ethernet жупташтыруучу коду"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Электр кубатын колдонуу режимдери"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Сыналгы өчүп турганда электр кубатынын колдонулушун жакшыртуу"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Иштетет:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Бул режим түзмөктө электр кубатынын колдонулушун жогорулатышы мүмкүн экенин эске алыңыз."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" иштетүү"</string>
 </resources>
diff --git a/Settings/res/values-lo/energy-modes.xml b/Settings/res/values-lo/energy-modes.xml
deleted file mode 100644
index cb4739e29..000000000
--- a/Settings/res/values-lo/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"ຄຸນສົມບັດທີ່ສຳຄັນຂອງເຄືອຂ່າຍ"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ໃຊ້ພະລັງງານໜ້ອຍລົງ"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"ປິດການເຊື່ອມຕໍ່ເຄືອຂ່າຍເມື່ອບໍ່ໄດ້ໃຊ້ໂທລະທັດ."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"ການອັບເດດ ແລະ ຟັງຊັນທີ່ສຳຄັນ"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"ຄຸນສົມບັດທີ່ແນະນຳຂອງເຄືອຂ່າຍ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ໃຊ້ພະລັງງານຢ່າງມີປະສິດທິພາບ"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ເປີດຄຸນສົມບັດທີ່ປຸກລະບົບຂອງໂທລະທັດຜ່ານເຄືອຂ່າຍ (ໂໝດສະແຕນບາຍທີ່ເຊື່ອມຕໍ່ເຄືອຂ່າຍ)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[ໃສ່ຄຸນສົມບັດ 1]"</item>
-    <item msgid="8724721267222341891">"[ໃສ່ຄຸນສົມບັດ 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"ຄຸນສົມບັດເພີ່ມເຕີມຂອງເຄືອຂ່າຍ"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"ໄດ້ໃຊ້ພະລັງງານຫຼາຍຂຶ້ນ"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"ນອກຈາກຄຸນສົມບັດທີ່ແນະນຳແລ້ວ, ຕົວເລືອກນີ້ຈະເປີດຄຸນສົມບັດເພີ່ມເຕີມເມື່ອບໍ່ໄດ້ໃຊ້ໂທລະທັດ ເຊິ່ງອາດເຮັດໃຫ້ໃຊ້ພະລັງງານຫຼາຍຂຶ້ນ."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[ໃສ່ຄຸນສົມບັດ 1]"</item>
-    <item msgid="170760143032597722">"[ໃສ່ຄຸນສົມບັດ 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-lo/strings.xml b/Settings/res/values-lo/strings.xml
index 835e53fe7..dfcc6e04f 100644
--- a/Settings/res/values-lo/strings.xml
+++ b/Settings/res/values-lo/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"ການສຳຮອງ ແລະ ຂໍ້ມູນ"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"ຣີເຊັດຄ່າຈາກໂຮງງານ"</string>
     <string name="device_calibration" msgid="2907914144048739705">"ການປັບທຽບ"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"ຕົວຈັບເວລາປິດເຄື່ອງ"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"ຕັ້ງຕົວຈັບເວລາເພື່ອປິດໂທລະພາບ ແລະ ປະຢັດພະລັງງານ"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"ການເປີດປິດ ແລະ ພະລັງງານ"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"ການຕັ້ງຄ່າ Eco"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"ອຸປະກອນ"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"ເລືອກຮູບແບບ"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"ການຕັ້ງຄ່າສຽງຂັ້ນສູງ"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"ອະນຸຍາດໂໝດເກມ"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"ຈັບຄູ່ໄລຍະໄດນາມິກຂອງເນື້ອຫາ"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"ເມື່ອເປີດໃຊ້ຕົວເລືອກນີ້, ລະບົບຈະສະຫຼັບລະຫວ່າງຮູບແບບໄລຍະໄດນາມິກທີ່ແຕກຕ່າງກັນເພື່ອໃຫ້ກົງກັບເນື້ອຫາ. ສິ່ງນີ້ອາດຈະເຮັດໃຫ້ໜ້າຈໍສີດໍາໃນລະຫວ່າງການສະຫຼັບຮູບແບບ.\n\nຄລິກທີ່ການຕັ້ງຄ່າຂັ້ນສູງສໍາລັບຕົວເລືອກໄລຍະໄດນາມິກເພີ່ມເຕີມ."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"ໄລຍະໄດນາມິກທີ່ຕ້ອງການ"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"ການປ່ຽນຄ່າຕາມຄວາມຕ້ອງການຂອງລະບົບ"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"ໃຫ້ລະບົບການຈັດການຮູບແບບການປ່ຽນຄ່າ"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"ເມື່ອຕົວເລືອກນີ້ຖືກເລືອກ, ລະບົບຈະກໍານົດຂອບເຂດໄດນາມິກທີ່ເໝາະສົມເພື່ອຖືກສົ່ງໄປຫາການສະແດງຂອງທ່ານ ແລະ ປ່ຽນແປງເນື້ອຫາໄປສູ່ໄລຍະໄດນາມິກນີ້ຕາມຄວາມຕ້ອງການ."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"ກົງກັບຮູບແບບຂອງເນື້ອຫາຕະຫຼອດ"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"ບັງຄັບການປ່ຽນຄ່າ"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"ບັງຄັບການປ່ຽນຄ່າເປັນຮູບແບບທີ່ຕ້ອງການ"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"ບັງຄັບການປ່ຽນຄ່າເປັນຮູບແບບທີ່ຕ້ອງການ. ການບັງຄັບການປ່ຽນຄ່າອາດຈະສົ່ງຜົນກະທົບຕໍ່ການຕັ້ງຄ່າອື່ນໃນໂໝດສະແດງຜົນ ຫຼື ຮູບແບບ HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"ເປັນ SDR ຕະຫຼອດ"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"ເປັນ <xliff:g id="HDR_TYPE">%s</xliff:g> ຕະຫຼອດ"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"ທ່ານຕ້ອງການບັງຄັບເອົາພຸດ HDR ບໍ?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"ໂດຍຄ່າເລີ່ມຕົ້ນການປ່ຽນຄ່າຈະຖືກບັງຄັບໃຫ້ <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"ຈໍສະແດງຜົນຂອງທ່ານຈະເຮັດວຽກຢູ່ທີ່ຄວາມລະອຽດ 1080p 60Hz. ຕົວເລືອກນີ້ເຂົ້າກັນບໍ່ໄດ້ກັບຈໍສະແດງຜົນຂອງທ່ານເມື່ອເຮັດວຽກຢູ່ທີ່ຄວາມລະອຽດ 4k 60Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"ບໍ່ຮອງຮັບ Dolby Vision ທີ່ຄວາມລະອຽດປັດຈຸບັນ. ຫາກທ່ານເປີດການນຳໃຊ້ Dolby Vision ດ້ວຍຕົນເອງ, ຄວາມລະອຽດໃນຈໍສະແດງຜົນຂອງທ່ານຈະປ່ຽນເປັນ 1080p 60Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"ປ່ຽນຄວາມລະອຽດເປັນ 1080p 60Hz ບໍ?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"ບັງຄັບການປ່ຽນຄ່າເປັນ Dolby Vision ທຸກເທື່ອ"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"ຫາກ Dolby Vision ຖືກປິດການນຳໃຊ້ໃນຮູບແບບ HDR ໃນການຕັ້ງຄ່າຈໍສະແດງຜົນຂັ້ນສູງ, ການບັງຄັບການປ່ຽນຄ່າເປັນ Dolby Vision ຈະເປັນການເປີດການນຳໃຊ້ອີກເທື່ອໜຶ່ງ."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"ບັງຄັບການປ່ຽນຄ່າເປັນ HDR10 ທຸກເທື່ອ"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"ຫາກ HDR10 ຖືກປິດການນຳໃຊ້ໃນຮູບແບບ HDR ໃນການຕັ້ງຄ່າຈໍສະແດງຜົນຂັ້ນສູງ, ການບັງຄັບການປ່ຽນຄ່າເປັນ HDR10 ຈະເປັນການເປີດການນຳໃຊ້ອີກເທື່ອໜຶ່ງ."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"ບັງຄັບການປ່ຽນຄ່າເປັນ HLG ທຸກເທື່ອ"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"ຫາກ HLG ຖືກປິດການນຳໃຊ້ໃນຮູບແບບ HDR ໃນການຕັ້ງຄ່າຈໍສະແດງຜົນຂັ້ນສູງ, ການບັງຄັບການປ່ຽນຄ່າເປັນ HLG ຈະເປັນການເປີດການນຳໃຊ້ອີກເທື່ອໜຶ່ງ."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"ບັງຄັບການປ່ຽນຄ່າເປັນ HDR10+ ທຸກເທື່ອ"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"ຫາກ HDR10+ ຖືກປິດການນຳໃຊ້ໃນຮູບແບບ HDR ໃນການຕັ້ງຄ່າຈໍສະແດງຜົນຂັ້ນສູງ, ການບັງຄັບການປ່ຽນຄ່າເປັນ HDR10+ ຈະເປັນການເປີດການນຳໃຊ້ອີກເທື່ອໜຶ່ງ."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"ບັງຄັບການປ່ຽນຄ່າເປັນ SDR ທຸກເທື່ອ"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"ການບັງຄັບການປ່ຽນຄ່າເປັນ SDR ຈະປິດການນຳໃຊ້ຮູບແບບທັງໝົດໃນຮູບແບບ HDR ໃນການຕັ້ງຄ່າຈໍສະແດງຜົນຂັ້ນສູງ."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"ເຮັດໃຫ້ກົງກັບອັດຕາເຟຣມເນື້ອຫາ"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"ແບບຕໍ່ເນື່ອງເທົ່ານັ້ນ"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"ຕໍ່ເນື່ອງ"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"ຫາກແອັບຮ້ອງຂໍມັນ, ອຸປະກອນຂອງທ່ານຈະຈັບຄູ່ເອົ້າພຸດຂອງມັນກັບອັດຕາເຟຣມຕົ້ນສະບັບຂອງເນື້ອຫາທີ່ທ່ານກຳລັງເບິ່ງ, ສະເພາະໃນກໍລະນີທີ່ໂທລະທັດຂອງທ່ານສາມາດສົ່ງຜ່ານໄດ້ຢ່າງຕໍ່ເນື່ອງເທົ່ານັ້ນ."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"ຈໍສະແດງຜົນທີ່ເຊື່ອມຕໍ່ຂອງທ່ານບໍ່ຮອງຮັບການປ່ຽນອັດຕາການຣີເຟຣຊທີ່ຕໍ່ເນື່ອງ. ຕົວເລືອກນີ້ຈະບໍ່ມີຜົນ ເວັ້ນແຕ່ວ່າທ່ານຈະປ່ຽນເປັນຈໍສະແດງຜົນທີ່ຮອງຮັບ."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"ທຸກເທື່ອ"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"ບໍ່ຕໍ່ເນື່ອງ"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"ຫາກແອັບຮ້ອງຂໍມັນ, ອຸປະກອນຂອງທ່ານຈະຈັບຄູ່ເອົ້າພຸດຂອງມັນກັບອັດຕາເຟຣມຕົ້ນສະບັບຂອງເນື້ອຫາທີ່ທ່ານກຳລັງເບິ່ງ. ນີ້ອາດເຮັດໃຫ້ໜ້າຈໍຂອງທ່ານບໍ່ສະແດງຜົນຫຍັງເປັນໄລຍະເວລາຊົ່ວຄາວເມື່ອອອກ ຫຼື ເຂົ້າການຫຼິ້ນວິດີໂອໃດໜຶ່ງ."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"ບໍ່ໃຊ້ເລີຍ"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"ອຸປະກອນຈະບໍ່ພະຍາຍາມຈັບຄູ່ເອົ້າພຸດຂອງມັນກັບອັດຕາເຟຣມຕົ້ນສະບັບຂອງເນື້ອຫາທີ່ທ່ານກຳລັງເບິ່ງ, ເຖິງແມ່ນວ່າແອັບຈະສົ່ງຄຳຮ້ອງຂໍກໍຕາມ."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"ປ່ຽນຄວາມລະອຽດເປັນ %1$s ບໍ?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"ເລືອກຕົກລົງເພື່ອໃຊ້ %1$s ຈາກນີ້ໄປ."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision ບໍ່ຖືກຮອງຮັບຢູ່ %1$s ແລະ ຈະຖືກປິດການນຳໃຊ້ໃນ \"ການຕັ້ງຄ່າການສະແດງຜົນຂັ້ນສູງ\""</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"ໂໝດນີ້ຮອງຮັບ: %1$s\nຢູ່ໂທລະທັດບາງເຄື່ອງ, ທ່ານອາດຕ້ອງເປີດ HDMI ທີ່ໄດ້ຮັບການປັບປຸງໃຫ້ດີຂຶ້ນເພື່ອເປີດໃຊ້ຮູບແບບ HDR ເພີ່ມເຕີມ. ກວດສອບເບິ່ງການຕັ້ງຄ່າໂທລະທັດຂອງທ່ານເພື່ອເບິ່ງວ່າສິ່ງນີ້ຖືກຮອງຮັບຫຼືບໍ່."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"ໂໝດນີ້ຮອງຮັບ %1$s. ຢູ່ໂທລະພາບບາງເຄື່ອງ, ທ່ານອາດຕ້ອງເປີດ HDMI ທີ່ໄດ້ປັບປຸງໃຫ້ດີຂຶ້ນແລ້ວເພື່ອເປີດໃຊ້ຮູບແບບ HDR ເພີ່ມເຕີມ. ກວດສອບເບິ່ງການຕັ້ງຄ່າໂທລະພາບຂອງທ່ານເພື່ອເບິ່ງວ່າສິ່ງນີ້ຖືກຮອງຮັບຫຼືບໍ່."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"ຍົກເລີກ"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ຕົກລົງ"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"ລຶບຂໍ້ມູນທີ່ເກັບໄວ້ບໍ?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"ອັນນີ້ຈະລຶບຂໍ້ມູນທີ່ເກັບໄວ້ສຳລັບທຸກແອັບຯ."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"ອຸປະກອນນີ້ແມ່ນຈັດການໂດຍອົງກອນຂອງທ່ານ."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"ອຸປະກອນນີ້ຖືກຈັດການໂດຍ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"ສຶກສາເພີ່ມເຕີມ"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{ແອັບກ້ອງຖ່າຍຮູບ}other{ແອັບກ້ອງຖ່າຍຮູບ}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"ແອັບປະຕິທິນ"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"ກະລຸນາຢືນຢັນເພື່ອບໍ່ໃຫ້ຈໍສະແດງຜົນປິດໃນຂະນະທີ່ກໍາລັງເບິ່ງ, ເຊິ່ງມີໂອກາດສໍາລັບການໃຊ້ພະລັງງານເພີ່ມຂຶ້ນ."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"ເມື່ອບໍ່ໄດ້ນຳໃຊ້"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"ເມື່ອຮັບຊົມ"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"ປິດໂດຍອັດຕະໂນມັດ"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"ປິດໂດຍອັດຕະໂນມັດເມື່ອບໍ່ໄດ້ນຳໃຊ້"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"ປິດໂດຍອັດຕະໂນມັດເມື່ອເບິ່ງ"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"ປິດໂທລະທັດໂດຍອັດຕະໂນມັດ"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"ປິດໂທລະທັດໂດຍອັດຕະໂນມັດເມື່ອບໍ່ມີການນຳໃຊ້"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"ປິດໂທລະທັດໂດຍອັດຕະໂນມັດເມື່ອຮັບຊົມ"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"ໂມງຈັບເວລາ \"ເມື່ອບໍ່ເຄື່ອນໄຫວ\" ຕ້ອງສັ້ນກວ່າໂມງຈັບເວລາ \"ເມື່ອເບິ່ງ\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"ໂມງຈັບເວລາ \"ເມື່ອເບິ່ງ\" ຕ້ອງຍາວກວ່າໂມງຈັບເວລາ \"ເມື່ອບໍ່ເຄື່ອນໄຫວ\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"ຈຳກັດການເຊື່ອມຕໍ່ເຄືອຂ່າຍໃນໂໝດສະແຕນບາຍ"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"ພຶດຕິກຳການເປີດ"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"ຣີເຊັດ"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"ລະຫັດການຈັບຄູ່ອີເທີເນັດ"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"ໂໝດພະລັງງານ"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"ປັບປຸງປະສິດທິພາບການໃຊ້ພະລັງງານເມື່ອບໍ່ໄດ້ໃຊ້ໂທລະທັດ"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"ເປີດການນຳໃຊ້:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ກະລຸນາຮັບຊາບວ່າໂໝດນີ້ອາດເຮັດໃຫ້ອຸປະກອນໃຊ້ພະລັງງານຫຼາຍຂຶ້ນ."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"ເປີດການນຳໃຊ້ \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/Settings/res/values-lt/energy-modes.xml b/Settings/res/values-lt/energy-modes.xml
deleted file mode 100644
index e6b69ccd5..000000000
--- a/Settings/res/values-lt/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Pagrindinės tinklo funkcijos"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Vartojama mažai energijos"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Išjunkite tinklo ryšį, kai televizorius nenaudojamas."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Kritiniai atnaujinimai ir funkcijos"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Rekomenduojamos tinklo funkcijos"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimizuotas energijos vartojimas"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Įjungiamos funkcijos, suaktyvinančios televizorių per tinklą (tinklo budėjimo režimu)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Įterpti 1 funkciją]"</item>
-    <item msgid="8724721267222341891">"[Įterpti 2 funkciją]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Papildomos tinklo funkcijos"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Vartojama daugiau energijos"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Pasirinkus šią parinktį, be rekomenduojamų funkcijų, įjungiamos papildomos funkcijos, kai televizorius nenaudojamas, todėl gali būti vartojama daugiau energijos."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Įterpti 1 funkciją]"</item>
-    <item msgid="170760143032597722">"[Įterpti 2 funkciją]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-lt/strings.xml b/Settings/res/values-lt/strings.xml
index 7069ab9d5..0b3699e6e 100644
--- a/Settings/res/values-lt/strings.xml
+++ b/Settings/res/values-lt/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Atsarginės kopijos kūrimas ir atkūrimas"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Gamyklinių duomenų atkūrimas"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibravimas"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Išjungimo laikmatis"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Nustatykite laikmačius, kad išjungtumėte TV ir sutaupytumėte energijos"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Maitinimas ir energija"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Ekonominio režimo nustatymai"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Įrenginiai"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Rinktis formatus"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Išplėstiniai garso nustatymai"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Leisti žaidimo režimą"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Turinio dinaminio diapazono atitiktis"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Įgalinus šią parinktį sistema perjungs skirtingus dinaminio diapazono formatus, kad atitiktų turinį. Todėl perjungiant formatą gali būti rodomas juodas ekranas.\n\nJei reikia daugiau dinaminio diapazono parinkčių, spustelėkite „Išplėstiniai pateikties nustatymai“."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Pageidaujamas dinaminis diapazonas"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Sistemos parinktas konvertavimas"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Formato konvertavimą leidžiama valdyti sistemai"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Kai įjungta ši parinktis, sistema nustatys tinkamą dinaminį diapazoną, kuris bus siunčiamas į jūsų ekraną, ir pagal poreikį konvertuos turinį į tą dinaminį diapazoną."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Visada atitinka turinio formatą"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Priverstinis konvertavimas"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Priverstinai konvertuojama į norimą formatą"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Priverstinis konvertavimas į norimą formatą. Priverstinai konvertavus, gali būti paveikti kiti rodymo režimo ar HDR formato nustatymai."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Visada į SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Visada į „<xliff:g id="HDR_TYPE">%s</xliff:g>“"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Ar norite priverstinai įjungti HDR išvestį?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Pagal numatytuosius nustatymus bus priverstinai konvertuota į „<xliff:g id="HDR_TYPE">%s</xliff:g>“."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Ekranas rodys 1080p 60 Hz skyra. Ši parinktis nesuderinama su jūsų ekranu, kai rodoma 4K 60 Hz skyra."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"„Dolby Vision“ nepalaikomas taikant dabartinę skyrą. Jei patys įgalinsite „Dolby Vision“, ekrano skyra bus pakeista į 1080p 60 Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Pakeisti skyrą į 1080p 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Visada priverstinai konvertuoti į „Dolby Vision“"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Jei Išplėstinių pateikties nustatymų skiltyje „HDR formatai“ „Dolby Vision“ yra išjungta, priverstinai konvertavus į „Dolby Vision“ ji bus vėl įjungta."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Visada priverstinai konvertuoti į HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Jei Išplėstinių pateikties nustatymų skiltyje „HDR formatai“ HDR10 yra išjungta, priverstinai konvertavus į HDR10 ji bus vėl įjungta."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Visada priverstinai konvertuoti į HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Jei Išplėstinių pateikties nustatymų skiltyje „HDR formatai“ HLG yra išjungta, priverstinai konvertavus į HLG ji bus vėl įjungta."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Visada priverstinai konvertuoti į HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Jei Išplėstinių pateikties nustatymų skiltyje „HDR formatai“ HDR10+ yra išjungta, priverstinai konvertavus į HDR10+ ji bus vėl įjungta."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Visada priverstinai konvertuoti į SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Priverstinai konvertavus į SDR, Išplėstinių pateikties nustatymų skiltyje „HDR formatai“ bus išjungti visi formatai."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Ieškoti turinio kadrų dažnio atitikties"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Tik sklandus"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Sklandus"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Jei bus pateikta programos užklausa, jūsų įrenginys pritaikys išvestį pagal pradinį žiūrimo turinio kadrų dažnį, TIK jei jūsų TV galima atlikti sklandų perėjimą."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Jūsų prijungtas ekranas nepalaiko sklandaus kadrų dažnio perėjimo. Ši parinktis neturės jokio poveikio, kol nepakeisite ekrano į tokį, kuris ją palaiko."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Visada"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Nesklandus"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Jūsų įrenginys pritaikys išvestį pagal pradinį žiūrimo turinio kadrų dažnį, jei bus pateikta programos užklausa. Dėl to išjungiant ar įjungiant vaizdo įrašo atkūrimą ekranas akimirką gali būti tuščias."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Niekada"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Jūsų įrenginys niekada nebandys pritaikyti išvesties pagal pradinį žiūrimo turinio kadrų dažnį, net jei bus pateikta programos užklausa."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Pakeisti skyrą į %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Pasirinkite „Gerai“, kad nuo dabar naudotumėte %1$s."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"„Dolby Vision“ nepalaikoma %1$s ir bus išjungta skiltyje „Išplėstiniai pateikties nustatymai“."</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Šis režimas palaiko: %1$s\nKai kuriuose televizoriuose gali reikėti įjungti patobulintą HDMI, kad būtų pasiekiama daugiau HDR formatų. Peržiūrėkite TV nustatymus, ar ši funkcija palaikoma."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Šis režimas palaiko %1$s. Kai kuriuose televizoriuose gali reikėti įjungti patobulintą HDMI, kad būtų pasiekiama daugiau HDR formatų. Peržiūrėkite TV nustatymus, ar ši funkcija palaikoma."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Atšaukti"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Gerai"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Išvalyti talpykloje saugomus duomenis?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Bus išval. visų progr. talpykl. saugomi duomen."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Šį įrenginį tvarko jūsų organizacija."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Šį įrenginį tvarko „<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>“."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Sužinoti daugiau"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Fotoaparato programa}one{Fotoaparato programos}few{Fotoaparato programos}many{Fotoaparato programos}other{Fotoaparato programos}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Kalendoriaus programa"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Patvirtinkite, kad neleistumėte ekranui išsijungti, kol žiūrite (tai gali padidinti energijos suvartojimą)."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Kai neaktyvus"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Žiūrint"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Automatiškai išjungti"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Automatiškai išjungti, kai neaktyvu"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Automatiškai išjungti žiūrint"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Automatinis TV išjungimas"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Automatinis neaktyvaus TV išjungimas žiūrint"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Automatinis TV išjungimas žiūrint"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Laikmačio „Kai neaktyvus“ trukmė turi būti trumpesnė nei laikmačio „Žiūrint“"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Laikmačio „Žiūrint“ trukmė turi būti ilgesnė nei laikmačio „Kai neaktyvus“"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Tinklo ryšio apribojimas budėjimo režimu"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Elgsena įjungus maitinimą"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Nustatymas iš naujo"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Eterneto susiejimo kodas"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Energijos režimai"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Efektyvesnis energijos vartojimas nenaudojant televizoriaus"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Įgalinama:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Atminkite, kad šiuo režimu gali būti vartojama daugiau įrenginio energijos."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Įgalinti „<xliff:g id="ENERGYMODENAME">%s</xliff:g>“"</string>
 </resources>
diff --git a/Settings/res/values-lv/energy-modes.xml b/Settings/res/values-lv/energy-modes.xml
deleted file mode 100644
index b9e743128..000000000
--- a/Settings/res/values-lv/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Būtiskas tīkla funkcijas"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Mazs enerģijas patēriņš"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Tiek izslēgts tīkla savienojums, kad televizors netiek lietots."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Svarīgi atjauninājumi un funkcijas"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Ieteiktās tīkla funkcijas"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimizēts enerģijas patēriņš"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Tiek ieslēgtas funkcijas, kas aktivizē televizoru tīklā (tīklierosas gatavības režīms)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Papildu tīkla funkcijas"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Palielināts enerģijas patēriņš"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Papildus ieteiktajām funkcijām ar šo opciju tiek ieslēgtas papildu funkcijas, kad televizors netiek lietots. Tādējādi var tikt palielināts enerģijas patēriņš."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-lv/strings.xml b/Settings/res/values-lv/strings.xml
index 2a760a3aa..e35461391 100644
--- a/Settings/res/values-lv/strings.xml
+++ b/Settings/res/values-lv/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Dublēšana un atjaunošana"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Rūpnīcas datu atiestatīšana"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibrēšana"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Izslēgšanas taimeris"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Iestatiet taimerus, lai izslēgtu televizoru un taupītu enerģiju."</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Barošana un enerģija"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Ekoloģiski iestatījumi"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Ierīces"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Formātu atlase"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Skaņas papildiestatījumi"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Atļaut spēles režīmu"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Satura dinamiskā diapazona atbilstības atrašana"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Iespējojot šo opciju, sistēma pārslēgs dažādus dinamiskā diapazona formātus, lai atrastu satura atbilstību. Formātu pārslēgšanas laikā var tikt rādīts melns ekrāns.\n\nNoklikšķiniet uz displeja papildiestatījumiem, lai skatītu citas dinamiskā diapazona opcijas."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Vēlamais dinamiskais diapazons"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Sistēmas pārvaldīta konvertēšana"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Ļauj sistēmai pārvaldīt formāta konvertēšanu"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Ja ir atlasīta šī opcija, sistēma noteiks piemēroto uz displeju nosūtāmo diapazonu un konvertēs saturu atbilstoši vajadzīgajam dinamiskajam diapazonam."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Vienmēr atbilst satura formātam"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Piespiedu konvertēšana"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Veic piespiedu konvertēšanu uz vēlamo formātu"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Piespiedu konvertēšana vēlamajā formātā. Piespiedu konvertēšana var ietekmēt citus iestatījumus sadaļā Attēlošanas režīms un HDR formāts."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Vienmēr konvertēt SDR formātā"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Vienmēr konvertēt šajā formātā: <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Vai veikt piespiedu konvertēšanu uz HDR formātu?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Pēc noklusējuma tiks veikta piespiedu konvertēšana uz šo formātu: <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Displejā tiks lietota 1080p, 60Hz izšķirtspēja. Šī opcija nav saderīga ar displeju, ja tajā tiek izmantota 4K, 60Hz izšķirtspēja."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Tehnoloģija Dolby Vision netiek atbalstīta pašreizējā izšķirtspējā. Ja manuāli iespējosiet Dolby Vision, jūsu displeja izšķirtspēja tiks mainīta uz 1080p (60 Hz)."</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Vai mainīt izšķirtspēju uz 1080p (60 Hz)?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Vienmēr veikt piespiedu konvertēšanu formātā Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Ja sadaļas “Displeja papildiestatījumi” HDR formātu sarakstā ir atspējots formāts Dolby Vision, tad, veicot piespiedu konvertēšanu formātā Dolby Vision, tas tiks iespējots."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Vienmēr veikt piespiedu konvertēšanu formātā HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Ja sadaļas “Displeja papildiestatījumi” HDR formātu sarakstā ir atspējots formāts HDR10, tad, veicot piespiedu konvertēšanu formātā HDR10, tas tiks iespējots."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Vienmēr veikt piespiedu konvertēšanu formātā HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Ja sadaļas “Displeja papildiestatījumi” HDR formātu sarakstā ir atspējots formāts HLG, tad, veicot piespiedu konvertēšanu formātā HLG, tas tiks iespējots."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Vienmēr veikt piespiedu konvertēšanu formātā HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Ja sadaļas “Displeja papildiestatījumi” HDR formātu sarakstā ir atspējots formāts HDR10+, tad, veicot piespiedu konvertēšanu formātā HDR10+, tas tiks iespējots."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Vienmēr veikt piespiedu konvertēšanu uz standarta dinamisko diapazonu"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Veicot piespiedu konvertēšanu uz standarta dinamisko diapazonu, tiks atspējoti visi formāti, kas iekļauti sadaļas “Displeja papildiestatījumi” HDR formātu sarakstā."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Atrast atbilstību satura atskaņošanas ātrumam"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Tikai tad, ja izmaiņas var veikt nemanāmi"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Vienmērīgi"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Jūsu ierīce piemēros izvades veidu atbilstoši jūsu skatītā satura sākotnējam kadru ātrumam sekundē, ja lietotne to pieprasīs, taču TIKAI ar nosacījumu, ka jūsu televizorā var veikt vienmērīgu pāreju."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Jūsu pievienotais displejs neatbalsta vienmērīgas atsvaidzināšanas biežuma pārejas. Šī opcija nedarbosies, ja vien nepievienosiet displeju, kas to atbalsta."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Vienmēr"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Nevienmērīgi"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Jūsu ierīce piemēros izvades veidu atbilstoši jūsu skatītā satura sākotnējam kadru ātrumam sekundē, ja lietotne to pieprasīs. Pārtraucot vai sākot video atskaņošanu, jūsu ekrāns uz īsu brīdi var kļūt tukšs."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Nekad"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Jūsu ierīce nekad nemēģinās piemērot izvades veidu atbilstoši jūsu skatītā satura sākotnējam kadru ātrumam sekundē, pat ja lietotne to pieprasīs."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Vai mainīt izšķirtspēju uz %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Atlasiet “Labi”, lai turpmāk izmantotu šādu izšķirtspēju: %1$s."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Tehnoloģija Dolby Vision netiek atbalstīta režīmā %1$s, un tā būs atspējota displeja papildiestatījumos"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Šis režīms atbalsta: %1$s\nDažos televizoros, iespējams, būs jāieslēdz uzlabotais HDMI, lai iespējotu vairāk HDR formātu. Pārbaudiet sava televizora iestatījumus, lai uzzinātu, vai tas tiek atbalstīts."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Šis režīms atbalsta %1$s. Dažos televizoros, iespējams, būs jāieslēdz uzlabotais HDMI, lai iespējotu vairāk HDR formātu. Pārbaudiet sava televizora iestatījumus, lai uzzinātu, vai tas tiek atbalstīts."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Atcelt"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Labi"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Vai dzēst kešatmiņā ievietotos datus?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Tiks dzēsti kešatmiņā ievietotie lietotņu dati."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -263,7 +236,7 @@
     <string name="bluetooth_known_devices_category" msgid="6895470515631452961">"Piederumi"</string>
     <string name="bluetooth_official_remote_category" msgid="5817814488268307170">"Tālvadības ierīce"</string>
     <string name="bluetooth_official_remote_entry_title" msgid="6699700335229570038">"Tālvadības ierīces iestatījumi"</string>
-    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"Tālvadības pogu iestatīšana"</string>
+    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"Tālvadības ierīces pogu iestatīšana"</string>
     <string name="bluetooth_ir_entry_subtitle" msgid="4606207128353416151">"Kontrolējiet skaļumu, ieslēgšanu un izslēgšanu, kā arī televizora, uztvērēju un skaņas joslu ieejas avotus"</string>
     <string name="bluetooth_connect_action_title" msgid="7715342395313781643">"Izveidot savienojumu"</string>
     <string name="bluetooth_connect_confirm" msgid="4769958536295137386">"Izveidot savienojumu ar “%1$s”"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Šo ierīci pārvalda jūsu organizācija."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Šo ierīci pārvalda <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Uzzināt vairāk"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kameras lietotne}zero{Kameras lietotnes}one{Kameras lietotnes}other{Kameras lietotnes}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Kalendāra lietotne"</string>
@@ -701,7 +675,7 @@
     <string name="accessibility_shortcut_description" msgid="2050424178481510046">"Kad īsinājumtaustiņš ir ieslēgts, varat uz 3 sekundēm nospiest pogu Atpakaļ un skaļuma samazināšanas pogu, lai aktivizētu pieejamības funkciju."</string>
     <string name="accessibility_captions" msgid="3411554568812306549">"Subtitri"</string>
     <string name="accessibility_captions_description" msgid="3827820027578548160">"Videoklipa subtitru teksta pārklājuma iestatījumi"</string>
-    <string name="captions_display" msgid="2598662495450633375">"Rādīt"</string>
+    <string name="captions_display" msgid="2598662495450633375">"Displejs"</string>
     <string name="captions_display_on" msgid="480438033345455728">"Ieslēgti"</string>
     <string name="captions_display_off" msgid="87881163874948539">"Izslēgti"</string>
     <string name="display_options" msgid="2645282080948371603">"Attēlojuma opcijas"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Lūdzu, apstipriniet atspējošanu, lai displejs netiktu izslēgts skatīšanās laikā. Tādējādi var būt iespējams enerģijas lietojuma pieaugums."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Neaktivitātes laikā"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Skatīšanās laikā"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Automātiski izslēgt"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Automātiska izslēgšana neaktivitātes laikā"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Automātiska izslēgšana skatīšanās laikā"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Automātiska TV izslēgšana"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Automātiska TV izslēgšana neaktivitātes laikā"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Automātiska TV izslēgšana skatīšanās laikā"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Iestatījuma “Neaktivitātes laikā” taimerim ir jābūt īsākam par iestatījuma “Skatīšanās laikā” taimeri."</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Iestatījuma “Skatīšanās laikā” taimerim ir jābūt ilgākam par iestatījuma “Neaktivitātes laikā” taimeri."</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Ierobežot tīkla savienojumu gaidstāvē"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Ieslēgšanas rīcība"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Atiestatīšana"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Tīkla Ethernet kods savienošanai pārī"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Enerģijas patēriņa režīmi"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Energoefektivitātes uzlabošana, kad televizors netiek lietots"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Tiek iespējotas šādas funkcijas:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Ņemiet vērā, ka, izmantojot šo režīmu, var tikt palielināts ierīces enerģijas patēriņš."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Režīma “<xliff:g id="ENERGYMODENAME">%s</xliff:g>” iespējošana"</string>
 </resources>
diff --git a/Settings/res/values-mk/arrays.xml b/Settings/res/values-mk/arrays.xml
index 79c76f871..64406db4e 100644
--- a/Settings/res/values-mk/arrays.xml
+++ b/Settings/res/values-mk/arrays.xml
@@ -54,7 +54,7 @@
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="2544683044075498815">"Многу мали"</item>
     <item msgid="4812733698855185131">"Мали"</item>
-    <item msgid="628695363180883207">"Нормални"</item>
+    <item msgid="628695363180883207">"Нормално"</item>
     <item msgid="7397980392121949818">"Големи"</item>
     <item msgid="8774213681644780958">"Многу големи"</item>
   </string-array>
diff --git a/Settings/res/values-mk/energy-modes.xml b/Settings/res/values-mk/energy-modes.xml
deleted file mode 100644
index 36eb8cd36..000000000
--- a/Settings/res/values-mk/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Суштински карактеристики на мрежата"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Ниска потрошувачка на енергија"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Исклучете ја мрежната врска кога телевизорот не се користи."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Критични ажурирања и функции"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Препорачани карактеристики на мрежата"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Оптимизирана потрошувачка на енергија"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Вклучува карактеристики што го будат телевизорот преку мрежата (мрежна подготвеност)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Внеси карактеристика 1]"</item>
-    <item msgid="8724721267222341891">"[Внеси карактеристика 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Дополнителни карактеристики на мрежата"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Зголемена потрошувачка на енергија"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Покрај препорачаните карактеристики, оваа опција вклучува дополнителни карактеристики кога телевизорот не се користи што може да ја зголемат потрошувачката на енергија."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Внеси карактеристика 1]"</item>
-    <item msgid="170760143032597722">"[Внеси карактеристика 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-mk/strings.xml b/Settings/res/values-mk/strings.xml
index ec0b13a26..29919e460 100644
--- a/Settings/res/values-mk/strings.xml
+++ b/Settings/res/values-mk/strings.xml
@@ -55,7 +55,7 @@
     <string name="device_pref_category_title" msgid="8292572846154873762">"Поставки за уредот"</string>
     <string name="accessibility_category_title" msgid="1552664829936369592">"Пристапност"</string>
     <string name="remotes_and_accessories_category_title" msgid="4795119810430255047">"Далечински управувач и додатоци"</string>
-    <string name="display_and_sound_category_title" msgid="9203309625380755860">"Приказ и звук"</string>
+    <string name="display_and_sound_category_title" msgid="9203309625380755860">"Екран и звук"</string>
     <string name="help_and_feedback_category_title" msgid="7036505833991003031">"Помош и повратни информации"</string>
     <string name="privacy_category_title" msgid="8552430590908463601">"Приватност"</string>
     <string name="privacy_device_settings_category" msgid="5018334603278648524">"Поставки за уредот"</string>
@@ -100,9 +100,9 @@
     <string name="all_apps_installed" msgid="8217778476185598971">"Инсталирани апликации"</string>
     <string name="all_apps_other" msgid="4420174882983813158">"Системски апликации"</string>
     <string name="all_apps_disabled" msgid="2776041242863791053">"Оневозможени апликации"</string>
-    <string name="device_daydream" msgid="2631191946958113220">"Штедач на екран"</string>
+    <string name="device_daydream" msgid="2631191946958113220">"Заштитник на екран"</string>
     <string name="device_display" msgid="244634591698925025">"Приказ"</string>
-    <string name="device_display_sound" msgid="7399153506435649193">"Приказ и звук"</string>
+    <string name="device_display_sound" msgid="7399153506435649193">"Екран и звук"</string>
     <string name="device_sound" msgid="8616320533559404963">"Звук"</string>
     <string name="device_surround_sound" msgid="1889436002598316470">"Опкружувачки звук"</string>
     <string name="device_sound_effects" msgid="2000295001122684957">"Системски звуци"</string>
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Бекап и враќање"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Ресетирање фабрички податоци"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Калибрација"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Тајмер за исклучување"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Поставете тајмери за исклучување на телевизорот и заштеда на енергија"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Напојување и енергија"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Поставки за „Еко“"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Уреди"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Избор на формати"</string>
@@ -141,7 +141,7 @@
     <string name="surround_sound_unsupported_title" msgid="2302820271700954900">"НЕПОДДРЖАНИ ФОРМАТИ"</string>
     <string name="surround_sound_format_info" msgid="5671866505653542934">"ИНФОРМАЦИИ ЗА ФОРМАТОТ"</string>
     <string name="surround_sound_show_formats" msgid="1929849219042916469">"Прикажи ги форматите"</string>
-    <string name="surround_sound_hide_formats" msgid="7770931097236868238">"Скриј ги форматите"</string>
+    <string name="surround_sound_hide_formats" msgid="7770931097236868238">"Сокриј ги форматите"</string>
     <string name="surround_sound_enabled_formats" msgid="5159269040069877148">"ОВОЗМОЖЕНИ ФОРМАТИ"</string>
     <string name="surround_sound_disabled_formats" msgid="2250466936859455802">"ОНЕВОЗМОЖЕНИ ФОРМАТИ"</string>
     <string name="surround_sound_disabled_format_info_clicked" msgid="463393349034930031">"За да овозможите, променете го изборот на форматот на „Рачно“."</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Напредни поставки за звук"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Дозволете режим на игри"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Усогласување со динамичкиот опсег на содржините"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Кога ќе ја овозможите оваа опција, системот ќе се префрлува помеѓу различни формати на динамичкиот опсег за да се усогласи со содржините. При промената на форматот може да се прикаже црн екран.\n\nКликнете на „Напредни поставки за екран“ за повеќе опции за динамичкиот опсег."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Претпочитан динамички опсег"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Конверзија претпочитана од системот"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Дозволува системот да управува со конверзијата на форматот"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Кога е избрана оваа опција, системот ќе одреди соодветен динамички опсег што треба да се испрати до вашиот екран и ќе ги конвертира содржините во овој динамички опсег по потреба."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Секогаш се совпаѓа со форматот на содржините"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Наметни конверзија"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Наметнува конверзија во претпочитаниот формат"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Наметни конверзија во претпочитаниот формат. Наметнувањето конверзија може да влијае на другите поставки во режимот на прикажување или форматот HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Секогаш во SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Секогаш во <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Дали сакате да го наметнете HDR-излезот?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Стандардно, ќе се наметне конверзија во <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Екранот ќе работи со резолуција од 1080p 60Hz. Оваа опција не е компатибилна со вашиот екран кога работи со резолуција од 4k 60Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Тековната резолуција не го поддржува Dolby Vision. Ако го вклучите Dolby Vision рачно, резолуцијата на екранот ќе се промени на 1080p 60 Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Дали да се промени резолуцијата на 1080p 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Секогаш наметнувај конверзија во Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Ако Dolby Vision е оневозможен во HDR формати во Напредни поставки за екранот, наметнувањето конверзија во Dolby Vision повторно ќе го овозможи."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Секогаш наметнувај конверзија во HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Ако HDR10 е оневозможен во HDR формати во Напредни поставки за екранот, наметнувањето конверзија во HDR10 повторно ќе го овозможи."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Секогаш наметнувај конверзија во HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Ако HLG е оневозможен во HDR формати во Напредни поставки за екран, наметнувањето конверзија во HLG повторно ќе го овозможи."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Секогаш наметнувај конверзија во HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Ако HDR10+ е оневозможен во HDR формати во Напредни поставки за екранот, наметнувањето конверзија во HDR10+ повторно ќе го овозможи."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Секогаш наметнувај конверзија во SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Наметнувањето конверзија во SDR ќе ги оневозможи сите формати во HDR формати во Напредни поставки за екран."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Усогласи со стапка на слики за содржини"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Само беспрекорно"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Со беспрекорно"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Ако апликацијата го побара тоа, вашиот уред ќе го усогласи својот излез со оригиналната стапка на слики на содржините што ги гледате, САМО ако вашиот ТВ може да изврши беспрекорен премин."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Поврзаните екрани не поддржуваат непречени промени на стапки на освежување. Опцијава нема да има ефект освен ако промените на екран што ја поддржува."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Секогаш"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Без беспрекорно"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Ако апликацијата го побара тоа, вашиот уред ќе го усогласи својот излез со оригиналната стапка на слики на содржините што ги гледате. Ова може да предизвика затемнување на екранот за миг при излегувањето или влегувањето во видеорепродукцијата."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Никогаш"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Дури и ако апликацијата го побара тоа, вашиот уред никогаш нема да се обиде да го усогласи својот излез со оригиналната стапка на слики на содржините што ги гледате."</string>
@@ -208,7 +181,7 @@
     <string name="hdr_format_selection_manual_summary" msgid="7886959642083639353">"Кога е избрано, рачно може да ги оневозможите HDR-форматите што синџирот на уреди ги поддржува, а предизвикуваат проблеми со репродукцијата. Не може присилно да се овозможат HDR-форматите што вашиот синџир на уреди не ги поддржува. Апликациите може да изберат формат што не е со највисок квалитет."</string>
     <string name="hdr_format_info" msgid="5652559220799426076">"ИНФОРМАЦИИ ЗА ФОРМАТОТ"</string>
     <string name="hdr_show_formats" msgid="171065892975445851">"Прикажи ги форматите"</string>
-    <string name="hdr_hide_formats" msgid="8561568998525727230">"Скриј ги форматите"</string>
+    <string name="hdr_hide_formats" msgid="8561568998525727230">"Сокриј ги форматите"</string>
     <string name="hdr_enabled_formats" msgid="8527870623949982774">"ОВОЗМОЖЕНИ ФОРМАТИ"</string>
     <string name="hdr_disabled_formats" msgid="4758522849421497896">"ОНЕВОЗМОЖЕНИ ФОРМАТИ"</string>
     <string name="hdr_enabled_format_info_clicked" msgid="1466675962665861040">"За да оневозможите, променете го изборот на форматот на „Рачно“."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Да се промени резолуцијата на %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Изберете „Во ред“ за да користите %1$s отсега, па натаму."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision не е поддржан кај %1$s и ќе биде оневозможен во „Напредни поставки за екран“"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Режимов поддржува: %1$s\nна некои телевизори, можеби ќе треба да вклучите „Подобрен HDMI“ за да се овозможат повеќе HDR-формати. Проверете ги поставките на телевизорот за да видите дали е поддржано ова."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Овој режим поддржува %1$s. На некои телевизори, можеби ќе треба да вклучите „Подобрен HDMI“ за да се овозможат повеќе HDR-формати. Проверете ги поставките на телевизорот за да видите дали е поддржано ова."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Откажи"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Во ред"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Исчисти кеширани податоци?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Ова ќе исчисти кеширани податоци за сите аплик."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -296,11 +269,11 @@
     <string name="system_home_theater_control" msgid="6228949628173590310">"Контрола на домашно кино"</string>
     <string name="system_developer_options" msgid="8480844257066475479">"Опции на програмер"</string>
     <string name="accessibility_none" msgid="6355646833528306702">"Ништо"</string>
-    <string name="system_diagnostic" msgid="1654842813331919958">"Користење и дијагностика"</string>
+    <string name="system_diagnostic" msgid="1654842813331919958">"Употреба и дијагностика"</string>
     <string name="no_device_admins" msgid="4628974717150185625">"Не се достапни апликации за администраторот на уредот"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="7678529948487939871">"Оневозможено од администраторот"</string>
     <string name="disabled_by_administrator_summary" msgid="3420979957115426764">"Не е достапно"</string>
-    <string name="manage_device_admin" msgid="5714217234035017983">"Администраторски апликации"</string>
+    <string name="manage_device_admin" msgid="5714217234035017983">"Апликации за администраторот"</string>
     <string name="number_of_device_admins_none" msgid="2734299122299837459">"Нема активни апликации"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="108190334043671416">"Оневозм. од админ., шифрир. или складир. акредит."</string>
     <string name="enterprise_privacy_settings" msgid="8226765895133003202">"Информации за управуваниот уред"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Вашата организација управува со уредов."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> управува со уредов."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" U+2060⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Дознајте повеќе"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Апликација за камера}one{Апликации за камера}other{Апликации за камера}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Апликацијата „Календар“"</string>
@@ -388,7 +362,7 @@
     <string name="device_status_summary" msgid="3270932829412434985">"Мрежа, сериски броеви и други информации"</string>
     <string name="manual" msgid="5683935624321864999">"Рачно"</string>
     <string name="regulatory_information" msgid="9107675969694713391">"Регулаторни информации"</string>
-    <string name="device_feedback" msgid="4871903271442960465">"Повратни информации за уредов"</string>
+    <string name="device_feedback" msgid="4871903271442960465">"Испрати информации за уредот"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4641790432171693921">"Подигнувачот веќе е отклучен"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="2979556699380115576">"Прво поврзете се на интернет"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="1946089732305102622">"Поврзете се на интернет или контактирајте со операторот"</string>
@@ -678,7 +652,7 @@
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="9200419191468995574">"Текст со висок контраст"</string>
     <string name="accessibility_toggle_bold_text_preference_title" msgid="3328992531170432669">"Текст во болд"</string>
     <string name="accessibility_color_correction" msgid="6765093204922184119">"Корекција на боите"</string>
-    <string name="color_correction_usage" msgid="4160611639548748657">"Користи „Корекција на боите“"</string>
+    <string name="color_correction_usage" msgid="4160611639548748657">"Користи „Корекција на бои“"</string>
     <string name="color_correction_color_mode" msgid="5081377780734779169">"Режим во боја"</string>
     <string name="color_correction_mode_deuteranomaly" msgid="1513793544554228224">"Девтераномалија"</string>
     <string name="color_correction_mode_deuteranomaly_summary" msgid="5991561481464520986">"Црвена и зелена"</string>
@@ -691,7 +665,7 @@
     <string name="palette_color_orange" msgid="6209196069366109835">"Портокалова"</string>
     <string name="palette_color_yellow" msgid="298466132578870590">"Жолта"</string>
     <string name="palette_color_green" msgid="4904783063036825668">"Зелена"</string>
-    <string name="palette_color_cyan" msgid="3212217287628948203">"Тиркизна"</string>
+    <string name="palette_color_cyan" msgid="3212217287628948203">"Цијан"</string>
     <string name="palette_color_blue" msgid="8836682634988540630">"Сина"</string>
     <string name="palette_color_purple" msgid="2123828754639683555">"Виолетова"</string>
     <string name="palette_color_gray" msgid="4014534773994261194">"Сива"</string>
@@ -748,7 +722,7 @@
     <string name="system_accessibility_tts_engine_config" msgid="4757760652785865532">"Конфигурација на двигателот за говор"</string>
     <string name="system_speak_passwords" msgid="8556036524146404052">"Изговарај лозинки"</string>
     <string name="system_preferred_engine" msgid="3545505072652708443">"Претпочитан софтвер"</string>
-    <string name="system_speech_rate" msgid="6553204071403872669">"Брзина на говорот"</string>
+    <string name="system_speech_rate" msgid="6553204071403872669">"Брзина на говор"</string>
     <string name="system_play_sample" msgid="3934369914309865584">"Пушти примерок"</string>
     <string name="system_install_voice_data" msgid="8016395777968958673">"Инсталирај гласовни податоци"</string>
     <string name="system_general" msgid="687760148454147771">"Општа"</string>
@@ -759,14 +733,14 @@
     <string name="system_apps" msgid="8481888654606868074">"Апликации"</string>
     <string name="system_stay_awake" msgid="5935117574414511413">"Остани во активен режим"</string>
     <string name="keep_screen_on_summary" msgid="4680661166009970792">"Екранот никогаш нема да биде во режим во мирување"</string>
-    <string name="system_hdcp_checking" msgid="3757586362130048838">"Проверка со HDCP"</string>
+    <string name="system_hdcp_checking" msgid="3757586362130048838">"Проверување HDCP"</string>
     <string name="system_hdmi_optimization" msgid="4122753440620724144">"HDMI оптимизација"</string>
     <string name="system_reboot_confirm" msgid="7035370306447878560">"Рестартирај сега?"</string>
     <string name="system_desc_reboot_confirm" msgid="1567738857421128179">"За да ја ажурирате оваа поставка, потребно е рестартирање на вашиот уред"</string>
     <string name="system_never_check" msgid="2860070727606369055">"Никогаш не проверувај"</string>
     <string name="system_check_for_drm_content_only" msgid="6667617772587997533">"Провери само DRM содржина"</string>
     <string name="system_always_check" msgid="384870282800221580">"Секогаш проверувај"</string>
-    <string name="system_bt_hci_log" msgid="1891838112637932603">"Евиденција за Bluetooth HCI"</string>
+    <string name="system_bt_hci_log" msgid="1891838112637932603">"Најава на Bluetooth HCI"</string>
     <string name="system_email_address" msgid="3725494874473757217">"Адреса за е-пошта"</string>
     <string name="system_usb_debugging" msgid="2158285492172755923">"Отстранување грешки преку USB"</string>
     <string name="system_allow_mock_locations" msgid="2483106887711851466">"Овозможи лажни локации"</string>
@@ -775,17 +749,17 @@
     <string name="system_verify_apps_over_usb" msgid="7289212844195483932">"Потврди апликации преку USB"</string>
     <string name="system_desc_verify_apps_over_usb" msgid="7737988681480237094">"Провери апликации инсталирани преку ADB/ADT за штетно однесување"</string>
     <string name="system_wifi_verbose_logging" msgid="3097788974146704831">"Вербално пријавување на Wi‑Fi"</string>
-    <string name="system_desc_wifi_verbose_logging" msgid="3537578245428327314">"Овозможи детално евидентирање за Wi-Fi"</string>
+    <string name="system_desc_wifi_verbose_logging" msgid="3537578245428327314">"Овозможи вербално пријавување на Wi‑Fi"</string>
     <string name="system_show_touches" msgid="8244331695139748286">"Прикажи допири"</string>
     <string name="system_pointer_location" msgid="8724050865245555084">"Локација на покажувач"</string>
-    <string name="system_show_layout_bounds" msgid="8803080672553699649">"Прикажи граници на распоред"</string>
+    <string name="system_show_layout_bounds" msgid="8803080672553699649">"Прикажи граници на слој"</string>
     <string name="system_show_gpu_view_updates" msgid="1625918928089365222">"Прикажи ажурирање со GPU"</string>
     <string name="system_show_hardware_layer" msgid="5833664339844452290">"Прикажи слој на хардвер"</string>
     <string name="system_show_gpu_overdraw" msgid="5073007513540516704">"Прикажи GPU пречекорување"</string>
     <string name="system_show_surface_updates" msgid="7680759813613585278">"Прикажи ажуририрања на површина"</string>
-    <string name="system_window_animation_scale" msgid="685477540250939659">"Брзина на анимации за прозорци"</string>
-    <string name="system_transition_animation_scale" msgid="7266380208347453619">"Брзина на преодни анимации"</string>
-    <string name="system_animator_duration_scale" msgid="3829445237130423625">"Брзина на општи анимации"</string>
+    <string name="system_window_animation_scale" msgid="685477540250939659">"Опсег на анимација на прозор"</string>
+    <string name="system_transition_animation_scale" msgid="7266380208347453619">"Степен на преодна анимација"</string>
+    <string name="system_animator_duration_scale" msgid="3829445237130423625">"Скала за времетраење на аниматор"</string>
     <string name="system_strict_mode_enabled" msgid="7392183793064579588">"Овозможен е строг режим"</string>
     <string name="system_profile_gpu_rendering" msgid="1113416260742329348">"Прикажување профил на GPU"</string>
     <string name="system_enable_traces" msgid="108745519968154528">"Овозможи траги"</string>
@@ -795,12 +769,12 @@
     <string name="system_desc_stay_awake" msgid="8485868071929937500">"Оневозможи режим на штедење"</string>
     <string name="system_desc_hdcp_checking" msgid="1664068008848077241">"Користи само за DRM содржина"</string>
     <string name="system_desc_hdmi_optimization" msgid="5695603795556335912">"Оптимизирај го екранот за максимална резолуција или максимална брзина на приказ на кадри. Ова влијае само врз Ултра HD-екрани. Менувањето на оваа поставка ќе предизвика рестартирање на вашиот уред."</string>
-    <string name="system_desc_bt_hci_log" msgid="2592649923221658103">"Овозможи евиденција за Bluetooth HCI"</string>
+    <string name="system_desc_bt_hci_log" msgid="2592649923221658103">"Овозможи Bluetooth HCI за евиденција на пресретнување пакети"</string>
     <string name="system_desc_usb_debugging" msgid="5672275208185222785">"Режим за отстранување грешки кога е поврзано USB"</string>
     <string name="system_desc_wait_for_debugger" msgid="7213496668606417691">"Пред да се изврши, апликацијата во која се отстрануваат грешки чека да се закачи програмата за отстранување грешки"</string>
-    <string name="system_desc_show_layout_bounds" msgid="5275008598296135852">"Прикажувај граници на исечок, маргини итн."</string>
+    <string name="system_desc_show_layout_bounds" msgid="5275008598296135852">"Прикажи граници на клип, маргини итн."</string>
     <string name="system_desc_show_gpu_view_updates" msgid="9088343415389734854">"Осветли прегледи во прозорците при цртање со GPU"</string>
-    <string name="system_desc_show_hardware_layer" msgid="3483713991865249527">"Осветлувај ги хардверските слоеви со зелено кога се ажурираат"</string>
+    <string name="system_desc_show_hardware_layer" msgid="3483713991865249527">"Осветли слоеви на хардвер со зелено при нивно ажурирање"</string>
     <string name="system_desc_show_gpu_overdraw" msgid="74019834911598588">"Од најдобро кон најлошо: сино, зелено, светло црвено, црвено"</string>
     <string name="system_desc_show_surface_updates" msgid="4018685547515133353">"Осветли површини на прозорци при нивно ажурирање"</string>
     <string name="system_desc_strict_mode_enabled" msgid="1974896408481676324">"Осветли екран при долги операции на главна нишка"</string>
@@ -821,12 +795,12 @@
     <string name="enable_opengl_traces_none" msgid="4718084947494592040">"Нема"</string>
   <string-array name="animation_scale_entries">
     <item msgid="5408992662476056082">"Анимацијата е исклучена"</item>
-    <item msgid="6818290063799857019">"Брзина на анимации 0,5x"</item>
-    <item msgid="8257959452691080724">"Брзина на анимации 1x"</item>
-    <item msgid="4781052272686018414">"Брзина на анимации 1,5x"</item>
-    <item msgid="2272016945160227610">"Брзина на анимации 2x"</item>
-    <item msgid="5015441793276576312">"Брзина на анимации 5x"</item>
-    <item msgid="1290233583371556415">"Брзина на анимации 10x"</item>
+    <item msgid="6818290063799857019">"Опсег на анимација 0,5x"</item>
+    <item msgid="8257959452691080724">"Опсег на анимација 1x"</item>
+    <item msgid="4781052272686018414">"Опсег на анимација 1,5x"</item>
+    <item msgid="2272016945160227610">"Опсег на анимација 2x"</item>
+    <item msgid="5015441793276576312">"Опсег на анимација 5x"</item>
+    <item msgid="1290233583371556415">"Опсег на анимација 10x"</item>
   </string-array>
     <string name="track_frame_time_off" msgid="8845064783618702239">"Исклучено"</string>
     <string name="track_frame_time_bars" msgid="5841531515222229632">"На екранот како цртички"</string>
@@ -870,7 +844,7 @@
     <string name="inputs_aux" msgid="5331442342029867329">"Aux"</string>
     <string name="inputs_custom_name" msgid="2649826613531559538">"Приспособено име"</string>
     <string name="inputs_custom_name_description_fmt" msgid="2879134265596928298">"Внесете име за влезот <xliff:g id="INPUT">%1$s</xliff:g>."</string>
-    <string name="inputs_hide" msgid="9223355763198742416">"Скриј"</string>
+    <string name="inputs_hide" msgid="9223355763198742416">"Сокриј"</string>
     <string name="inputs_show" msgid="2937435050499142756">"Прикажи го овој влез"</string>
     <string name="input_header_names" msgid="5903234218909970550">"Име"</string>
     <string name="inputs_hdmi_control" msgid="650355636965841054">"Контрола на HDMI"</string>
@@ -946,7 +920,7 @@
     <string name="settings_on" msgid="7734010120323404333">"Вклучено"</string>
     <string name="settings_off" msgid="4060451657850476369">"Исклучено"</string>
     <string name="device_daydreams_none" msgid="3405655350757277348">"Исклучи го екранот"</string>
-    <string name="device_daydreams_select" msgid="7203264446482623438">"Штедач на екран"</string>
+    <string name="device_daydreams_select" msgid="7203264446482623438">"Заштитник на екран"</string>
     <string name="device_daydreams_test" msgid="7828275397550076567">"Започни сега"</string>
     <string name="device_daydreams_sleep" msgid="6847770718407377357">"Кога да започне"</string>
     <string name="device_daydreams_sleep_description" msgid="6237610484915504587">"Заштитникот на екран започнува по овој период на неактивност. Ако не е избран заштитник на екран, екранот се исклучува."</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Потврдете за да не се исклучува екранот додека гледате, но така се зголемува потрошувачката на енергија."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Кога е неактивно"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Кога се гледа"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Автоматско исклучување"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Автоматско исклучување кога уредот е неактивен"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Автоматско исклучување при гледањето"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Автоматско исклучување на телевизорот"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Автоматско исклучување на телевизорот кога е неактивен"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Автоматско исклучување на телевизорот кога се гледа"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Тајмерот „Кога е неактивно“ мора да биде подолг од тајмерот „Кога се гледа“"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Тајмерот „Кога се гледа“ мора да биде подолг од тајмерот „Кога е неактивно“"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Ограничена мрежна врска во режим на подготвеност"</string>
@@ -1086,7 +1060,7 @@
     <string name="remove_device_admin" msgid="2623866073546295104">"Деактивирај ја апликацијата за администраторот на уредот"</string>
     <string name="uninstall_device_admin" msgid="6301368408620948266">"Деинсталирај ја апликацијата"</string>
     <string name="remove_and_uninstall_device_admin" msgid="1504351551194915633">"Деактивирај и деинсталирај"</string>
-    <string name="select_device_admin_msg" msgid="8475934459999710332">"Администраторски апликации"</string>
+    <string name="select_device_admin_msg" msgid="8475934459999710332">"Апликации за администраторот"</string>
     <string name="add_device_admin_msg" msgid="5390773166682603421">"Да се активира аплик. за администратор?"</string>
     <string name="add_device_admin" msgid="5078281377915844544">"Активирај ја апликацијата за администраторот на уредот"</string>
     <string name="device_admin_warning" msgid="7399916080685200660">"Со активирање на апликацијата за администраторот ќе се дозволи апликацијата <xliff:g id="APP_NAME">%1$s</xliff:g> да ги извршува следниве операции:"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Однесување кога е вклучен"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Ресетирај"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Код за спарување преку Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Режим на енергија"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Подобрете ја енергетската ефикасност кога не се користи телевизорот"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Овозможува:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Имајте предвид дека овој режим може да ја зголеми потрошувачката на енергија на уредот."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Да се овозможи „<xliff:g id="ENERGYMODENAME">%s</xliff:g>“?"</string>
 </resources>
diff --git a/Settings/res/values-mk/widget-strings.xml b/Settings/res/values-mk/widget-strings.xml
index 92684a6ea..779028ddf 100644
--- a/Settings/res/values-mk/widget-strings.xml
+++ b/Settings/res/values-mk/widget-strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="text_obfuscation_toggle_caption" msgid="8131892286447339613">"Скриј ја лозинката"</string>
+    <string name="text_obfuscation_toggle_caption" msgid="8131892286447339613">"Сокриј ја лозинката"</string>
 </resources>
diff --git a/Settings/res/values-ml/energy-modes.xml b/Settings/res/values-ml/energy-modes.xml
deleted file mode 100644
index 11d539733..000000000
--- a/Settings/res/values-ml/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"ആവശ്യമായ നെറ്റ്‌വർക്ക് ഫീച്ചറുകൾ"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"കുറഞ്ഞ ഊർജ്ജ ഉപഭോഗം"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"ടിവി ഉപയോഗിക്കാത്തപ്പോൾ നെറ്റ്‌വർക്ക് കണക്ഷൻ ഓഫാക്കുക."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"നിർണ്ണായക അപ്ഡേറ്റുകളും ഫംഗ്ഷനുകളും"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"നിർദ്ദേശിച്ച നെറ്റ്‌വർക്ക് ഫീച്ചറുകൾ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ഒപ്റ്റിമൈസ് ചെയ്‌ത ഊർജ്ജ ഉപഭോഗം"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"നെറ്റ്‌വർക്കിലൂടെ ടിവിയെ സജീവമാക്കുന്ന ഫീച്ചറുകൾ ഓണാക്കുന്നു (സ്റ്റാൻഡ്‌ബൈ ആയി നെറ്റ്‌വർക്കിലേക്ക് കണക്റ്റ് ചെയ്തിരിക്കുന്നു)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[ഫീച്ചർ 1 ചേർക്കുക]"</item>
-    <item msgid="8724721267222341891">"[ഫീച്ചർ 2 ചേർക്കുക]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"അധിക നെറ്റ്‌വർക്ക് ഫീച്ചറുകൾ"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"വർദ്ധിച്ച ഊർജ്ജ ഉപഭോഗം"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"നിർദ്ദേശിച്ച ഫീച്ചറുകൾക്ക് പുറമേ, ടിവി ഉപയോഗിക്കാത്തപ്പോൾ ഈ ഓപ്‌ഷൻ അധിക ഫീച്ചറുകൾ ഓണാക്കുന്നു, അത് ഊർജ്ജ ഉപഭോഗം വർധിപ്പിച്ചേക്കാം."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[ഫീച്ചർ 1 ചേർക്കുക]"</item>
-    <item msgid="170760143032597722">"[ഫീച്ചർ 2 ചേർക്കുക]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-ml/strings.xml b/Settings/res/values-ml/strings.xml
index 4969c0660..d5bb5c5d0 100644
--- a/Settings/res/values-ml/strings.xml
+++ b/Settings/res/values-ml/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"ബാക്കപ്പെടുക്കലും പുനഃസ്ഥാപിക്കലും"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"ഫാക്‌ടറി ഡാറ്റ പുനഃക്രമീകരണം"</string>
     <string name="device_calibration" msgid="2907914144048739705">"കാലിബ്രേഷൻ"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"ഷട്ട്-ഓഫ് ടൈമർ"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"ടിവി ഓഫാക്കാനും എനർജി ലാഭിക്കാനും ടൈമറുകൾ സജ്ജീകരിക്കുക"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"പവറും ഊർജ്ജവും"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"ഇക്കോ ക്രമീകരണം"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"ഉപകരണങ്ങൾ"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"ഫോർമാറ്റുകൾ തിരഞ്ഞെടുക്കുക"</string>
@@ -151,40 +151,13 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"വിപുലമായ ശബ്‌ദ ക്രമീകരണം"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"ഗെയിം മോഡ് അനുവദിക്കുക"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"ഉള്ളടക്കത്തിന്റെ ഡൈനാമിക് റേഞ്ച് പൊരുത്തപ്പെടുത്തുക"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"ഈ ഓപ്‌ഷൻ പ്രവർത്തനക്ഷമമാക്കുമ്പോൾ, ഉള്ളടക്കവുമായി പൊരുത്തപ്പെടുന്നതിന്, വ്യത്യസ്‌ത ഡെെനാമിക് റേഞ്ച് ഫോർമാറ്റുകളിലേക്ക് സിസ്‌റ്റം മാറും. ഫോർമാറ്റ് മാറുമ്പോൾ കറുത്ത സ്‌ക്രീൻ ദൃശ്യമാകാൻ ഇത് കാരണമായേക്കാം.\n\nകൂടുതൽ ഡെെനാമിക് റേഞ്ച് ഓപ്‌ഷനുകൾക്ക്, വിപുലമായ ഡിസ്‌പ്ലേ ക്രമീകരണം ക്ലിക്ക് ചെയ്യുക."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"മുൻഗണന നൽകുന്ന ഡെെനാമിക് റേഞ്ച്"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"സിസ്റ്റം മുൻ‌ഗണന നൽകുന്ന പരിവർത്തനം"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"ഫോർമാറ്റ് പരിവർത്തനം മാനേജ് ചെയ്യാൻ സിസ്റ്റത്തെ അനുവദിക്കുക"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"ഈ ഓപ്‌ഷൻ തിരഞ്ഞെടുത്താൽ, നിങ്ങളുടെ ഡിസ്‌പ്ലേയിലേക്ക് അയയ്‌ക്കേണ്ട അനുയോജ്യമായ ഒരു ഡൈനാമിക് ശ്രേണി സിസ്റ്റം നിർണ്ണയിച്ച് ആവശ്യാനുസരണം ഈ ഡൈനാമിക് ശ്രേണിയിലേക്ക് ഉള്ളടക്കം പരിവർത്തനം ചെയ്യുന്നു."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"എല്ലായ്‌പ്പോഴും ഉള്ളടക്കത്തിന്റെ ഫോർമാറ്റുമായി പൊരുത്തപ്പെടുന്നു"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"പരിവർത്തനം നിർബന്ധമാക്കുക"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"മുൻഗണന നൽകുന്ന ഫോർമാറ്റിലേക്ക് നിർബന്ധിതമായി പരിവർത്തനം ചെയ്യുന്നു"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"മുൻഗണന നൽകുന്ന ഫോർമാറ്റിലേക്ക് നിർബന്ധിതമായി പരിവർത്തനം ചെയ്യുക പരിവർത്തനം നിർബന്ധമാക്കുന്നത്, ഡിസ്പ്ലേ മോഡിലോ HDR ഫോർമാറ്റിലോ ഉള്ള മറ്റ് ക്രമീകരണങ്ങളെ ബാധിച്ചേക്കാം."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"എല്ലായ്‌പ്പോഴും SDR-ലേക്ക്"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"എല്ലായ്‌പ്പോഴും <xliff:g id="HDR_TYPE">%s</xliff:g> എന്നതിലേക്ക്"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"നിങ്ങൾക്ക് HDR ഔട്ട്പുട്ട് നിർബന്ധമാക്കണോ?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"ഡിഫോൾട്ടായി, പരിവർത്തനം <xliff:g id="HDR_TYPE">%s</xliff:g> എന്നതിലേക്ക് മാറാൻ നിർബന്ധിതമാകും."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"നിങ്ങളുടെ ഡിസ്പ്ലേ 1080p 60Hz റെസല്യൂഷനിൽ പ്രവർത്തിക്കും. 4k 60Hz റെസല്യൂഷനിൽ പ്രവർത്തിക്കുമ്പോൾ ഈ ഓപ്‌ഷൻ നിങ്ങളുടെ ഡിസ്പ്ലേക്ക് അനുയോജ്യമാകില്ല."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"നിലവിലെ റെസല്യൂഷൻ ഡോൾബി വിഷനെ പിന്തുണയ്ക്കുന്നില്ല. നിങ്ങൾ നേരിട്ട് ഡോൾബി വിഷൻ പ്രവർത്തനക്ഷമമാക്കുകയാണെങ്കിൽ, നിങ്ങളുടെ ഡിസ്പ്ലേയുടെ റെസല്യൂഷൻ 1080p 60Hz ആക്കി മാറ്റും"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"റെസല്യൂഷൻ 1080p 60Hz ആക്കി മാറ്റണോ?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Dolby Vision-ലേക്ക് എപ്പോഴും നിർബന്ധിതമായി പരിവർത്തനം ചെയ്യുക"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"വിപുലമായ ഡിസ്‌പ്ലേ ക്രമീകരണത്തിലെ HDR ഫോർമാറ്റുകളിൽ Dolby Vision പ്രവർത്തനരഹിതമാക്കിയാൽ, Dolby Vision-ലേക്ക് നിർബന്ധിതമായി പരിവർത്തനം ചെയ്യുന്നത് അതിനെ വീണ്ടും പ്രവർത്തനക്ഷമമാക്കും."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"HDR10-ലേക്ക് എപ്പോഴും നിർബന്ധിതമായി പരിവർത്തനം ചെയ്യുക"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"വിപുലമായ ഡിസ്‌പ്ലേ ക്രമീകരണത്തിലെ HDR ഫോർമാറ്റുകളിൽ HDR10 പ്രവർത്തനരഹിതമാക്കിയാൽ, HDR10-ലേക്ക് നിർബന്ധിതമായി പരിവർത്തനം ചെയ്യുന്നത് അതിനെ വീണ്ടും പ്രവർത്തനക്ഷമമാക്കും."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"HLG-യിലേക്ക് എപ്പോഴും നിർബന്ധിതമായി പരിവർത്തനം ചെയ്യുക"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"വിപുലമായ ഡിസ്‌പ്ലേ ക്രമീകരണത്തിലെ HDR ഫോർമാറ്റുകളിൽ HLG പ്രവർത്തനരഹിതമാക്കിയാൽ, HLG-യിലേക്ക് നിർബന്ധിത പരിവർത്തനം നടത്തുന്നത് അതിനെ വീണ്ടും പ്രവർത്തനക്ഷമമാക്കും."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"HDR10+ലേക്ക് എപ്പോഴും നിർബന്ധിതമായി പരിവർത്തനം ചെയ്യുക"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"വിപുലമായ ഡിസ്‌പ്ലേ ക്രമീകരണത്തിലെ HDR ഫോർമാറ്റുകളിൽ HDR10+ പ്രവർത്തനരഹിതമാക്കിയാൽ, HDR10+-ലേക്ക് നിർബന്ധിതമായി പരിവർത്തനം ചെയ്യുന്നത് അതിനെ വീണ്ടും പ്രവർത്തനക്ഷമമാക്കും."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"SDR-ലേക്ക് എപ്പോഴും നിർബന്ധിതമായി പരിവർത്തനം ചെയ്യുക"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"SDR-ലേക്ക് നിർബന്ധിതമായി പരിവർത്തനം ചെയ്യുന്നത്, വിപുലമായ ഡിസ്‌പ്ലേ ക്രമീകരണത്തിലെ HDR ഫോർമാറ്റുകളിലെ എല്ലാ ഫോർമാറ്റുകളെയും പ്രവർത്തനരഹിതമാക്കും."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"ഉള്ളടക്കത്തിന്റെ ഫ്രെയിം എണ്ണം പൊരുത്തപ്പെടുത്തുക"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"സുഗമമായത് മാത്രം"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"സുഗമമായത്"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"ആപ്പ് അത് അഭ്യർത്ഥിച്ചാൽ, നിങ്ങളുടെ ഉപകരണം അതിന്റെ ഔട്ട്പുട്ടിനെ നിങ്ങൾ കാണുന്ന ഉള്ളടക്കത്തിന്റെ ഒറിജിനൽ ഫ്രെയിം എണ്ണവുമായി പൊരുത്തപ്പെടുത്തും, ടിവിക്ക് സുഗമമായൊരു കൈമാറ്റം നടത്താനാകുമെങ്കിൽ മാത്രം."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"നിങ്ങളുടെ കണക്റ്റ് ചെയ്തിരിക്കുന്ന ഡിസ്പ്ലേ തടസ്സരഹിതമായ റീഫ്രഷ് തോത് പരിവർത്തനങ്ങളെ പിന്തുണയ്ക്കുന്നില്ല. ഇതിനെ പിന്തുണയ്ക്കുന്ന ഒരു ഡിസ്പ്ലേയിലേക്ക് നിങ്ങൾ മാറുന്നത് വരെ ഈ ഓപ്ഷൻ ബാധകമാകില്ല."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"എപ്പോഴും"</string>
-    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"ആപ്പ് അത് അഭ്യർത്ഥിച്ചാൽ, നിങ്ങളുടെ ഉപകരണം അതിന്റെ ഔട്ട്പുട്ടിനെ നിങ്ങൾ കാണുന്ന ഉള്ളടക്കത്തിന്റെ ഒറിജിനൽ ഫ്രെയിം എണ്ണവുമായി പൊരുത്തപ്പെടുത്തും. ഇത് ഒരു വീഡിയോ പ്ലേ ബാക്കിലേക്ക് പ്രവേശിക്കുമ്പോഴും പുറത്തുകടക്കുമ്പോഴും ഒരു നിമിഷം നിങ്ങളുടെ സ്ക്രീൻ ശൂന്യമാകാൻ കാരണമായേക്കാം."</string>
-    <string name="match_content_frame_rate_never" msgid="1678354793095148423">"ഒരിക്കലും വേണ്ട"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"സുഗമമല്ലാത്തത്"</string>
+    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"ആപ്പ് അത് അഭ്യർത്ഥിച്ചാൽ, നിങ്ങളുടെ ഉപകരണം അതിന്റെ ഔട്ട്പുട്ടിനെ നിങ്ങൾ കാണുന്ന ഉള്ളടക്കത്തിന്റെ ഒറിജിനൽ ഫ്രെയിം എണ്ണവുമായി പൊരുത്തപ്പെടുത്തും. ഇത് ഒരു വീഡിയോ പ്ലേ ബാക്കിലേക്ക് പ്രവേശിക്കുമ്പോൾ ഒരു നിമിഷം നിങ്ങളുടെ സ്ക്രീൻ ശൂന്യമാകാൻ കാരണമായേക്കാം."</string>
+    <string name="match_content_frame_rate_never" msgid="1678354793095148423">"ഒരിക്കലും"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"ആപ്പ് അത് അഭ്യർത്ഥിച്ചാൽ പോലും, നിങ്ങളുടെ ഉപകരണം ഒരിക്കലും അതിന്റെ ഔട്ട്പുട്ടിനെ നിങ്ങൾ കാണുന്ന ഉള്ളടക്കത്തിന്റെ ഒറിജിനൽ ഫ്രെയിം എണ്ണവുമായി പൊരുത്തപ്പെടുത്താൻ ശ്രമിക്കില്ല."</string>
     <string name="font_scale_settings_title" msgid="4114019544800225980">"ടെക്‌സ്‌റ്റ് സ്കെയിൽ ചെയ്യൽ"</string>
     <string name="font_scale_item_detail" msgid="1558315053348778805">"<xliff:g id="SCALE">%1$d</xliff:g>%% ആയി സ്കെയിൽ ചെയ്യുക"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"റെസല്യൂഷൻ %1$s ആക്കി മാറ്റണോ?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"ഇപ്പോൾ മുതൽ %1$s ഉപയോഗിക്കാൻ ശരി തിരഞ്ഞെടുക്കുക."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s എന്നതിൽ ഡോൾബി വിഷൻ പിന്തുണയ്‌ക്കുന്നില്ല, ഇത് \"വിപുലമായ ഡിസ്‌പ്ലേ ക്രമീകരണത്തിൽ\" പ്രവർത്തനരഹിതമാക്കും"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"ഈ മോഡ് ഇനിപ്പറയുന്നത് പിന്തുണയ്ക്കുന്നു: %1$s\nചില ടിവികളിൽ, കൂടുതൽ HDR ഫോർമാറ്റുകൾ പ്രവർത്തനക്ഷമമാക്കാൻ നിങ്ങൾക്ക് മെച്ചപ്പെടുത്തിയ HDMI ഓണാക്കേണ്ടി വന്നേക്കാം. ഇതിന് പിന്തുണയുണ്ടോ എന്നറിയാൻ നിങ്ങളുടെ ടിവി ക്രമീകരണം പരിശോധിക്കുക."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"ഈ മോഡ് %1$s പിന്തുണയ്‌ക്കുന്നു. ചില ടിവികളിൽ, കൂടുതൽ HDR ഫോർമാറ്റുകൾ പ്രവർത്തനക്ഷമമാക്കാൻ നിങ്ങൾക്ക് മെച്ചപ്പെടുത്തിയ HDMI ഓണാക്കേണ്ടി വന്നേക്കാം. ഇതിന് പിന്തുണയുണ്ടോ എന്നറിയാൻ നിങ്ങളുടെ ടിവി ക്രമീകരണം പരിശോധിക്കുക."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"റദ്ദാക്കുക"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ശരി"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"കാഷെ ചെയ്‌ത ഡാറ്റ മായ്‌ക്കണോ?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"ഇത് എല്ലാ അപ്ലിക്കേഷനുകൾക്കുമായി കാഷെ ചെയ്ത ഡാറ്റ മായ്‌ക്കും."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -285,7 +258,7 @@
     <string name="language_empty_list_user_restricted" msgid="5430199913998605436">"ഉപകരണ ഭാഷ മാറ്റാൻ നിങ്ങൾക്ക് അനുമതിയില്ല."</string>
     <string name="system_keyboard" msgid="1514460705385401872">"കീബോർഡ്"</string>
     <string name="system_keyboard_autofill" msgid="8530944165814838255">"കീബോർഡും സ്വയമേവ പൂരിപ്പിക്കലും"</string>
-    <string name="system_autofill" msgid="6983989261108020046">"സ്വയമേവ പൂരിപ്പിക്കൽ"</string>
+    <string name="system_autofill" msgid="6983989261108020046">"സ്വമേധയാ പൂരിപ്പിക്കൽ"</string>
     <string name="system_home" msgid="2149349845791104094">"ഹോം സ്‌ക്രീൻ"</string>
     <string name="system_search" msgid="3170169128257586925">"Search"</string>
     <string name="system_google" msgid="945985164023885276">"Google"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"ഈ ഉപകരണം മാനേജുചെയ്യുന്നത് നിങ്ങളുടെ സ്ഥാപനമാണ്."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"ഈ ഉപകരണം നിയന്ത്രിക്കുന്നത് <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ആണ്."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"കൂടുതലറിയുക"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{ക്യാമറാ ആപ്പ്}other{ക്യാമറാ ആപ്പുകൾ}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Calendar ആപ്പ്"</string>
@@ -845,8 +819,8 @@
     <string name="title_current_keyboard" msgid="891238509164879851">"നിലവിലെ കീബോർഡ്"</string>
     <string name="title_configure" msgid="846802387014612210">"കോൺഫിഗർ ചെയ്യുക"</string>
     <string name="desc_configure_keyboard" msgid="3474279140150468141">"ക്കീബോർഡ് ഓപ്ഷനുകൾ"</string>
-    <string name="title_current_autofill_service" msgid="9029001041887283153">"നിലവിലെ സ്വയമേവ പൂരിപ്പിക്കൽ സേവനം"</string>
-    <string name="title_select_autofill_service" msgid="696559582725756848">"സ്വയമേവ പൂരിപ്പിക്കൽ സേവനം തിരഞ്ഞെടുക്കുക"</string>
+    <string name="title_current_autofill_service" msgid="9029001041887283153">"നിലവിലെ സ്വമേധയാ പൂരിപ്പിക്കൽ സേവനം"</string>
+    <string name="title_select_autofill_service" msgid="696559582725756848">"സ്വമേധയാ പൂരിപ്പിക്കൽ സേവനം തിരഞ്ഞെടുക്കുക"</string>
     <string name="autofill_none" msgid="1615056985649424207">"ഒന്നുമില്ല"</string>
     <string name="autofill_confirmation_message" msgid="3840267789160192558">"&lt;b&gt;ഈ ആപ്പിനെ നിങ്ങൾ വിശ്വസിക്കുന്നുണ്ടെന്ന് ഉറപ്പുവരുത്തുക&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=പാസ്‍വേഡ് സേവനം&gt;%1$s&lt;/xliff:g&gt; സ്വയമേവ പൂരിപ്പിക്കേണ്ടത് എന്താണെന്ന് നിർണ്ണയിക്കുന്നതിന് നിങ്ങളുടെ സ്‌ക്രീനിൽ ഉള്ളത് ഉപയോഗിക്കുന്നു."</string>
     <string name="computing_size" msgid="8623916230485437579">"കണക്കാക്കുന്നു…"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"കണ്ടുകൊണ്ടിരിക്കുമ്പോൾ ഡിസ്പ്ലേ ഓഫായി പോകുന്നതിൽ നിന്ന് തടയാൻ സ്ഥിരീകരിക്കുക, ഇത് ഊർജ്ജ ഉപഭോഗം കൂട്ടാനുള്ള സാധ്യതയുണ്ട്."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"നിർജ്ജീവമായിരിക്കുമ്പോൾ"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"കാണുമ്പോൾ"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"സ്വയമേവ ഓഫാക്കുക"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"നിഷ്‌ക്രിയമായിരിക്കുമ്പോൾ സ്വയമേവ ഓഫാക്കുക"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"കാണുമ്പോൾ സ്വയമേവ ഓഫാക്കുക"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"ടിവി സ്വയമേവ ഓഫാക്കുക"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"നിർജ്ജീവമായിരിക്കുമ്പോൾ സ്വയമേവ ഓഫാക്കുക"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"കാണുമ്പോൾ ടിവി സ്വയമേവ ഓഫാക്കുക"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"സജീവമല്ലാത്തപ്പോൾ\" ടൈമർ \"കാണുമ്പോൾ\" ടൈമറിനേക്കാൾ ദൈർഘ്യം കുറവായിരിക്കണം"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"കാണുമ്പോൾ\" ടൈമർ \"സജീവമല്ലാത്തപ്പോൾ\" ടൈമറിനേക്കാൾ ദൈർഘ്യമുള്ളതായിരിക്കണം"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"സ്റ്റാൻഡ്ബൈയിൽ പരിമിത നെറ്റ്‌വർക്ക് കണക്ഷൻ"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"പവർ ഓണാക്കുമ്പോഴുള്ള പ്രവർത്തനരീതി"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"റീസെറ്റ് ചെയ്യുക"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"ഇതർനെറ്റ് ജോടിയാക്കൽ കോഡ്"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"ഊർജ്ജ മോഡുകൾ"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"ടിവി ഉപയോഗിക്കാത്തപ്പോൾ ഊർജ്ജക്ഷമത മെച്ചപ്പെടുത്തുക"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"പ്രവർത്തനക്ഷമമാക്കുന്നു:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ഉപകരണത്തിന്റെ ഊർജ്ജ ഉപഭോഗം ഈ മോഡ് വർദ്ധിപ്പിച്ചേക്കാമെന്ന കാര്യം ശ്രദ്ധിക്കുക."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" പ്രവർത്തനക്ഷമമാക്കുക"</string>
 </resources>
diff --git a/Settings/res/values-mn/energy-modes.xml b/Settings/res/values-mn/energy-modes.xml
deleted file mode 100644
index 91a73ecc2..000000000
--- a/Settings/res/values-mn/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Сүлжээний үндсэн онцлогууд"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Эрчим хүчний бага хэрэглээ"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"ТВ-ийг ашиглаагүй үед сүлжээний холболтыг унтраана уу."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Чухал шинэчлэлт болон ажиллагаа"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Санал болгосон сүлжээний онцлогууд"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Эрчим хүчний оновчилсон хэрэглээ"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ТВ-ийг сүлжээгээр (сүлжээнд холбогдсон зогсолт) сэрээдэг онцлогуудыг асаана."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Сүлжээний нэмэлт онцлогууд"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Эрчим хүчний нэмэгдсэн хэрэглээ"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Санал болгосон онцлогуудаас гадна энэ сонголт нь ТВ-ийг ашиглаагүй үед нэмэлт онцлогуудыг асаадаг бөгөөд энэ нь эрчим хүчний хэрэглээг нэмэгдүүлж магадгүй."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-mn/strings.xml b/Settings/res/values-mn/strings.xml
index d64b2204b..793490ec5 100644
--- a/Settings/res/values-mn/strings.xml
+++ b/Settings/res/values-mn/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Нөөцлөх &amp; сэргээх"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Үйлдвэрээс гарсан төлөвт"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Тааруулалт"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Цаг хэмжигчийг унтраах"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"ТВ-ийг унтраах болон эрчим хүч хэмнэхийн тулд цаг хэмжигч тохируулна уу"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Цэнэг болон Эрчим хүч"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Эко тохиргоо"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Төхөөрөмжүүд"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Формат сонгох"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Нарийвчилсан дууны тохиргоо"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Тоглоомын горимыг зөвшөөрөх"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Контентын динамик мужийг тааруулах"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Энэ сонголтыг идэвхжүүлэх үед систем контенттой тааруулахын тулд динамикийн мужийн өөр өөр форматын хооронд сэлгэнэ. Энэ нь формат сэлгэх үед дэлгэцийг хар болгоход хүргэж магадгүй.\n\nДинамик мужийн бусад сонголт авах бол Дэлгэцийн дэвшилтэт тохиргоог товшино уу."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Сонгосон динамик муж"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Системийн сонгосон хувиралт"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Системд форматын хувиралтыг удирдахыг зөвшөөрнө үү"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Энэ сонголтыг сонгосон үед систем таны дэлгэц рүү илгээх тохирох динамик мужийг тодорхойлж, шаардлагатай бол контентыг энэ динамик муж руу хувиргана."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Үргэлж контентын форматтай таруулна"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Хувиралтыг хүчлэх"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Хувиралтыг сонгосон формат руу хүчилнэ"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Хувиралтыг сонгосон формат рүү хүчилнэ. Хувиралтыг хүчлэх нь Дэлгэцийн горим эсвэл HDR форматын бусад тохиргоонд нөлөөлж магадгүй."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Үргэлж SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Үргэлж <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Та HDR гаралтыг хүчлэхийг хүсэж байна уу?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Өгөгдмөлөөр хувиралтыг <xliff:g id="HDR_TYPE">%s</xliff:g> болгож хүчилнэ."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Таны дэлгэц 1080p 60Hz нягтралтайгаар ажиллана. Таны дэлгэц 4000 60Hz нягтралтайгаар ажиллаж байгаа үед энэ сонголт тохиромжгүй."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision-г одоогийн нягтралд дэмждэггүй. Хэрэв та Dolby Vision-г гар аргаар идэвхжүүлбэл таны дэлгэцийн нягтралыг 1080p 60Hz болгож өөрчилнө"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Нягтралыг 1080p 60Hz болгож өөрчлөх үү?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Хувиралтыг үргэлж Dolby Vision рүү хүчлэх"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Хэрэв Дэлгэцийн нарийвчилсан тохиргооны HDR форматууд Dolby Vision-г идэвхгүй болгосон бол хувиралтыг Dolby Vision рүү хүчлэх нь үүнийг дахин идэвхжүүлнэ."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Хувиралтыг үргэлж HDR10 руу хүчлэх"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Хэрэв Дэлгэцийн нарийвчилсан тохиргооны HDR форматууд HDR10-ыг идэвхгүй болгосон бол хувиралтыг HDR10 руу хүчлэх нь үүнийг дахин идэвхжүүлнэ."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Хувиралтыг үргэлж HLG руу хүчлэх"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Хэрэв Дэлгэцийн нарийвчилсан тохиргооны HDR форматууд HLG-г идэвхгүй болгосон бол хувиралтыг HLG руу хүчлэх нь үүнийг дахин идэвхжүүлнэ."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Хувиралтыг үргэлж HDR10+ руу хүчлэх"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Хэрэв Дэлгэцийн нарийвчилсан тохиргооны HDR форматууд HDR10+-г идэвхгүй болгосон бол хувиралтыг HDR10+ руу хүчлэх нь үүнийг дахин идэвхжүүлнэ."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Хувиралтыг үргэлж SDR руу хүчлэх"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Хувиралтыг SDR руу хүчлэх нь Дэлгэцийн нарийвчилсан тохиргоонд HDR форматууд дахь бүх форматыг идэвхгүй болгоно."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Контентын фрэймийн хурдыг тааруулах"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Зөвхөн саадгүй"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Саадгүй"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Хэрэв апп ингэх хүсэлт тавьсан бол таны төхөөрөмж ЗӨВХӨН таны ТВ саадгүй шилжилт гүйцэтгэх боломжтой тохиолдолд гаралтаа таны үзэж буй контентын эх фрэймийн хурдтай тааруулна."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Таны холбогдсон дэлгэц нь сэргээх хурдны тасралтгүй шилжилтийг дэмждэггүй. Хэрэв та үүнийг дэмждэг дэлгэц рүү шилжихгүй бол энэ сонголт ямар ч нөлөө үзүүлэхгүй."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Үргэлж"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Саадгүй бус"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Апп ингэх хүсэлт тавьсан тохиолдолд таны төхөөрөмж гаралтаа таны үзэж буй контентын эх фрэймийн хурдтай тааруулна. Энэ нь видеог дахин тоглуулах явцаас гарах эсвэл үүнд орох үед таны дэлгэцийг секундийн турш хоосон болгож болно."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Хэзээ ч үгүй"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Апп ингэх хүсэлт тавьсан байлаа ч таны төхөөрөмж гаралтаа таны үзэж буй контентын эх фрэймийн хурдтай тааруулах гэж хэзээ ч оролдохгүй."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Нягтралыг %1$s болгож өөрчлөх үү?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Одооноос %1$s-г ашиглахын тулд OK-г сонгоно уу."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision нь %1$s дээр дэмжигдээгүй бөгөөд \"Дэлгэцийн нарийвчилсан тохиргоо\" хэсэгт идэвхгүй болно."</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Энэ горим дараахыг дэмждэг: %1$s\nЗарим ТВ-д та бусад HDR форматыг идэвхжүүлэхийн тулд сайжруулсан HDMI-г асаах шаардлагатай байж магадгүй. Үүнийг дэмждэг эсэхийг харахын тулд ТВ-ийн тохиргоогоо шалгана уу."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Энэ горим %1$s-г дэмждэг. Зарим ТВ дээр илүү олон HDR форматыг идэвхжүүлэхийн тулд сайжруулсан HDMI-г асаах шаардлагатай байж магадгүй. Үүнийг дэмжиж байгаа эсэхийг харахын тулд ТВ-н тохиргоогоо шалгана уу."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Цуцлах"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Гц"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Гц)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Гц)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Кеш хийгдсэн өгөгдлийг арилгах уу?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Бүх програмд зориулан кеш хийгдсэн өгөгдлийг арилгах болно."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Энэ төхөөрөмжийг таны байгууллага удирдаж байна."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Энэ төхөөрөмжийг <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> удирддаг"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Дэлгэрэнгүй үзэх"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Камерын апп}other{Камерын аппууд}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Хуанлины апп"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Үзэж байх явцад дэлгэц унтрахаас сэргийлэхийн тулд баталгаажуулна уу. Энэ нь эрчим хүчний хэрэглээг нэмэгдүүлэх магадлалтай."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Идэвхгүй үед"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Үзэж байх үед"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Автоматаар унтраах"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Идэвхгүй үед автоматаар унтраах"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Үзэж байх үед автоматаар унтраах"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Зурагт автоматаар унтраах"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Идэвхгүй үед зурагтыг автоматаар унтраах"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Зурагт үзэж байхад автоматаар унтраах"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"Идэвхгүй үеийн\" цаг хэмжигч нь \"Үзэх үеийн\" цаг хэмжигчээс богино байх ёстой"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"Үзэх үеийн\" цаг хэмжигч нь \"Идэвхгүй үеийн\" цаг хэмжигчээс урт байх ёстой"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Зогсолтод сүлжээний холболтыг хязгаарлах"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Асаалттай үеийн төлөв"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Шинэчлэх"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Этернэт хослуулах код"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Эрчим хүчний горимууд"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"ТВ-ийг ашиглаагүй үед эрчим хүчний үр ашигтай байдлыг сайжруулах"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Идэвхжүүлнэ:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Энэ горим нь төхөөрөмжийн эрчим хүч зарцуулалтыг нэмэгдүүлж болохыг анхаарна уу."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\"-г идэвхжүүлэх"</string>
 </resources>
diff --git a/Settings/res/values-mr/energy-modes.xml b/Settings/res/values-mr/energy-modes.xml
deleted file mode 100644
index e89f5d41f..000000000
--- a/Settings/res/values-mr/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"नेटवर्कशी संबंधित आवश्यक वैशिष्‍ट्ये"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ऊर्जेचा कमी वापर"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"टीव्ही वापरात नसताना नेटवर्क कनेक्शन बंद करा."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"महत्त्वाची अपडेट आणि फंक्शन"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"नेटवर्कशी संबंधित शिफारस केलेली वैशिष्‍ट्ये"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ऊर्जेचा ऑप्टिमाइझ केलेला वापर"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"नेटवर्क असताना टीव्ही सुरू होतो अशी वैशिष्‍ट्ये सुरू करा (नेटवर्क असताना स्टँडबाय)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[पहिले वैशिष्‍ट्य घाला]"</item>
-    <item msgid="8724721267222341891">"[दुसरे वैशिष्‍ट्य घाला]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"नेटवर्कशी संबंधित अतिरिक्त वैशिष्‍ट्ये"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"ऊर्जेचा वाढलेला वापर"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"शिफारस केलेली वैशिष्‍ट्यांव्यतिरिक्त, टीव्ही वापरात नसताना हा पर्याय अतिरिक्त वैशिष्‍ट्ये सुरू करतो, ज्यामुळे ऊर्जेचा वापर वाढू शकतो."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[पहिले वैशिष्‍ट्य घाला]"</item>
-    <item msgid="170760143032597722">"[दुसरे वैशिष्‍ट्य घाला]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-mr/strings.xml b/Settings/res/values-mr/strings.xml
index 38df6fd40..6eb1899c4 100644
--- a/Settings/res/values-mr/strings.xml
+++ b/Settings/res/values-mr/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"बॅकअप घ्या आणि रिस्टोअर करा"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"फॅक्‍टरी डेटा रीसेट"</string>
     <string name="device_calibration" msgid="2907914144048739705">"कॅलिब्रेशन"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"टायमर बंद करा"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"टीव्ही बंद करण्यासाठी आणि ऊर्जा वाचवण्यासाठी टायमर सेट करा"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"पॉवर आणि ऊर्जा"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"इको सेटिंग्ज"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"डिव्हाइस"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"फॉरमॅट निवडा"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"प्रगत आवाज सेटिंग्ज"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"गेम मोडला अनुमती द्या"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"जुळणाऱ्या आशयाची डायनॅमिक रेंज"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"हा पर्याय सुरू करताना, आशयाशी जुळण्यासाठी सिस्टीम वेगवेगळ्या डायनॅमिक रेंज फॉरमॅट दरम्यान स्विच करेल. यामुळे फॉरमॅट स्विचच्या वेळी स्क्रीन काळी होऊ शकते.\n\nआणखी डायनॅमिक रेंज पर्यायांसाठी प्रगत डिस्प्ले सेटिंग्जवर क्लिक करा."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"प्राधान्य असलेली डायनॅमिक रेंज"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"सिस्टीमचे प्राधान्य असलेले रूपांतर"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"सिस्टीमला फॉरमॅट रूपांतराचे व्यवस्थापन करू देते"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"हा पर्याय निवडला जातो, तेव्हा सिस्टीम तुमच्या डिस्प्लेवर पाठवण्‍यासाठी योग्य डायनॅमिक रेंज निर्धारित करेल आणि आवश्यकतेनुसार या डायनॅमिक रेंजमध्ये आशय रूपांतरित करेल."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"आशयाच्या फॉरमॅटशी नेहमी जुळते"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"सक्तीचे रूपांतर"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"प्राधान्य असलेल्या फॉरमॅटमध्ये रूपांतर करण्याची सक्ती करते"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"प्राधान्य असलेल्या फॉरमॅटवर सक्तीचे रूपांतर. सक्तीचे रूपांतर डिस्प्ले मोड किंवा HDR फॉरमॅटमधील इतर सेटिंग्जवर परिणाम करू शकते."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"नेहमी SDR वर"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"नेहमी <xliff:g id="HDR_TYPE">%s</xliff:g> वर"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"तुम्हाला HDR आउटपुटची सक्ती करायची आहे का?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"बाय डीफॉल्ट, सक्तीने <xliff:g id="HDR_TYPE">%s</xliff:g> मध्ये रूपांतर केले जाईल."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"तुमचा डिस्प्ले १०८०p ६०Hz रेझोल्यूशन इतक्या वेगाने रन केला जाईल. ४k ६०Hz रेझोल्यूशन इतक्या वेगाने रन होत असते, तेव्हा हा पर्याय तुमच्या डिस्प्लेशी कंपॅटिबल नाही."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"सध्याच्या रेझोल्यूशनवर Dolby Vision ला सपोर्ट नाही. तुम्ही Dolby Vision मॅन्युअली सुरू केल्यास, तुमच्या डिस्प्लेचे रेझोल्यूशन १०८०p ६०Hz वर बदलले जाईल"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"रेझोल्यूशन १०८०p ६०Hz वर बदलायचे आहे का?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"नेहमी सक्तीने Dolby Vision मध्ये रूपांतर करा"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"प्रगत डिस्प्ले सेटिंग्ज मध्ये HDR फॉरमॅट मधील Dolby Vision बंद असल्यास, सक्तीने Dolby Vision मध्ये रूपांतर केल्यास, ते पुन्हा सुरू होईल."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"नेहमी सक्तीने HDR10 मध्ये रूपांतर करा"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"प्रगत डिस्प्ले सेटिंग्ज मध्ये HDR फॉरमॅट मधील HDR10 बंद असल्यास, सक्तीने HDR10 मध्ये रूपांतर केल्यास ते पुन्हा सुरू होईल."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"नेहमी सक्तीने HLG मध्ये रूपांतर करा"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"प्रगत डिस्प्ले सेटिंग्ज मध्ये HDR फॉरमॅट मधील HLG बंद असल्यास, सक्तीने HLG मध्ये रूपांतर केल्यास, ते पुन्हा सुरू होईल."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"नेहमी सक्तीने HDR10+ मध्ये रूपांतर करा"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"प्रगत डिस्प्ले सेटिंग्ज मध्ये HDR फॉरमॅट मधील HDR10+ बंद असल्यास, सक्तीने HDR10+ मध्ये रूपांतर केल्यास ते पुन्हा सुरू होईल."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"नेहमी सक्तीने SDR मध्ये रूपांतर करा"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"प्रगत डिस्प्ले सेटिंग्ज मध्ये सक्तीने SDR मध्ये रूपांतर केल्यास, HDR फॉरमॅट मधील सर्व फॉरमॅट बंद होतील."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"आशय फ्रेम दर जुळवा"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"फक्त अखंड"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"अखंड असलेला"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"ॲपने याची विनंती केल्यास, तुमचा टीव्ही सहजपणे बदल करू शकत असेल तरच तुमचे डिव्हाइस त्याच्या आउटपुटशी तुम्ही पाहत असलेल्या आशयाचा मूळ फ्रेम दर जुळवेल."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"तुमच्या कनेक्ट केलेल्या डिस्प्लेला अखंड रिफ्रेश रेट संक्रमणांचा सपोर्ट नाही. तुम्ही सपोर्ट करणाऱ्या डिस्प्लेवर बदलत नाही तोपर्यंत हा पर्याय लागू होणार नाही."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"नेहमी"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"अखंड नसलेला"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"ॲपने याची विनंती केल्यास, तुमचे डिव्हाइस त्याच्या आउटपुटशी तुम्ही पाहत असलेल्या आशयाचा मूळ फ्रेम दर जुळवेल. यामुळे व्हिडिओ प्लेबॅकमधून बाहेर पडताना किंवा त्यामध्ये शिरताना तुमची स्क्रीन काही सेकंदांसाठी कोरी दिसू शकते."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"कधीही नाही"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"ॲपने याची विनंती केली तरीही, तुमचे डिव्हाइस त्याच्या आउटपुटशी तुम्ही पाहत असलेल्या आशयाचा मूळ फ्रेम दर जुळवण्याचा प्रयत्न करणार नाही."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"रेझोल्यूशन %1$s वर बदलायचे आहे का?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"यापुढे %1$s वापरण्यासाठी ओके निवडा."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s वर Dolby Vision ला सपोर्ट नसून ते \"प्रगत डिस्प्ले सेटिंग्ज\" मध्ये बंद केले जाईल"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"हा मोड पुढील गोष्टींना सपोर्ट करतो: %1$s\nकाही टीव्हीवर, आणखी HDR फॉरमॅट सुरू करण्यासाठी, तुम्ही वर्धित HDMI सुरू करणे आवश्यक आहे. याला सपोर्ट आहे का हे पाहण्यासाठी तुमच्या टीव्हीची सेटिंग्ज तपासा."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"हा मोड %1$s ला सपोर्ट करतो. काही टीव्हीवर, आणखी HDR फॉरमॅट सुरू करण्यासाठी, तुम्ही वर्धित HDMI सुरू करणे आवश्यक आहे. याला सपोर्ट आहे का हे पाहण्यासाठी तुमच्या टीव्हीची सेटिंग्ज तपासा."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"रद्द करा"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ओके"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"कॅशे    केलेला डेटा साफ करायचा?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"हे सर्व ॲप्ससाठी कॅशे    केलेला डेटा साफ करेल."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -247,7 +220,7 @@
     <string name="bluetooth_pairing_request" msgid="6120176967230348092">"ब्लूटूथ जोडणी विनंती"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="7397401633869153520">"याच्याशी जोडण्यासाठी: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, ते ही पासकी दर्शवित असल्याचे सुनिश्चित करा: &lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="8587851808387685613">"यावरून: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;या डिव्हाइससह जोडायचे?"</string>
-    <string name="bluetooth_display_passkey_pin_msg" msgid="6934651048757228432">"यासह जोडण्यासाठी: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;यावर टाइप करा: &lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, नंतर परत या किंवा एंटर प्रेस करा."</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="6934651048757228432">"यासह जोडण्यासाठी: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;यावर टाइप करा: &lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, नंतर परत या किंवा Enter दाबा."</string>
     <string name="bluetooth_enter_pin_msg" msgid="8905524093007140634">"यासह जोडण्यासाठी: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, &lt;br&gt;डिव्हाइसचा आवश्यक पिन टाइप करा:"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="889584097447402492">"यासह जोडण्‍यासाठी: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, &lt;br&gt;डिव्‍हाइसची आवश्‍यक असलेली पासकी टाईप करा:"</string>
     <string name="bluetooth_pin_values_hint" msgid="6237371515577342950">"सामान्यतः 0000 किंवा 1234"</string>
@@ -286,7 +259,7 @@
     <string name="system_keyboard" msgid="1514460705385401872">"कीबोर्ड"</string>
     <string name="system_keyboard_autofill" msgid="8530944165814838255">"कीबोर्ड आणि ऑटोफिल"</string>
     <string name="system_autofill" msgid="6983989261108020046">"ऑटोफिल"</string>
-    <string name="system_home" msgid="2149349845791104094">"होम स्क्रीन"</string>
+    <string name="system_home" msgid="2149349845791104094">"मुख्य स्क्रीन"</string>
     <string name="system_search" msgid="3170169128257586925">"शोधा"</string>
     <string name="system_google" msgid="945985164023885276">"Google"</string>
     <string name="system_security" msgid="1012999639810957132">"सुरक्षा आणि निर्बंध"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"हे डिव्हाइस तुमच्या संस्थेने व्यवस्थापित केले आहे."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"हे डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> द्वारे व्यवस्थापित आहे."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"अधिक जाणून घ्या"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{कॅमेरा ॲप}other{कॅमेरा ॲप्स}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Calendar अ‍ॅप"</string>
@@ -476,7 +450,7 @@
     <string name="wifi_forget_network" msgid="4634016112624305571">"नेटवर्क विसरा"</string>
     <string name="wifi_forget_network_description" msgid="4146715475962713899">"सेव्ह केलेल्या संकेतशब्दाच्या समावेशासह, या नेटवर्कशी कनेक्ट करण्यासाठी वापरलेली माहिती साफ करते"</string>
     <string name="wifi_scan_qr_code_description" msgid="6620444691131671132">" मोबाइल फोनने QR कोड स्कॅन करून वाय-फायमध्ये सामील व्हा आणि सूचना फॉलो करा.\n \n "<b>"Android फोन"</b>" यामध्ये सेटिंग्ज &gt; नेटवर्क आणि इंटरनेट &gt; वाय-फाय &gt; वाय-फाय निवडा &gt; प्रगत &gt; डिव्हाइस जोडा वर जा आणि त्यानंतर QR कोड स्कॅन करा."</string>
-    <string name="wifi_scan_qr_code_back_description" msgid="8830716278283379280">"रद्द करण्यासाठी मागे जा बटण प्रेस करा"</string>
+    <string name="wifi_scan_qr_code_back_description" msgid="8830716278283379280">"रद्द करण्यासाठी मागे जा बटण दाबा"</string>
     <string name="wifi_action_ok" msgid="6257483288047397880">"ठीक आहे"</string>
     <string name="wifi_setup_action_dont_change_network" msgid="2999582059217623090">"सुरू ठेवा"</string>
     <string name="wifi_setup_action_change_network" msgid="1603908238711710943">"नेटवर्क बदला"</string>
@@ -637,9 +611,9 @@
     <string name="camera_physical_privacy_enabled_title" msgid="1944155695921165511">"कॅमेरा अ‍ॅक्सेस ब्लॉक केलेला आहे"</string>
     <string name="camera_physical_privacy_enabled_text" msgid="6692088634676282779">"अनब्लॉक करण्यासाठी, तुमच्या डिव्हाइसवरील प्रायव्हसी स्विच हा कॅमेरा ॲक्सेस करण्याची अनुमती देण्यासाठी, कॅमेरा सुरू करण्याच्या स्थानावर आणा."</string>
     <string name="mic_toggle_info_title" msgid="1086545614315873599">"मायक्रोफोनचा अ‍ॅक्सेस: <xliff:g id="SENSOR_STATE">%s</xliff:g>"</string>
-    <string name="mic_toggle_info_content" msgid="3187791167208947239">"सुरू केला असेल, तेव्हा मायक्रोफोन वापरण्याची अनुमती असलेली सर्व अ‍ॅप्स आणि सेवा तो अ‍ॅक्सेस करू शकतील.\n\nबंद केला असेल, तेव्हा कोणतीही अ‍ॅप्स व सेवा मायक्रोफोन वापरू शकणार नाहीत. पण तरीही तुमच्या रिमोटवरील Assistant बटण प्रेस करून तुम्ही Google Assistant शी बोलू शकता.\n\nटीव्हीसोबत संपर्क साधण्यासाठी कस्टम प्रोटोकॉल वापरणाऱ्या ऑडिओ डिव्हाइसवर या सेटिंगमुळे कदाचित परिणाम होणार नाही."</string>
+    <string name="mic_toggle_info_content" msgid="3187791167208947239">"सुरू केला असेल, तेव्हा मायक्रोफोन वापरण्याची अनुमती असलेली सर्व अ‍ॅप्स आणि सेवा तो अ‍ॅक्सेस करू शकतील.\n\nबंद केला असेल, तेव्हा कोणतीही अ‍ॅप्स व सेवा मायक्रोफोन वापरू शकणार नाहीत. पण तरीही तुमच्या रिमोटवरील Assistant बटण दाबून तुम्ही Google Assistant शी बोलू शकता.\n\nटीव्हीसोबत संपर्क साधण्यासाठी कस्टम प्रोटोकॉल वापरणाऱ्या ऑडिओ डिव्हाइसवर या सेटिंगमुळे कदाचित परिणाम होणार नाही."</string>
     <string name="mic_remote_toggle_on_info_title" msgid="8503441878870972046">"रिमोटवर मायक्रोफोन सुरू केला आहे"</string>
-    <string name="mic_remote_toggle_on_info_content" msgid="2715872916376493679">"Google Assistant तुमच्या रिमोटवरील मायक्रोफोन अ‍ॅक्सेस करू शकते. तुम्ही तुमच्या रिमोटवरील Google Assistant बटण प्रेस करून Assistant शी बोलू शकाल."</string>
+    <string name="mic_remote_toggle_on_info_content" msgid="2715872916376493679">"Google Assistant तुमच्या रिमोटवरील मायक्रोफोन अ‍ॅक्सेस करू शकते. तुम्ही तुमच्या रिमोटवरील Google Assistant बटण दाबून Assistant शी बोलू शकाल."</string>
     <string name="mic_remote_toggle_off_info_title" msgid="4902909833546393713">"रिमोटवर मायक्रोफोन बंद केला आहे"</string>
     <string name="mic_remote_toggle_off_info_content" msgid="8062526350553191004">"तुमचा रिमोट वापरून तुम्ही Google Assistant शी बोलू शकणार नाही. Google Assistant बटण वापरता येण्यासाठी, मायक्रोफोनचा अ‍ॅक्सेस सुरू करा."</string>
     <string name="camera_toggle_info_title" msgid="3871317082313736088">"कॅमेराचा अ‍ॅक्सेस: <xliff:g id="SENSOR_STATE">%s</xliff:g>"</string>
@@ -698,7 +672,7 @@
     <string name="accessibility_shortcut" msgid="5856158637840030531">"अ‍ॅक्सेसिबिलिटी शॉर्टकट"</string>
     <string name="accessibility_shortcut_enable" msgid="6603542432267329986">"प्रवेशयोग्यता शॉर्टकट सक्षम करा"</string>
     <string name="accessibility_shortcut_service" msgid="2053250146891420311">"शॉर्टकट सेवा"</string>
-    <string name="accessibility_shortcut_description" msgid="2050424178481510046">"शॉर्टकट सुरू असताना प्रवेशसुलभता वैशिष्ट्य सुरू करण्यासाठी तुम्‍ही मागे आणि खाली ही दोन्ही बटणे ३ सेकंदांपर्यंत प्रेस करून ठेवू शकता."</string>
+    <string name="accessibility_shortcut_description" msgid="2050424178481510046">"शॉर्टकट सुरू असताना प्रवेशसुलभता वैशिष्ट्य सुरू करण्यासाठी तुम्‍ही मागे आणि खाली ही दोन्ही बटणे ३ सेकंदांपर्यंत दाबून ठेवू शकता."</string>
     <string name="accessibility_captions" msgid="3411554568812306549">"कॅप्शन"</string>
     <string name="accessibility_captions_description" msgid="3827820027578548160">"व्हिडिओवर उपशीर्षक मजकूर आच्छादनासाठी सेटिंग्ज"</string>
     <string name="captions_display" msgid="2598662495450633375">"प्रदर्शन"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"कृपया पाहात असताना डिस्प्ले बंद होण्यापासून रोखण्यासाठी कंफर्म करा, ज्यामध्ये ऊर्जा वापर वाढण्याची शक्यता आहे."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"इनॅक्टिव्ह असताना"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"पाहत असताना"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"आपोआप बंद होते"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"इनॅक्टिव्ह असताना आपोआप बंद होतो"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"पाहत असताना आपोआप बंद होतो"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"टीव्ही आपोआप बंद करा"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"निष्क्रिय असताना टीव्ही आपोआप बंद करा"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"पाहत असताना टीव्ही आपोआप बंद करा"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"निष्क्रिय असताना\" हा टायमर \"पाहत असताना\" या टायमरपेक्षा कमी कालावधीचा असणे आवश्यक आहे"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"पाहत असताना\" हा टायमर \"निष्क्रिय असताना\" या टायमरपेक्षा जास्त कालावधीचा असणे आवश्यक आहे"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"स्टँडबायमध्ये नेटवर्क कनेक्शन मर्यादित करा"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"सुरू असतानाचे वर्तन"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"रीसेट करा"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"इथरनेट पेअरिंग कोड"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"ऊर्जेचे मोड"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"टीव्ही वापरात नसताना ऊर्जेच्या कार्यक्षमतेमध्ये सुधारणा करा"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"सुरू करते:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"या मोडमुळे डिव्हाइसच्या पॉवरचा वापर वाढू शकतो याची नोंद घ्यावी."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" सुरू करा"</string>
 </resources>
diff --git a/Settings/res/values-ms/energy-modes.xml b/Settings/res/values-ms/energy-modes.xml
deleted file mode 100644
index 49341cf20..000000000
--- a/Settings/res/values-ms/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Ciri rangkaian yang penting"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Penggunaan tenaga rendah"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Matikan sambungan rangkaian ketika TV tidak digunakan."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Kemaskinian dan fungsi yang amat penting"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Ciri rangkaian yang disyorkan"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Penggunaan tenaga dioptimumkan"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Menghidupkan ciri yang membangkitkan TV melalui rangkaian (tunggu sedia berangkaian)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Ciri rangkaian tambahan"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Penggunaan tenaga meningkat"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Selain ciri yang disyorkan, pilihan ini menghidupkan ciri tambahan ketika TV tidak digunakan. Hal ini boleh meningkatkan penggunaan tenaga."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-ms/strings.xml b/Settings/res/values-ms/strings.xml
index 4412d6d06..424632d91 100644
--- a/Settings/res/values-ms/strings.xml
+++ b/Settings/res/values-ms/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Sandarkan &amp; Pulihkan"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Tetapan semula data kilang"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Penentukuran"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Pemasa Pemati"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Tetapkan pemasa untuk mematikan TV dan menjimatkan tenaga"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Kuasa &amp; Tenaga"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Tetapan eko"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Peranti"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Pilih format"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Tetapan bunyi terperinci"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Benarkan mod permainan"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Padankan julat dinamik kandungan"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Apabila mendayakan pilihan ini, sistem akan bertukar antara format julat dinamik yang berbeza untuk dipadankan dengan kandungan. Perkara ini mungkin menyebabkan skrin hitam ketika pertukaran format.\n\nKlik tetapan Paparan Terperinci untuk pelbagai pilihan julat dinamik."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Julat dinamik pilihan"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Penukaran pilihan sistem"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Membolehkan sistem mengurus penukaran format"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Apabila pilihan ini dipilih, sistem ini akan menentukan julat dinamik yang sesuai untuk dihantar kepada paparan anda dan menukar kandungan kepada julat dinamik ini apabila diperlukan."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Sentiasa sepadan dengan format kandungan"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Paksa penukaran"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Memaksa penukaran kepada format pilihan"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Paksa penukaran kepada format pilihan. Tindakan memaksa penukaran boleh menjejaskan tetapan lain dalam Mod Paparan atau Format HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Sentiasa ditukarkan kepada SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Sentiasa ditukarkan kepada <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Adakah anda mahu memaksa output HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Secara lalai, penukaran akan dipaksa menjadi <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Paparan anda akan dijalankan pada peleraian 60Hz 1080p. Pilihan ini tidak serasi dengan paparan anda apabila dijalankan pada peleraian 60Hz 4k."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision tidak disokong pada peleraian semasa. Jika anda mendayakan Dolby Vision secara manual, peleraian pada paparan anda akan ditukarkan kepada 60Hz 1080p"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Tukar peleraian kepada 60Hz 1080p?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Sentiasa paksa penukaran kepada Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Jika Dolby Vision dilumpuhkan dalam Format HDR dalam Tetapan Paparan Lanjutan, tindakan memaksa penukaran kepada Dolby Vision akan mendayakan semula Dolby Vision."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Sentiasa paksa penukaran kepada HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Jika HDR10 dilumpuhkan dalam Format HDR dalam Tetapan Paparan Lanjutan, tindakan memaksa penukaran kepada HDR10 akan mendayakan semula HDR10."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Sentiasa paksa penukaran kepada HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Jika HLG dilumpuhkan dalam Format HDR dalam Tetapan Paparan Lanjutan, tindakan memaksa penukaran kepada HLG akan mendayakan semula HLG."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Sentiasa paksa penukaran kepada HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Jika HDR10+ dilumpuhkan dalam Format HDR dalam Tetapan Paparan Lanjutan, tindakan memaksa penukaran kepada HDR10+ akan mendayakan semula HDR10+."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Sentiasa paksa penukaran kepada SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Tindakan memaksa penukaran kepada SDR akan melumpuhkan semua format dalam Format HDR dalam Tetapan Paparan Lanjutan."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Kadar bingkai kandungan dipadankan"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Lancar sahaja"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Lancar"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Jika diminta oleh apl, peranti anda akan memadankan output mengikut kadar bingkai asal kandungan yang sedang anda tonton, HANYA jika TV anda boleh menjalankan peralihan yang lancar."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Paparan anda yang disambungkan tidak menyokong peralihan kadar segar semula yang lancar. Pilihan ini tidak akan memberikan kesan melainkan anda menukar kepada paparan yang menyokong tindakan."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Sentiasa"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Tidak lancar"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Jika diminta oleh apl, peranti anda akan memadamkan output mengikut kadar bingkai asal kandungan yang sedang anda tonton. Keadaan ini boleh menyebabkan skrin anda menjadi kosong selama satu saat apabila keluar atau masuk kawalan main balik video."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Jangan sekali-kali"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Walaupun diminta oleh apl, peranti anda tidak akan cuba memadankan output mengikut kadar bingkai asal kandungan yang sedang anda tonton."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Tukar resolusi kepada %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Pilih OK untuk menggunakan %1$s mulai sekarang."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision tidak disokong pada %1$s dan akan dilumpuhkan dalam \"Tetapan Paparan Terperinci\""</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Mod ini menyokong: %1$s\nPada sesetengah TV, anda mungkin perlu menghidupkan HDMI Dipertingkatkan untuk mendayakan lebih banyak format HDR. Semak tetapan TV anda untuk melihat jika ciri ini disokong."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Mod ini menyokong %1$s. Pada sesetengah TV, anda mungkin perlu menghidupkan HDMI Dipertingkat untuk mendayakan lebih banyak format HDR. Semak tetapan TV anda untuk melihat jika ciri ini disokong."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Batal"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Padam bersih data cache?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Ini akan memadam bersih data cache semua apl."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -263,7 +236,7 @@
     <string name="bluetooth_known_devices_category" msgid="6895470515631452961">"Aksesori"</string>
     <string name="bluetooth_official_remote_category" msgid="5817814488268307170">"Alat Kawalan Jauh"</string>
     <string name="bluetooth_official_remote_entry_title" msgid="6699700335229570038">"Tetapan kawalan jauh"</string>
-    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"Sediakan butang kawalan jauh"</string>
+    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"Sediakan butang jauh"</string>
     <string name="bluetooth_ir_entry_subtitle" msgid="4606207128353416151">"Kawal kelantangan, kuasa, input pada TV, penerima dan bar bunyi"</string>
     <string name="bluetooth_connect_action_title" msgid="7715342395313781643">"Sambung"</string>
     <string name="bluetooth_connect_confirm" msgid="4769958536295137386">"Sambung ke %1$s"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Peranti ini diurus oleh organisasi anda."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Peranti ini diurus oleh <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Ketahui lebih lanjut"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Apl kamera}other{Apl kamera}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Apl Kalendar"</string>
@@ -355,7 +329,7 @@
     <string name="app_names_concatenation_template_2" msgid="5297284354915830297">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="4932774380339466733">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="tutorials" msgid="7880770425872110455">"Tutorial"</string>
-    <string name="about_system_update" msgid="7421264399111367755">"Kemaskinian sistem"</string>
+    <string name="about_system_update" msgid="7421264399111367755">"Kemas kini sistem"</string>
     <string name="system_update_description" msgid="998883510488461766">"Ini akan mengemas kini perisian sistem anda kepada versi terkini. Peranti anda akan dimulakan semula."</string>
     <string name="system_update_content_description" msgid="5702888187682876466">"Kemas kini sistem, Ini akan mengemas kini perisian sistem anda kepada versi terkini. Peranti anda akan dimulakan semula."</string>
     <string name="about_preference" msgid="9112690446998150670">"Perihal"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Sila sahkan untuk menghalang peranti daripada dimatikan semasa menonton, yang mampu meningkatkan penggunaan tenaga."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Apabila tidak aktif"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Apabila menonton"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Matikan secara automatik"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Matikan secara automatik apabila tidak aktif"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Matikan secara automatik semasa menonton"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Matikan TV secara automatik"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Matikan TV secara automatik apabila tidak aktif"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Matikan TV secara automatik apabila menonton"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Pemasa \"Apabila tidak aktif\" mesti lebih pendek daripada pemasa \"Apabila menonton\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Pemasa \"Apabila menonton\" mesti lebih lama daripada pemasa \"Apabila tidak aktif\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Hadkan sambungan rangkaian dlm tunggu sedia"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Gelagat kuasa dihidupkan"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Tetapkan semula"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Kod berpasangan Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Mod Tenaga"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Meningkatkan kecekapan tenaga ketika TV tidak digunakan"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Mendayakan:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Harap maklum bahawa mod ini mungkin meningkatkan penggunaan tenaga peranti."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Dayakan \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/Settings/res/values-my/energy-modes.xml b/Settings/res/values-my/energy-modes.xml
deleted file mode 100644
index e126da04d..000000000
--- a/Settings/res/values-my/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"မရှိမဖြစ် ကွန်ရက်အင်္ဂါရပ်များ"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"လျော့ကျသွားသော စွမ်းအင်အသုံးပြုမှု"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"TV သုံးမနေပါက ကွန်ရက်ချိတ်ဆက်မှုကို ပိတ်ပါ။"</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"အရေးကြီးအပ်ဒိတ်နှင့် လုပ်ဆောင်ချက်များ"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"အကြံပြုထားသော ကွန်ရက်အင်္ဂါရပ်များ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ပိုကောင်းအောင်လုပ်ထားသော စွမ်းအင်အသုံးပြုမှု"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ကွန်ရက်မှတစ်ဆင့် TV ကို နှိုးသော အင်္ဂါရပ်များကို ဖွင့်ပေးသည် (အရန်သင့် ကွန်ရက်ချိတ်ဆက်ထားသည်)။"</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"ထပ်ဆောင်း ကွန်ရက်အင်္ဂါရပ်များ"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"မြင့်တက်လာသော စွမ်းအင်အသုံးပြုမှု"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"အကြံပြုထားသော တူးလ်များအပြင် TV သုံးမနေပါက ဤနည်းလမ်းသည် စွမ်းအင်အသုံးပြုမှုကို မြင့်တက်စေနိုင်သော ထပ်ဆောင်းအင်္ဂါရပ်များကို ဖွင့်ပေးသည်။"</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-my/strings.xml b/Settings/res/values-my/strings.xml
index 3fefd232c..13aaafa2d 100644
--- a/Settings/res/values-my/strings.xml
+++ b/Settings/res/values-my/strings.xml
@@ -42,7 +42,7 @@
     <string name="header_category_device" msgid="3023893663454705969">"ကိရိယာ"</string>
     <string name="header_category_preferences" msgid="3738388885555798797">"ဦးစားပေးချက်များ"</string>
     <string name="header_category_accessories" msgid="6479803330480847199">"အဝေးထိန်းခလုတ်နှင့် ဆက်စပ်ပစ္စည်းများ"</string>
-    <string name="header_category_personal" msgid="7880053929985150368">"ကိုယ်ပိုင်"</string>
+    <string name="header_category_personal" msgid="7880053929985150368">"ကိုယ်ရေး"</string>
     <string name="connect_to_network" msgid="4133686359319492392">"ကွန်ရက်သို့ ချိတ်ဆက်ရန်"</string>
     <string name="add_an_account" msgid="2601275122685226096">"အကောင့်တစ်ခုထည့်ရန်"</string>
     <string name="accounts_category_title" msgid="7286858931427579845">"အကောင့်များနှင့် အကောင့်ဝင်ရောက်ခြင်း"</string>
@@ -100,7 +100,7 @@
     <string name="all_apps_installed" msgid="8217778476185598971">"ထည့်ထားသည့် အက်ပ်များ"</string>
     <string name="all_apps_other" msgid="4420174882983813158">"စနစ် အက်ပ်များ"</string>
     <string name="all_apps_disabled" msgid="2776041242863791053">"ပိတ်ထားသော အက်ပ်များ"</string>
-    <string name="device_daydream" msgid="2631191946958113220">"စခရင်နားချိန်ပုံ"</string>
+    <string name="device_daydream" msgid="2631191946958113220">"စခရင်နားချိန်"</string>
     <string name="device_display" msgid="244634591698925025">"မြင်ကွင်း"</string>
     <string name="device_display_sound" msgid="7399153506435649193">"ဖန်သားပြင်ပြသမှုနှင့် အသံ"</string>
     <string name="device_sound" msgid="8616320533559404963">"အသံ"</string>
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"အရန်သိမ်းခြင်းနှင့် ပြန်ယူခြင်း"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"စက်ရုံထုတ် အခြေအနေ ပြန်ယူခြင်း"</string>
     <string name="device_calibration" msgid="2907914144048739705">"စံကိုက်ညှိမှု"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"တိုင်မာ ပိတ်ရန်"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"TV ပိတ်ပြီး စွမ်းအင်ချွေတာရန် တိုင်မာများ သတ်မှတ်ပါ"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"ပါဝါနှင့် စွမ်းအင်"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"အီကို ဆက်တင်များ"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"စက်များ"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"ပုံစံများ ရွေးရန်"</string>
@@ -151,39 +151,12 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"အဆင့်မြင့် အသံ ဆက်တင်များ"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"ဂိမ်းမုဒ် ခွင့်ပြုခြင်း"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"အကြောင်းအရာ အရောင်အပိုင်းအခြား ကိုက်ညီမှု"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"ဤရွေးစရာကို ဖွင့်ထားသောအခါ စနစ်သည် အကြောင်းအရာနှင့် ကိုက်ညီစေရန် အရောင်အပိုင်းအခြား ဖော်မက်အမျိုးမျိုးကြား ပြောင်းမည်။ ၎င်းက ဖော်မက်ပြောင်းလဲမှုအတွင်း အမည်းရောင်စခရင်ကို ဖြစ်စေနိုင်သည်။\n\nနောက်ထပ် အရောင်အပိုင်းအခြား ရွေးစရာများအတွက် ‘အဆင့်မြင့် ဖန်သားပြင်’ ဆက်တင်များကို နှိပ်ပါ။"</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"ဦးစားပေး အရောင်အပိုင်းအခြား"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"စနစ်ဦးစားပေး ပြောင်းလဲမှု"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"စနစ်အား ဖော်မက်ပြောင်းလဲမှုကို စီမံခွင့်ပြုပါ"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"၎င်းကို ရွေးထားသောအခါ စနစ်သည် သင့်ဖန်သားပြင်သို့ပို့ရန် သင့်တော်သော အရောင်အပိုင်းအခြားကို ဆုံးဖြတ်ပေးပြီး အကြောင်းအရာကို ဤအရောင်အပိုင်းအခြားသို့ လိုသလိုပြောင်းပေးမည်။"</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"အကြောင်းအရာ၏ ဖော်မက်ကို အမြဲတမ်း ကိုက်ညီအောင်လုပ်သည်"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"ပြောင်းလဲမှု လုပ်ခိုင်းခြင်း"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"ပြောင်းလဲမှုကို ဦးစားပေးဖော်မက်အဖြစ် လုပ်ခိုင်းသည်"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"ပြောင်းလဲမှုကို ဦးစားပေးဖော်မက်အဖြစ် လုပ်ခိုင်းပါ။ ပြောင်းလဲမှုလုပ်ခိုင်းပါက ‘ပြသခြင်းမုဒ်’ (သို့) ‘HDR ဖော်မက်’ ရှိ အခြားဆက်တင်များကို သက်ရောက်နိုင်သည်။"</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"အမြဲတမ်း SDR အဖြစ်"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"အမြဲတမ်း <xliff:g id="HDR_TYPE">%s</xliff:g> အဖြစ်"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"HDR အထွက်ကို မဖြစ်မနေလုပ်မလား။"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"မူရင်းသတ်မှတ်ချက်အရ ပြောင်းလဲမှုကို <xliff:g id="HDR_TYPE">%s</xliff:g> အဖြစ် လုပ်ခိုင်းမည်။"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"သင့်ဖန်သားပြင်သည် 1080p 60Hz ပုံရိပ်ပြတ်သားကိန်းဖြင့် လုပ်ဆောင်မည်။ ဖန်သားပြင်သည် ၄k 60Hz ပုံရိပ်ပြတ်သားကိန်းဖြင့် လုပ်ဆောင်သောအခါ ဤရွေးစရာကို တွဲမသုံးနိုင်ပါ။"</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"‘Dolby မြင်ကွင်း’ ကို လက်ရှိပုံရိပ်ပြတ်သားကိန်းဖြင့် ပံ့ပိုးမထားပါ။ ‘Dolby မြင်ကွင်း’ ကို ကိုယ်တိုင်ဖွင့်ပါက ဖန်သားပြင်၏ ပုံရိပ်ပြတ်သားကိန်းကို 1080p 60Hz သို့ပြောင်းမည်"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"ပုံရိပ်ပြတ်သားကိန်းကို 1080p 60Hz သို့ပြောင်းမလား။"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"‘Dolby မြင်ကွင်း’ သို့ အမြဲတမ်း မဖြစ်မနေပြောင်းရန်"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"‘အဆင့်မြင့် ဖန်သားပြင်ပြသမှု ဆက်တင်များ’ ရှိ ‘HDR ဖော်မက်များ’ တွင် ‘Dolby မြင်ကွင်း’ ပိတ်ထားပါက ၎င်းသို့ မဖြစ်မနေပြောင်းခြင်းဖြင့် ပြန်ဖွင့်ပေးမည်။"</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"HDR10 သို့ အမြဲတမ်း မဖြစ်မနေပြောင်းရန်"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"‘အဆင့်မြင့် ဖန်သားပြင်ပြသမှု ဆက်တင်များ’ ရှိ ‘HDR ဖော်မက်များ’ တွင် HDR10 ပိတ်ထားပါက ၎င်းသို့ မဖြစ်မနေပြောင်းခြင်းဖြင့် ပြန်ဖွင့်ပေးမည်။"</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"HLG သို့ အမြဲတမ်း မဖြစ်မနေပြောင်းရန်"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"‘အဆင့်မြင့် ဖန်သားပြင်ပြသမှု ဆက်တင်များ’ ရှိ ‘HDR ဖော်မက်များ’ တွင် HLG ပိတ်ထားပါက ၎င်းသို့ မဖြစ်မနေပြောင်းခြင်းဖြင့် ပြန်ဖွင့်ပေးမည်။"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"HDR10+ သို့ အမြဲတမ်း မဖြစ်မနေပြောင်းရန်"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"‘အဆင့်မြင့် ဖန်သားပြင်ပြသမှု ဆက်တင်များ’ ရှိ ‘HDR ဖော်မက်များ’ တွင် HDR10+ ပိတ်ထားပါက ၎င်းသို့ မဖြစ်မနေပြောင်းခြင်းဖြင့် ပြန်ဖွင့်ပေးမည်။"</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"SDR သို့ အမြဲတမ်း မဖြစ်မနေပြောင်းရန်"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"SDR သို့ မဖြစ်မနေပြောင်းခြင်းဖြင့် ‘အဆင့်မြင့် ဖန်သားပြင်ပြသမှု ဆက်တင်များ’ ရှိ ‘HDR ဖော်မက်များ’ တွင် ဖော်မက်အားလုံးကို ပိတ်မည်။"</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"အကြောင်းအရာ၏ ဖရိန်ပြနှုန်းကို တူညီအောင်ညှိခြင်း"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"အလိုအလျောက် ကူးပြောင်းခြင်းသီးသန့်"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"တစ်ဆက်တည်း"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"အက်ပ်က ၎င်းကို တောင်းဆိုပါက သင်၏ TV သည် တစ်ဆက်တည်း ကူးပြောင်းခြင်းကို လုပ်ဆောင်နိုင်မှသာ သင့်စက်သည် ၎င်း၏ရုပ်ထွက်ကို သင်ကြည့်နေသည့် အကြောင်းအရာ၏ မူရင်းဖရိမ်ပြနှုန်းနှင့် ကိုက်ညီအောင် လုပ်ပါမည်။"</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"သင်ချိတ်ဆက်ထားသော ဖန်သားပြင်သည် ချောမွေ့သော ပြန်လည်စတင်နှုန်း ကူးပြောင်းမှုများကို မပံ့ပိုးပါ။ ဤရွေးစရာကို ပံ့ပိုးသော ဖန်သားပြင်ကို မပြောင်းလဲဘဲ ၎င်းက သက်ရောက်မည်မဟုတ်ပါ။"</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"အမြဲတမ်း"</string>
-    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"အက်ပ်က ၎င်းကို တောင်းဆိုပါက သင့်စက်သည် ၎င်း၏ရုပ်ထွက်ကို သင်ကြည့်နေသည့် အကြောင်းအရာ၏ မူရင်းဖရိမ်ပြနှုန်းနှင့် ကိုက်ညီအောင် လုပ်ပါမည်။ ပြန်ဖွင့်နေသော ဗီဒီယိုမှ ထွက် (သို့) ဝင်သောအခါ သင့်ဖန်သားပြင်သည် တစ်စက္ကန့်ခန့် ဗလာဖြစ်သွားနိုင်သည်။"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"တစ်ဆက်တည်း မဟုတ်သော"</string>
+    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"အက်ပ်က ၎င်းကို တောင်းဆိုပါက သင့်စက်သည် ၎င်း၏ရုပ်ထွက်ကို သင်ကြည့်နေသည့် အကြောင်းအရာ၏ မူရင်းဖရိမ်ပြနှုန်းနှင့် ကိုက်ညီအောင် လုပ်ပါမည်။ ၎င်းက ဗီဒီယိုဖွင့်ခြင်းမှ ထွက်သောအခါ (သို့) ၎င်းသို့ဝင်သောအခါ သင့်ဖန်သားပြင်ကို တစ်စက္ကန့်ကြာ ဗလာဖြစ်သွားစေနိုင်သည်။"</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"မည်သည့်အခါမှ"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"အက်ပ်က ၎င်းကို တောင်းဆိုသော်လည်း သင့်စက်သည် ၎င်း၏ရုပ်ထွက်ကို သင်ကြည့်နေသည့် အကြောင်းအရာ၏ မူရင်းဖရိမ်ပြနှုန်းနှင့် ကိုက်ညီအောင် မည်သည့်အခါမျှ လုပ်မည်မဟုတ်ပါ။"</string>
     <string name="font_scale_settings_title" msgid="4114019544800225980">"စာသား အရွယ်ချိန်ညှိခြင်း"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"ပုံရိပ်ပြတ်သားကိန်းကို %1$s သို့ ပြောင်းမလား။"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"%1$s ကို ယခုမှစသုံးရန် OK ကိုရွေးပါ။"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"‘Dolby မြင်ကွင်း’ ကို %1$s ဖြင့် မပံ့ပိုးသဖြင့် \"အဆင့်မြင့် ဖန်သားပြင်ဆက်တင်များ\" တွင် ပိတ်ပါမည်"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"ဤမုဒ်ကပံ့ပိုးသည့် အမျိုးအစားများ- %1$s\nTV အချို့တွင် နောက်ထပ် HDR ဖော်မက်များ ဖွင့်ရန်အတွက် ‘အဆင့်မြင့် HDMI’ ကိုဖွင့်ရန် လိုအပ်နိုင်သည်။ ၎င်းကို ပံ့ပိုးထားခြင်း ရှိ၊ မရှိ သိနိုင်ရန် TV ဆက်တင်များကို ကြည့်ပါ။"</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"ဤမုဒ်သည် %1$s ကို ပံ့ပိုးသည်။ အချို့ TV များတွင် နောက်ထပ် HDR ဖော်မက်များ ဖွင့်ရန် ‘အဆင့်မြင့် HDMI’ ကို ဖွင့်ရန် လိုအပ်နိုင်သည်။ ၎င်းကို ပံ့ပိုးထားခြင်း ရှိ၊ မရှိ သိနိုင်ရန် TV ဆက်တင်များကို ကြည့်ပါ။"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"မလုပ်တော့"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"ကရှ်ဒေတာများကို ရှင်းမည်လား?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"apps အားလုံးအတွက် ကရှ်ဒေတာများကို ရှင်းမည်။"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"ဤစက်ပစ္စည်းကို သင်၏အဖွဲ့အစည်းက စီမံခန့်ခွဲထားသည်။"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"ဤစက်ပစ္စည်းကို <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> က စီမံခန့်ခွဲထားပါသည်။"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">"၊"</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"ပိုမိုလေ့လာရန်"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{ကင်မရာအက်ပ်}other{ကင်မရာအက်ပ်များ}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"ပြက္ခဒိန်အက်ပ်"</string>
@@ -695,8 +669,8 @@
     <string name="palette_color_blue" msgid="8836682634988540630">"အပြာရောင်"</string>
     <string name="palette_color_purple" msgid="2123828754639683555">"ခရမ်းရောင်"</string>
     <string name="palette_color_gray" msgid="4014534773994261194">"မီးခိုးရောင်"</string>
-    <string name="accessibility_shortcut" msgid="5856158637840030531">"အများသုံးနိုင်မှု ဖြတ်လမ်းလင့်ခ်"</string>
-    <string name="accessibility_shortcut_enable" msgid="6603542432267329986">"အများသုံးနိုင်မှု ဖြတ်လမ်းလင့်ခ်ကို ဖွင့်မည်"</string>
+    <string name="accessibility_shortcut" msgid="5856158637840030531">"အများသုံးစွဲနိုင်မှု ဖြတ်လမ်းလင့်ခ်"</string>
+    <string name="accessibility_shortcut_enable" msgid="6603542432267329986">"အများသုံးစွဲနိုင်မှု ဖြတ်လမ်းလင့်ခ်ကို ဖွင့်မည်"</string>
     <string name="accessibility_shortcut_service" msgid="2053250146891420311">"ဖြတ်လမ်းလင့်ခ် ဝန်ဆောင်မှု"</string>
     <string name="accessibility_shortcut_description" msgid="2050424178481510046">"ဖြတ်လမ်းလင့်ခ် ဖွင့်ထားလျှင် အနောက်နှင့် အောက်သို့ ခလုတ်နှစ်ခုစလုံးကို ၃ စက္ကန့်ကြာဖိထားခြင်းဖြင့် အများသုံးနိုင်သည့် ဝန်ဆောင်မှုများ စတင်ပါမည်။"</string>
     <string name="accessibility_captions" msgid="3411554568812306549">"စာတန်းများ"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"ကြည့်ရှုနေစဉ် ဖန်သားပြင်ပိတ်ခြင်းကို တားမြစ်ရန် အတည်ပြုပါ။ ၎င်းက စွမ်းအင်ကို ပိုသုံးနိုင်ချေရှိသည်။"</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"အသုံးမပြုစဉ်"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"ကြည့်နေစဉ်"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"အလိုအလျောက်ပိတ်ရန်"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"မသုံးသည့်အခါ အလိုအလျောက်ပိတ်ရန်"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"ကြည့်သည့်အခါ အလိုအလျောက်ပိတ်ရန်"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"TV အလိုအလျောက်ပိတ်ခြင်း"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"အသုံးမပြုစဉ် TV အလိုအလျောက်ပိတ်ခြင်း"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"ကြည့်နေစဉ် TV အလိုအလျောက်ပိတ်ခြင်း"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"အသုံးမပြုချိန်\" တိုင်မာသည် \"ကြည့်နေချိန်\" တိုင်မာထက် ပိုမြန်ရမည်"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"ကြည့်နေချိန်\" တိုင်မာသည် \"အသုံးမပြုချိန်\" တိုင်မာထက် ပိုကြာရမည်"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"အရန်သင့်မုဒ်တွင်ကွန်ရက်ချိတ်ဆက်မှုကန့်သတ်ခြင်း"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"ပါဝါဖွင့်ထားချိန် အပြုအမူ"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"ပြင်ဆင်သတ်မှတ်ခြင်း"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"အီသာနက် အတူတွဲချိတ်ရန် ကုဒ်"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"စွမ်းအင်မုဒ်များ"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"TV သုံးမနေပါက စွမ်းအင်ချွေတာမှုကို ပိုကောင်းစေခြင်း"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"ဖွင့်ထားသည်များ-"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ဤမုဒ်သည် စက်ပစ္စည်း၏ စွမ်းအင်အသုံးပြုမှုကို မြင့်တက်စေနိုင်ကြောင်း သတိပြုပါ။"</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"“<xliff:g id="ENERGYMODENAME">%s</xliff:g>” ဖွင့်ခြင်း"</string>
 </resources>
diff --git a/Settings/res/values-nb/energy-modes.xml b/Settings/res/values-nb/energy-modes.xml
deleted file mode 100644
index 9aa3a1471..000000000
--- a/Settings/res/values-nb/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Nødvendige nettverksfunksjoner"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Lavt strømforbruk"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Slå av nettverkstilkoblingen når TV-en ikke er i bruk."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Kritiske oppdateringer og funksjoner"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Anbefalte nettverksfunksjoner"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimalisert strømforbruk"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Slår på funksjoner som vekker TV-en via nettverket (ventemodus med nettverk)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Flere nettverksfunksjoner"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Økt strømforbruk"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"I tillegg til de anbefalte funksjonene slår dette alternativet på flere funksjoner når TV-en ikke er i bruk. Disse funksjonene kan øke strømforbruket."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-nb/strings.xml b/Settings/res/values-nb/strings.xml
index 620c44bef..10a6bc4ee 100644
--- a/Settings/res/values-nb/strings.xml
+++ b/Settings/res/values-nb/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Sikkerhetskopiering og gjenoppretting"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Tilbakestilling til fabrikkstandard"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibrering"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Nedtelling for avslåing"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Angi nedtellinger for å slå av TV-en og spare strøm"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Strøm og energi"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Eco-innstillinger"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Enheter"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Velg formater"</string>
@@ -151,41 +151,14 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Avanserte lydinnstillinger"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Tillat spillmodus"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Match innholdets dynamiske omfang"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Hvis du slår på dette alternativet, bytter systemet mellom ulike formater for dynamisk omfang for å matche innholdet. Dette kan føre til at skjermen blir svart når formatet byttes.\n\nKlikk på Avanserte skjerminnstillinger for å se flere alternativer for dynamisk omfang."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Foretrukket dynamisk omfang"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Systemforetrukket konvertering"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"La systemet administrere formatkonverteringen"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Når dette alternativet er valgt, fastslår systemet et egnet dynamisk område som sendes til skjermen, og konverterer innhold til dette dynamiske området etter behov."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Matcher alltid formatet til innholdet"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Tving konvertering"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Tvinger konvertering til foretrukket format"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Tving konvertering til et foretrukket format. Tvunget konvertering kan påvirke andre innstillinger i visningsmodus eller HDR-format."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Alltid til SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Alltid til <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Vil du tvinge HDR-utdata?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Som standard blir konverteringen tvunget til <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Skjermen kjøres med 1080p-oppløsning og 60 Hz. Dette alternativet er ikke kompatibelt med skjermen når den kjører med 4k-oppløsning og 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision støttes ikke med denne oppløsningen. Hvis du slår på Dolby Vision manuelt, byttes oppløsningen på skjermen til 1080p 60 Hz."</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Vil du bytte oppløsning til 1080p 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Tving alltid konvertering til Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Hvis Dolby Vision er deaktivert i HDR-formater i Avanserte skjerminnstillinger og du tvinger konvertering til Dolby Vision, aktiveres det igjen."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Tving alltid konvertering til HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Hvis HDR10 er deaktivert i HDR-formater i Avanserte skjerminnstillinger og du tvinger konvertering til HDR10, aktiveres det igjen."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Tving alltid konvertering til HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Hvis HLG er deaktivert i HDR-formater i Avanserte skjerminnstillinger og du tvinger konvertering til HLG, aktiveres det igjen."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Tving alltid konvertering til HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Hvis HDR10+ er deaktivert i HDR-formater i Avanserte skjerminnstillinger og du tvinger konvertering til HDR10+, aktiveres det igjen."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Tving alltid konvertering til SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Hvis du tvinger konvertering til SDR, deaktiveres alle formatene i HDR-formatene i Avanserte skjerminnstillinger."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Match innholdets bildefrekvens"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Bare sømløs"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Sømløs"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Hvis appen ber om det, kommer enheten til å matche utgangen til den opprinnelige bildefrekvensen til innholdet du ser på, men BARE hvis TV-en kan utføre sømløs overgang."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Den tilkoblede skjermen støtter ikke sømløse overganger av oppdateringsfrekvens. Dette alternativet har ingen effekt med mindre du bytter til en skjerm som støtter det."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Alltid"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Ikke-sømløs"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Hvis appen ber om det, kommer enheten til å matche utgangen til den opprinnelige bildefrekvensen til innholdet du ser på. Dette kan føre til at skjermen blir tom i et øyeblikk når du avslutter eller starter videoavspilling."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Aldri"</string>
-    <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Selv om appen ber om det, prøver enheten aldri å matche utgangen til den opprinnelige bildefrekvensen for innholdet du ser på."</string>
+    <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Selv om appen ber om det, kommer enheten aldri til å prøve å matche utgangen til den opprinnelige bildefrekvensen til innholdet du ser på."</string>
     <string name="font_scale_settings_title" msgid="4114019544800225980">"Tekstskalering"</string>
     <string name="font_scale_item_detail" msgid="1558315053348778805">"Skaler til <xliff:g id="SCALE">%1$d</xliff:g> %%"</string>
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Eksempeltekst"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Vil du endre oppløsning til %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Velg OK for å bruke %1$s fra nå av."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision støttes ikke ved %1$s og blir slått av i «Avanserte skjerminnstillinger»"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Denne modusen har støtte for %1$s\nPå noen TV-er må du muligens slå på forbedret HDMI for å aktivere flere HDR-formater. Sjekk TV-innstillingene for å se om dette støttes."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Denne modusen støtter %1$s. På noen TV-er må du muligens slå på Forbedret HDMI for å aktivere flere HDR-formater. Sjekk TV-innstillingene for å se om dette støttes."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Avbryt"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Vil du slette bufrede data?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Dette sletter bufrede data for alle apper."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Denne enheten administreres av organisasjonen din."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Denne enheten administreres av <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Finn ut mer"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kameraapp}other{Kameraapper}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Kalender-app"</string>
@@ -475,7 +449,7 @@
     <string name="wifi_connect" msgid="2206086690065242121">"Koble til"</string>
     <string name="wifi_forget_network" msgid="4634016112624305571">"Glem nettverket"</string>
     <string name="wifi_forget_network_description" msgid="4146715475962713899">"Dette sletter informasjonen som brukes til å koble til dette nettverket, inkludert lagrede passord"</string>
-    <string name="wifi_scan_qr_code_description" msgid="6620444691131671132">" Koble til et wifi-nettverk ved å skanne QR-koden fra en mobiltelefon og følge veiledningen.\n \n Fra en "<b>"Android-telefon"</b>" går du til Innstillinger -&gt; Nettverk og internett -&gt; Wifi -&gt; Velg et wifi-nettverk -&gt; Avansert -&gt; Legg til en enhet og skanner QR-koden."</string>
+    <string name="wifi_scan_qr_code_description" msgid="6620444691131671132">" Koble til et Wifi-nettverk ved å skanne QR-koden fra en mobiltelefon og følge veiledningen.\n \n Fra en "<b>"Android-telefon"</b>" går du til Innstillinger -&gt; Nettverk og internett -&gt; Wifi -&gt; Velg et Wifi-nettverk -&gt; Avansert -&gt; Legg til en enhet og skanner QR-koden."</string>
     <string name="wifi_scan_qr_code_back_description" msgid="8830716278283379280">"Trykk på tilbakeknappen for å avbryte"</string>
     <string name="wifi_action_ok" msgid="6257483288047397880">"OK"</string>
     <string name="wifi_setup_action_dont_change_network" msgid="2999582059217623090">"Fortsett"</string>
@@ -775,7 +749,7 @@
     <string name="system_verify_apps_over_usb" msgid="7289212844195483932">"Bekreft apper via USB"</string>
     <string name="system_desc_verify_apps_over_usb" msgid="7737988681480237094">"Sjekk om det er skadelig atferd i apper som er installert via ADB/ADT"</string>
     <string name="system_wifi_verbose_logging" msgid="3097788974146704831">"Detaljert loggføring for wifi"</string>
-    <string name="system_desc_wifi_verbose_logging" msgid="3537578245428327314">"Slå på detaljert wifi-loggføring"</string>
+    <string name="system_desc_wifi_verbose_logging" msgid="3537578245428327314">"Slå på detaljert Wifi-loggføring"</string>
     <string name="system_show_touches" msgid="8244331695139748286">"Vis berøringer"</string>
     <string name="system_pointer_location" msgid="8724050865245555084">"Pekerplassering"</string>
     <string name="system_show_layout_bounds" msgid="8803080672553699649">"Vis layoutgrenser"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Du må bekrefte dette for å unngå at skjermen slår seg av mens du ser på noe. Dette kan føre til at det brukes mer strøm."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Når enheten er inaktiv"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Når du ser på noe"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Slå av automatisk"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Slå av automatisk når enheten er inaktiv"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Slå av automatisk når du ser på noe"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Slå TV-en av automatisk"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Slå TV-en av automatisk når den er inaktiv"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Slå TV-en av automatisk når du ser på noe"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"«Når enheten er inaktiv»-tiden må være kortere enn «Når du ser på noe»-tiden"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"«Når du ser på noe»-tiden må være lengre enn «Når enheten er inaktiv»-tiden"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Begrens nettverkstilkobling i hvilemodus"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Funksjonalitet ved oppstart"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Tilbakestill"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Tilkoblingskode for Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Strømmoduser"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Gjør strømeffektiviteten bedre når TV-en ikke er i bruk"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Aktiverer følgende:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Vær oppmerksom på at denne modusen kan øke strømforbruket på enheten."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Slå på «<xliff:g id="ENERGYMODENAME">%s</xliff:g>»"</string>
 </resources>
diff --git a/Settings/res/values-ne/energy-modes.xml b/Settings/res/values-ne/energy-modes.xml
deleted file mode 100644
index 79a120b92..000000000
--- a/Settings/res/values-ne/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"नेटवर्कका अत्यावश्यक सुविधाहरू"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ऊर्जाको कम प्रयोग"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"टिभी प्रयोग नगरिएका बेला नेटवर्क कनेक्सन अफ गर्नुहोस्।"</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"महत्त्वपूर्ण अपडेट तथा सुविधाहरू"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"नेटवर्कका सिफारिस गरिएका सुविधाहरू"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"अप्टिमाइज गरिएको ऊर्जाको मितव्ययी प्रयोग"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"नेटवर्क (नेटवर्क स्ट्यान्डबाइ मोड) मार्फत टिभी सक्रिय गर्ने सुविधाहरू अन गर्छ।"</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[सुविधा १ थप्नुहोस्]"</item>
-    <item msgid="8724721267222341891">"[सुविधा २ थप्नुहोस्]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"नेटवर्कका अतिरिक्त सुविधाहरू"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"ऊर्जाको बढ्दो प्रयोग"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"यो विकल्पले सिफारिस गरिएका सुविधाहरूका साथै टिभी प्रयोग नगरिएका बेला ऊर्जाको मितव्ययी प्रयोग बढाउन सक्ने अतिरिक्त सुविधाहरू अन गर्छ।"</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[सुविधा १ थप्नुहोस्]"</item>
-    <item msgid="170760143032597722">"[सुविधा २ थप्नुहोस्]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-ne/strings.xml b/Settings/res/values-ne/strings.xml
index d566b6ee2..7f1414ad7 100644
--- a/Settings/res/values-ne/strings.xml
+++ b/Settings/res/values-ne/strings.xml
@@ -75,7 +75,7 @@
     <string name="account_remove_failed" msgid="5654411101098531690">"खाता हटाउन सक्दैन"</string>
     <!-- no translation found for sync_item_title (5884138264243772176) -->
     <skip />
-    <string name="sync_one_time_sync" msgid="1665961083810584134">"अहिले नै सिंक गर्नुहोस् <xliff:g id="LAST_SYNC_TIME">
+    <string name="sync_one_time_sync" msgid="1665961083810584134">"अहिले सिंक गर्नुहोस् <xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_failed" msgid="2998289556481804047">"असफल सिंक"</string>
     <string name="sync_active" msgid="1621239982176888680">"सक्रिय सिंक"</string>
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"ब्याकअप र पुनर्स्थापना गर्नुहोस्"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"कारखाना डेटा रिसेट"</string>
     <string name="device_calibration" msgid="2907914144048739705">"क्यालिब्रेसन"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"अफ गर्ने टाइमर"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"टिभी अफ गर्ने टाइमर सेट गर्नुहोस् र बिजुली बचत गर्नुहोस्"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"बिजुली तथा ऊर्जा"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"इको सेटिङ"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"डिभाइसहरू"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"ढाँचाहरू चयन गर्नुहोस्"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"ध्वनिसम्बन्धी उन्नत सेटिङ"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"गेम मोडलाई अनुमति दिनुहोस्"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"सामग्रीको डायनामिक रेन्जसँग मिल्दोजुल्दो बनाउनुहोस्"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"तपाईंले यो विकल्प अन गर्नुभयो भने सिस्टमले सामग्रीसँग मिल्दाजुल्दा परिणामहरू देखाउने प्रयोजनका लागि डायनामिक रेन्जका विभिन्न फर्म्याटहरू अदलबदल गर्ने छ। तपाईंले यो विकल्प अन गर्नुभएका खण्डमा फर्म्याट अदलबदल गर्ने क्रममा स्क्रिन कालो हुन सक्छ।\n\nडायनामिक रेन्जका थप विकल्पहरू प्राप्त गर्न \"डिस्प्लेसम्बन्धी उन्नत सेटिङ\" मा क्लिक गर्नुहोस्।"</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"रोजाइको डायनामिक रेन्ज"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"सिस्टमका अनुसार फर्म्याट बदलियोस्"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"फर्म्याट रूपान्तरण गर्ने काम सिस्टमलाई जिम्मा दिइयोस्"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"यो विकल्प चयन गरिएका बेला सिस्टमले तपाईंको डिस्प्लेमा कुन डायनामिक रेन्ज पठाउन उपयुक्त हुन्छ भन्ने कुरा निर्धारण गर्छ र सामग्रीलाई आवश्यकताअनुसार रूपान्तरण गरी उक्त डायनामिक रेन्ज बनाउँछ।"</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"सधैँ सामग्रीको फर्म्याटसँग मिल्ने फर्म्याट प्रयोग गरियोस्"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"जबरजस्ती रूपान्तरण गरियोस्"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"यसले चाहेको फर्म्याटमा जबरजस्ती रूपान्तरण गर्छ"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"चाहेको फर्म्याटमा जबरजस्ती रूपान्तरण गरियोस्। जबरजस्ती रूपान्तरण गर्दा डिस्प्ले मोड वा HDR फर्म्याटका अन्य सेटिङ प्रभावित हुन सक्छन्।"</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"सधैँ SDR मा देखाइयोस्"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"सधैँ <xliff:g id="HDR_TYPE">%s</xliff:g> मा देखाइयोस्"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"तपाईं आउटपुट जबरजस्ती रूपान्तरण गरी HDR बनाउन चाहनुहुन्छ?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"आउटपुट जबरजस्ती स्वतः रूपान्तरण गरी <xliff:g id="HDR_TYPE">%s</xliff:g> बनाइने छ।"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"तपाईंको डिस्प्ले १०८० पिक्सेल ६० हर्ज रिजोल्युसनमा चल्ने छ। तपाईंको डिस्प्ले ४k ६० हर्ज रिजोल्युसनमा चलिरहेका बेला यो विकल्प प्रयोग गर्न मिल्दैन।"</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"हालको रिजोल्युसनमा Dolby Vision प्रयोग गर्न मिल्दैन। तपाईंले म्यानुअल रूपमा Dolby Vision अन गर्नुभयो भने तपाईंको डिस्प्लेको रिजोल्युसन बदलेर १०८० पिक्सेल ६० हर्ज बनाइने छ"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"रिजोल्युसन बदलेर १०८० पिक्सेल ६० हर्ज बनाउने हो?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"HDR फर्म्याटहरू जबरजस्ती रूपान्तरण गरी सधैँ Dolby Vision बनाइयोस्"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"डिस्प्लेसम्बन्धी उन्नत सेटिङको \"HDR फर्म्याटहरू\" खण्डमा Dolby Vision अफ गरिएको छ भने HDR फर्म्याट जबरजस्ती रूपान्तरण गरी Dolby Vision बनाइँदा यो पुनः अन हुने छ।"</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"HDR फर्म्याटहरू जबरजस्ती रूपान्तरण गरी HDR10 बनाइयोस्"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"डिस्प्लेसम्बन्धी उन्नत सेटिङको \"HDR फर्म्याटहरू\" खण्डमा HDR10 अफ गरिएको छ भने HDR फर्म्याट जबरजस्ती रूपान्तरण गरी HDR10 बनाइँदा यो पुनः अन हुने छ।"</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"HDR फर्म्याटहरू जबरजस्ती रूपान्तरण गरी सधैँ HLG बनाइयोस्"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"डिस्प्लेसम्बन्धी उन्नत सेटिङको \"HDR फर्म्याटहरू\" खण्डमा HLG अफ गरिएको छ भने HDR फर्म्याट जबरजस्ती रूपान्तरण गरी HLG बनाइँदा यो पुनः अन हुने छ।"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"HDR फर्म्याटहरू जबरजस्ती रूपान्तरण गरी सधैँ HDR10+ बनाइयोस्"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"डिस्प्लेसम्बन्धी उन्नत सेटिङको \"HDR फर्म्याटहरू\" खण्डमा HDR10+ अफ गरिएको छ भने HDR फर्म्याट जबरजस्ती रूपान्तरण गरी HDR10+ बनाइँदा यो पुनः अन हुने छ।"</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"HDR फर्म्याटहरू जबरजस्ती रूपान्तरण गरी सधैँ SDR बनाइयोस्"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"HDR फर्म्याट जबरजस्ती रूपान्तरण गरी SDR बनाइयो भने  डिस्प्लेसम्बन्धी उन्नत सेटिङको \"HDR फर्म्याटहरू\" खण्डमा सबै फर्म्याटहरू अफ हुने छन्।"</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"सामग्रीको फ्रेम रेटसँग मिल्दोजुल्दो बनाउनुहोस्"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"निर्बाध रूपमा मात्र"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"डिस्प्लेको फ्रेम रेट सामग्रीको फ्रेम रेटका आधारमा निर्धारण नगरियोस्"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"एपले डिस्प्लेको फ्रेम रेट सामग्रीको फ्रेम रेटका आधारमा निर्धारण गर्न अनुरोध गरेका खण्डमा तपाईंको यन्त्रले यसको आउटपुट तपाईंले हेरिरहनुभएको सामग्रीको मूल फ्रेम रेटअनुसार निर्धारण गर्ने छ। तर यसका निम्ति तपाईंको टिभीमा निर्बाध रूपमा फ्रेम रेट बदल्न सक्ने सुविधा उपलब्ध हुनु पर्छ।"</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"तपाईंले जोड्नुभएको डिस्प्लेमा सहज तरिकाले रिफ्रेस रेट ट्रान्जिसन गर्ने सुविधा प्रयोग गर्न मिल्दैन। तपाईंले अहिलेको डिस्प्ले बदलेर यो सुविधा प्रयोग गर्न मिल्ने डिस्प्ले नजोडेसम्म यो विकल्पले काम गर्ने छैन।"</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"सधैँ"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"डिस्प्लेको फ्रेम रेट सामग्रीको फ्रेम रेटका आधारमा निर्धारण गरियोस्"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"एपले डिस्प्लेको फ्रेम रेट सामग्रीको फ्रेम रेटका आधारमा निर्धारण गर्ने अनुरोध गरेका खण्डमा तपाईंको यन्त्रले यसको आउटपुट तपाईंले हेरिरहनुभएको सामग्रीको मूल फ्रेम रेटका आधारमा निर्धारण गर्ने छ। यसले गर्दा भिडियो प्ले गर्न थाल्दा वा उक्त भिडियोबाट बाहिरिँदा स्क्रिन खाली देखिन सक्छ।"</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"कहिल्यै पनि होइन"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"एपले डिस्प्लेको फ्रेम रेट सामग्रीको फ्रेम रेटका आधारमा निर्धारण गर्न अनुरोध गरेका खण्डमा पनि तपाईंको यन्त्रले कहिल्यै पनि यसको आउटपुट तपाईंले हेरिरहनुभएको सामग्रीको मूल फ्रेम रेटका आधारमा निर्धारण गर्ने प्रयास गर्ने छैन।"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"रिजोल्युसन बदलेर %1$s बनाउने हो?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"अबदेखि %1$s प्रयोग गर्न \'ठिक छ\' चयन गर्नुहोस्।"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s मा Dolby Vision प्रयोग गर्न मिल्दैन र Dolby Vision \"डिस्प्लेसम्बन्धी उन्नत सेटिङ\" मा अफ गरिने छ"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"यो मोडमा %1$s प्रयोग गर्न सकिन्छ\nकेही टिभीमा तपाईंले HDR का थप फर्म्याटहरू प्रयोग गर्नका निम्ति परिष्कृत HDMI अन गर्नु पर्ने हुन सक्छ। यो फर्म्याट प्रयोग गर्न मिल्छ कि मिल्दैन भन्ने कुरा जान्न टिभीका सेटिङ जाँच्नुहोस्।"</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"यो मोडमा %1$s प्रयोग गर्न मिल्छ। केही टिभीमा तपाईंले HDR का थप फर्म्याटहरू प्रयोग गर्नका निम्ति परिष्कृत HDMI अन गर्नु पर्ने हुन सक्छ। यो फर्म्याट प्रयोग गर्न मिल्छ कि मिल्दैन भन्ने कुरा जान्न टिभीका सेटिङ जाँच्नुहोस्।"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"रद्द गर्नुहोस्"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ठिक छ"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"हर्ज"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> हर्ज)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> हर्ज)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"केस गरिएको डेटा हटाउने हो?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"यसले सबै अनुप्रयोगहरूको लागि केस गरिएको डेटा हटाउँछ।"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -297,10 +270,10 @@
     <string name="system_developer_options" msgid="8480844257066475479">"विकासकर्ताका विकल्पहरू"</string>
     <string name="accessibility_none" msgid="6355646833528306702">"कुनै पनि होइन"</string>
     <string name="system_diagnostic" msgid="1654842813331919958">"उपयोग र निदान"</string>
-    <string name="no_device_admins" msgid="4628974717150185625">"डिभाइसका एड्मिन एपहरू उपलब्ध छैनन्"</string>
+    <string name="no_device_admins" msgid="4628974717150185625">"डिभाइसका एडमिन एपहरू उपलब्ध छैनन्"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="7678529948487939871">"एडमिनले अफ गरेको छ"</string>
     <string name="disabled_by_administrator_summary" msgid="3420979957115426764">"उपलब्ध छैन"</string>
-    <string name="manage_device_admin" msgid="5714217234035017983">"डिभाइसका एड्मिन एपहरू"</string>
+    <string name="manage_device_admin" msgid="5714217234035017983">"डिभाइसका एडमिन एपहरू"</string>
     <string name="number_of_device_admins_none" msgid="2734299122299837459">"कुनै सक्रिय एपहरू छैनन्"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="108190334043671416">"प्रशासक, इन्क्रिप्सन नीति वा प्रामाणिक भण्डारणद्वारा असक्षम पारिएको छ"</string>
     <string name="enterprise_privacy_settings" msgid="8226765895133003202">"व्यवस्थित गरिएको यन्त्रको जानकारी"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"तपाईंको संगठनले यस यन्त्रलाई व्यवस्थापन गर्दछ।"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"यो डिभाइस <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ले व्यवस्थापन गर्दछ।"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"थप जान्नुहोस्"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{क्यामेरा एप}other{क्यामेरा एपहरू}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"पात्रो एप"</string>
@@ -418,8 +392,8 @@
     <item msgid="2713050260700175954">"राम्रो"</item>
     <item msgid="6005053494500517261">"उत्कृष्ट"</item>
   </string-array>
-    <string name="title_mac_address" msgid="7511588678922209883">"डिभाइसको म्याक एड्रेस"</string>
-    <string name="title_randomized_mac_address" msgid="3359532498635833471">"क्रमरहित म्याक एड्रेस"</string>
+    <string name="title_mac_address" msgid="7511588678922209883">"डिभाइसको MAC एड्रेस"</string>
+    <string name="title_randomized_mac_address" msgid="3359532498635833471">"क्रमरहित MAC एड्रेस"</string>
     <string name="title_signal_strength" msgid="5047116893338315998">"सिङ्केत क्षमता"</string>
     <string name="title_random_mac_settings" msgid="6685812569356353378">"गोपनीयता"</string>
   <string-array name="random_mac_settings_entries">
@@ -771,7 +745,7 @@
     <string name="system_usb_debugging" msgid="2158285492172755923">"USB डिबगिङ"</string>
     <string name="system_allow_mock_locations" msgid="2483106887711851466">"नक्कली स्थानहरूलाई अनुमति दिन"</string>
     <string name="system_select_debug_app" msgid="6200987902307533721">"डिबग एप चयन गर्नुहोस्"</string>
-    <string name="system_wait_for_debugger" msgid="5715878008542589060">"डिबगरलाई पर्खियोस्"</string>
+    <string name="system_wait_for_debugger" msgid="5715878008542589060">"डिबगरलाई पर्खौँ"</string>
     <string name="system_verify_apps_over_usb" msgid="7289212844195483932">"USB मा एपको पुष्टि गरियोस्"</string>
     <string name="system_desc_verify_apps_over_usb" msgid="7737988681480237094">"हानिकारक व्यवहार पत्ता लगाउन ADB/ADT बाट इन्स्टल गरिएका एपको जाँच गरियोस्"</string>
     <string name="system_wifi_verbose_logging" msgid="3097788974146704831">"Wi-Fi भर्वस लगिङ"</string>
@@ -904,10 +878,10 @@
     <string name="app_sees_restricted_accounts_and_controlled_by" msgid="1261056180558324892">"यस एपले तपाईंको खाताहरूमा पहुँच गर्न सक्छ। <xliff:g id="APP">%1$s</xliff:g> द्वारा नियन्त्रित।"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"यो च्यानल हेर्ने पिन प्रविष्टि गर्नुहोस्"</string>
     <string name="pin_enter_unlock_program" msgid="275489015420025531">"यो कार्यक्रम हेर्न पिन प्रविष्टि गर्नुहोस्"</string>
-    <string name="pin_enter_pin" msgid="5020029261153234751">"PIN हाल्नुहोस्"</string>
+    <string name="pin_enter_pin" msgid="5020029261153234751">"PIN प्रविष्टि गर्नुहोस्"</string>
     <string name="pin_enter_new_pin" msgid="1930944619313642621">"नयाँ PIN सेट गर्नुहोस्"</string>
     <string name="pin_enter_again" msgid="7615050143778858658">"नयाँ PIN पुन: प्रविष्टि गर्नुहोस्"</string>
-    <string name="pin_enter_old_pin" msgid="5665265735227617942">"पुरानो PIN हाल्नुहोस्"</string>
+    <string name="pin_enter_old_pin" msgid="5665265735227617942">"पुरानो PIN प्रविष्टि गर्नुहोस्"</string>
     <string name="pin_enter_wrong_seconds" msgid="3014013615537066237">"तपाईँले गलत PIN ५ पटक प्रविष्टि गर्नुभयो।\n <xliff:g id="RELATIVE_TIME_SPAN">%1$d</xliff:g> सेकेन्डमा पुनः प्रयास गर्नुहोस्।"</string>
     <string name="pin_toast_wrong" msgid="4297542365877164402">"गलत पिन, पुनः प्रयास गर्नुहोस्"</string>
     <string name="pin_toast_not_match" msgid="2439298696342975155">"पुनः प्रयास गर्नुहोस्, PIN मेल खाँदैन"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"कृपया मिडिया प्ले गरेका बेला डिस्प्ले बन्द नहुने मोड चालू गर्ने कुरा पुष्टि गर्नुहोस्। यसो गर्दा ब्याट्री बढी खपत हुने सम्भावना हुन्छ।"</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"निष्क्रिय हुँदा"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"हेर्ने बेलामा"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"टिभी स्वतः अफ हुने सेटिङ अन गर्नुहोस्"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"टिभी निष्क्रिय हुँदा टिभी स्वतः अफ हुने सेटिङ अन गर्नुहोस्"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"भिडियो हेरिरहेका बेला टिभी स्वतः अफ हुने सेटिङ अन गर्नुहोस्"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"टिभी स्वतः अफ गरियोस्"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"टिभी निष्क्रिय हुँदा स्वतः अफ गरियोस्"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"टिभी हेरिरहेका बेला स्वतः अफ गरियोस्"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"निष्क्रिय हुँदा\" टाइमरको समय अनिवार्य रूपमा \"हेर्दा\" टाइमरको समयभन्दा कम हुनु पर्छ"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"हेर्दा\" टाइमरको समय अनिवार्य रूपमा \"निष्क्रिय हुँदा\" टाइमरको समयभन्दा बढी हुनु पर्छ"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"स्ट्यान्डबाइ मोडमा इन्टरनेटको प्रयोग सीमित प्रयोग गरियोस्"</string>
@@ -1086,7 +1060,7 @@
     <string name="remove_device_admin" msgid="2623866073546295104">"यो डिभाइसको एडमिन एप डिएक्टिभेट गर्नुहोस्"</string>
     <string name="uninstall_device_admin" msgid="6301368408620948266">"एपको स्थापना रद्द गर्नुहोस्"</string>
     <string name="remove_and_uninstall_device_admin" msgid="1504351551194915633">"निष्क्रिय पार्नुहोस् तथा स्थापना रद्द गर्नुहोस्"</string>
-    <string name="select_device_admin_msg" msgid="8475934459999710332">"डिभाइसका एड्मिन एपहरू"</string>
+    <string name="select_device_admin_msg" msgid="8475934459999710332">"डिभाइसका एडमिन एपहरू"</string>
     <string name="add_device_admin_msg" msgid="5390773166682603421">"डिभाइसको एडमिन एप एक्टिभेट गर्ने हो?"</string>
     <string name="add_device_admin" msgid="5078281377915844544">"यो डिभाइसको एडमिन एप एक्टिभेट गर्नुहोस्"</string>
     <string name="device_admin_warning" msgid="7399916080685200660">"तपाईंले यो एडमिन एप एक्टिभेट गर्नुभयो भने <xliff:g id="APP_NAME">%1$s</xliff:g> ले निम्न कार्य गर्ने अनुमति पाउने छ:"</string>
@@ -1102,7 +1076,7 @@
     <string name="network_connection_request_dialog_title" msgid="4103963119407212989">"<xliff:g id="APPNAME">%1$s</xliff:g> प्रयोग गरिने यन्त्र"</string>
     <string name="network_connection_timeout_dialog_message" msgid="8408857135950230472">"कुनै पनि यन्त्र फेला परेन। यन्त्रहरू सक्रिय गरिएका छन् र जोड्नका लागि उपलब्ध छन् भन्ने कुरा सुनिश्चित गर्नुहोस्।"</string>
     <string name="network_connection_timeout_dialog_ok" msgid="5374522862360880609">"फेरि प्रयास गर्नुहोस्"</string>
-    <string name="network_connection_errorstate_dialog_message" msgid="3346121178275518630">"कुनै समस्या आयो। यो एपले कुनै यन्त्र छनौट गर्नेसम्बन्धी अनुरोध रद्द गरेको छ।"</string>
+    <string name="network_connection_errorstate_dialog_message" msgid="3346121178275518630">"केही चिज गडबड भयो। यो एपले कुनै यन्त्र छनौट गर्नेसम्बन्धी अनुरोध रद्द गरेको छ।"</string>
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"सफलतापूर्वक जोडियो"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"सबै देखाउनुहोस्"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"खोज्दै"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"पावर अन हुँदा देखिने मोड"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"रिसेट गर्नुहोस्"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"इथरनेट कनेक्सन कोड"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"इनर्जी मोड"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"टिभी प्रयोग नगरिएका बेला ऊर्जाको खपतमा सुधार गर्नुहोस्"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"निम्न सुविधाहरू सक्षम गर्छ:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"तपाईंले यो मोड प्रयोग गर्नुभयो भने तपाईंको डिभाइसले ऊर्जाको प्रयोग बढाउन सक्छ भन्ने कुरा याद राख्नुहोस्।"</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" अन गर्नुहोस्"</string>
 </resources>
diff --git a/Settings/res/values-nl/energy-modes.xml b/Settings/res/values-nl/energy-modes.xml
deleted file mode 100644
index 0de9407c6..000000000
--- a/Settings/res/values-nl/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Essentiële netwerkfuncties"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Laag energieverbruik"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Zet de netwerkverbinding uit als de tv niet wordt gebruikt."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Essentiële updates en functies"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Aanbevolen netwerkfuncties"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Geoptimaliseerd energieverbruik"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Zet functies aan die de tv activeren via het netwerk (netwerk-stand-by)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Extra netwerkfuncties"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Hoger energieverbruik"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Met deze optie zet je naast aanbevolen functies ook extra functies aan als de tv niet wordt gebruikt, waardoor het energieverbruik kan toenemen."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-nl/strings.xml b/Settings/res/values-nl/strings.xml
index cd3cb47b1..546d102a8 100644
--- a/Settings/res/values-nl/strings.xml
+++ b/Settings/res/values-nl/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Back-up en herstel"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Terugzetten op fabrieksinstellingen"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibratie"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Timer voor uitzetten"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Stel timers in om de tv uit te zetten en energie te besparen"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Voeding en energie"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Eco-instellingen"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Apparaten"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Indelingen selecteren"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Geavanceerde geluidsinstellingen"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Gamemode toestaan"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Dynamisch bereik van content matchen"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Als je deze optie aanzet, schakelt het systeem tussen verschillende indelingen voor dynamisch bereik om de content te matchen. Dit kan zorgen voor een zwart scherm terwijl de indeling wordt gewijzigd.\n\nKlik op Geavanceerde weergave-instellingen voor meer opties voor dynamisch bereik."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Voorkeur voor dynamisch bereik"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Systeemvoorkeur voor conversie"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Hiermee regelt het systeem de indelingsconversie"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Als deze optie is geselecteerd, kiest het systeem een geschikt dynamisch bereik voor je scherm. Content wordt zo nodig naar dit dynamische bereik geconverteerd."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Hiermee wordt de indeling aangepast aan die van de content"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Conversie afdwingen"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Conversie naar een voorkeursindeling wordt afgedwongen"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Hiermee wordt conversie naar een voorkeursindeling afgedwongen. Dit kan gevolgen hebben voor andere instellingen in de weergavemodus of HDR-indeling."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Altijd naar SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Altijd naar <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Wil je HDR-uitvoer afdwingen?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Conversie naar <xliff:g id="HDR_TYPE">%s</xliff:g> wordt standaard afgedwongen."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Je scherm krijgt een resolutie van 1080p bij 60 Hz. Deze optie is niet compatibel met je scherm als het een resolutie van 4K bij 60 Hz heeft."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision wordt niet ondersteund met de huidige resolutie. Als je Dolby Vision handmatig aanzet, wordt de resolutie van je beeldscherm gewijzigd in 1080p 60 Hz."</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Resolutie wijzigen in 1080p 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Conversie naar Dolby Vision altijd afdwingen"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Als Dolby Vision uitstaat in HDR-indelingen in Geavanceerde weergave-instellingen, kun je dit opnieuw aanzetten door conversie naar Dolby Vision af te dwingen."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Conversie naar HDR10 altijd afdwingen"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Als HDR10 uitstaat in HDR-indelingen in Geavanceerde weergave-instellingen, kun je dit opnieuw aanzetten door conversie naar HDR10 af te dwingen."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Conversie naar HLG altijd afdwingen"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Als HLG uitstaat in HDR-indelingen in Geavanceerde weergave-instellingen, kun je dit opnieuw aanzetten door conversie naar HLG af te dwingen."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Conversie naar HDR10+ altijd afdwingen"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Als HDR10+ uitstaat in HDR-indelingen in Geavanceerde weergave-instellingen, kun je dit opnieuw aanzetten door conversie naar HDR10+ af te dwingen."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Conversie naar SDR altijd afdwingen"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Door conversie naar SDR af te dwingen, zet je alle indelingen uit in de HDR-indelingen in Geavanceerde weergave-instellingen."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Gelijk houden met framesnelheid van content"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Alleen naadloos"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Naadloos"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Als de app hierom vraagt, laat je apparaat de uitvoer overeenkomen met de oorspronkelijke framesnelheid van de content die je bekijkt, maar ALLEEN als op je tv een naadloze overgang mogelijk is."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Je verbonden scherm biedt geen ondersteuning voor naadloze overgangen voor vernieuwingssnelheden. Deze optie heeft geen effect tenzij je overschakelt naar een scherm dat dit ondersteunt."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Altijd"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Niet naadloos"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Als de app hierom vraagt, probeert je apparaat de uitvoer te laten overeenkomen met de oorspronkelijke framesnelheid van de content die je bekijkt. Je scherm kan een seconde leeg zijn als de videoweergave wordt afgesloten of geopend."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Nooit"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Zelfs als de app hierom vraagt, probeert je apparaat nooit de uitvoer te laten overeenkomen met de oorspronkelijke framesnelheid van de content die je bekijkt."</string>
@@ -217,12 +190,12 @@
     <string name="resolution_selection_dialog_title" msgid="4029798035133645272">"Resolutie is gewijzigd"</string>
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Resolutie wijzigen in %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Selecteer OK om vanaf nu %1$s te gebruiken."</string>
-    <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision wordt niet ondersteund op %1$s en wordt uitgezet in Geavanceerde weergave-instellingen"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Deze modus ondersteunt het volgende: %1$s\nOp sommige tv\'s moet je Verbeterde HDMI misschien aanzetten om meer HDR-indelingen mogelijk te maken. Check je tv-instellingen om te zien of dit wordt ondersteund."</string>
+    <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision wordt niet ondersteund op %1$s en wordt uitgezet in Geavanceerde weergave-instellingen\'"</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Deze modus ondersteunt %1$s. Op sommige tv\'s moet je Verbeterde HDMI misschien aanzetten om meer HDR-indelingen mogelijk te maken. Check je tv-instellingen om te zien of dit wordt ondersteund."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Annuleren"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Gecachte gegevens wissen?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"De gecachte gegevens voor alle apps wissen."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Dit apparaat wordt beheerd door je organisatie."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Dit apparaat wordt beheerd door <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Meer informatie"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Camera-app}other{Camera-apps}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Agenda-app"</string>
@@ -664,7 +638,7 @@
     <string name="location_reporting" msgid="3552501333650895634">"Locatiemelding"</string>
     <string name="location_history" msgid="4055660203090513120">"Locatiegeschiedenis"</string>
     <string name="location_reporting_desc" msgid="1580018652781674608">"Google gebruikt deze functie in producten als Google Now en Google Maps. Als je Locatierapportage aanzet, kan elk Google-product dat deze functie gebruikt de meest recente locatiegegevens van je apparaat gebruiken in combinatie met je Google-account."</string>
-    <string name="location_history_desc" msgid="926674012916014270">"Wanneer \'Locatiegeschiedenis\' voor dit account aanstaat, kan Google de locatiegegevens van je apparaat opslaan voor gebruik door je apps.\n\nGoogle Maps kan je bijvoorbeeld routes bieden en Google Now kan je informeren over woon-werkverkeer.\n\nJe kunt de Locatiegeschiedenis op elk gewenst moment uitzetten, maar de geschiedenis wordt hierdoor niet verwijderd. Als je je Locatiegeschiedenis wilt bekijken en beheren, ga je naar maps.google.com/locationhistory."</string>
+    <string name="location_history_desc" msgid="926674012916014270">"Wanneer \'Locatiegeschiedenis\' voor dit account aanstaat, kan Google de locatiegegevens van je apparaat opslaan voor gebruik door je apps.\n\nGoogle Maps kan je bijvoorbeeld routebeschrijvingen bieden en Google Now kan je informeren over woon-werkverkeer.\n\nJe kunt de Locatiegeschiedenis op elk gewenst moment uitzetten, maar de geschiedenis wordt hierdoor niet verwijderd. Als je je Locatiegeschiedenis wilt bekijken en beheren, ga je naar maps.google.com/locationhistory."</string>
     <string name="delete_location_history_title" msgid="707559064715633152">"Locatiegeschiedenis verwijderen"</string>
     <string name="delete_location_history_desc" msgid="4035229731487113147">"Hiermee wordt alle Locatiegeschiedenis voor dit apparaat in dit Google-account gewist. Je kunt dit niet ongedaan maken. Sommige apps, waaronder Google Now, werken niet meer."</string>
     <string name="accessibility_screen_readers_category_title" msgid="7742526514873922018">"Schermlezers"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Bevestig dat je wilt voorkomen dat het scherm uitgaat terwijl je kijkt. Hierdoor kan het energiegebruik toenemen."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Indien inactief"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Tijdens het kijken"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Automatisch uitzetten"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Automatisch uitzetten indien inactief"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Automatisch uitzetten tijdens kijken"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Tv automatisch uitzetten"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Tv automatisch uitzetten als apparaat inactief is"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Tv automatisch uitzetten tijdens het kijken"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"De timer Indien inactief moet korter zijn dan de timer Tijdens het kijken"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"De timer Tijdens het kijken moet langer zijn dan de timer Indien inactief"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Netwerkverbinding beperken in stand-by"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Startscherm na aanzetten"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Resetten"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Koppelingscode voor ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Energiestanden"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Energiezuinigheid verbeteren als de tv niet wordt gebruikt"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Zet het volgende aan:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Door deze stand kan het energieverbruik van het apparaat toenemen."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"<xliff:g id="ENERGYMODENAME">%s</xliff:g> aanzetten"</string>
 </resources>
diff --git a/Settings/res/values-or/energy-modes.xml b/Settings/res/values-or/energy-modes.xml
deleted file mode 100644
index 860e56917..000000000
--- a/Settings/res/values-or/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"ଜରୁରୀ ନେଟୱାର୍କ ଫିଚରଗୁଡ଼ିକ"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ଏନର୍ଜିର କମ ବ୍ୟବହାର"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"ଟିଭି ବ୍ୟବହାର କରାଯାଉନଥିବା ବେଳେ ନେଟୱାର୍କ କନେକ୍ସନକୁ ବନ୍ଦ କରନ୍ତୁ।"</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"ଗୁରୁତ୍ୱପୂର୍ଣ୍ଣ ଅପଡେଟ ଏବଂ ଫଙ୍କସନଗୁଡ଼ିକ"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"ସୁପାରିଶ କରାଯାଇଥିବା ନେଟୱାର୍କ ଫିଚରଗୁଡ଼ିକ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ଏନର୍ଜିର ବ୍ୟବହାରକୁ ଅପ୍ଟିମାଇଜ କରାଯାଇଛି"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ନେଟୱାର୍କ (ଷ୍ଟାଣ୍ଡବାଏ ମୋଡରେ ରଖାଯାଇଥିବା ନେଟୱାର୍କ) ମାଧ୍ୟମରେ ଟିଭିକୁ ସକ୍ରିୟ କରୁଥିବା ଫିଚରଗୁଡ଼ିକୁ ଚାଲୁ କରେ।"</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"ଅତିରିକ୍ତ ନେଟୱାର୍କ ଫିଚରଗୁଡ଼ିକ"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"ଏନର୍ଜିର ବ୍ୟବହାର ବୃଦ୍ଧି ହୋଇଛି"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"ସୁପାରିଶ କରାଯାଇଥିବା ଫିଚରଗୁଡ଼ିକ ସହିତ, ଏହି ବିକଳ୍ପ ଟିଭି ବ୍ୟବହାର କରାଯାଉନଥିବା ବେଳେ ଅତିରିକ୍ତ ଫିଚରଗୁଡ଼ିକୁ ଚାଲୁ କରେ ଯାହା ଫଳରେ ଏନର୍ଜିର ବ୍ୟବହାର ବଢ଼ିପାରେ।"</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-or/strings.xml b/Settings/res/values-or/strings.xml
index b74873bda..d940dc9b8 100644
--- a/Settings/res/values-or/strings.xml
+++ b/Settings/res/values-or/strings.xml
@@ -107,13 +107,13 @@
     <string name="device_surround_sound" msgid="1889436002598316470">"ପରିପାର୍ଶ୍ଵର ଶଦ୍ଦ"</string>
     <string name="device_sound_effects" msgid="2000295001122684957">"ସିଷ୍ଟମ୍ ‌ସାଉଣ୍ଡ୍‌"</string>
     <string name="device_apps" msgid="2134756632245008919">"ଆପ୍ଲିକେସନ୍‌"</string>
-    <string name="device_storage" msgid="8540243547121791073">"ଷ୍ଟୋରେଜ"</string>
+    <string name="device_storage" msgid="8540243547121791073">"ଷ୍ଟୋରେଜ୍"</string>
     <string name="device_reset" msgid="6115282675800077867">"ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍ କରନ୍ତୁ"</string>
     <string name="device_backup_restore" msgid="3634531946308269398">"ବ୍ୟାକଅପ୍ ନିଅନ୍ତୁ ଏବଂ ରିଷ୍ଟୋର୍ କରନ୍ତୁ"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"ଫ୍ୟାକ୍ଟୋରୀ ଡାଟା ରିସେଟ୍‌"</string>
     <string name="device_calibration" msgid="2907914144048739705">"କାଲିବ୍ରାସନ୍‍"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"ଟାଇମରକୁ ବନ୍ଦ କରନ୍ତୁ"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"ଟିଭିକୁ ବନ୍ଦ କରିବା ପାଇଁ ଟାଇମର ସେଟ କରି ଏନର୍ଜି ସେଭ କରନ୍ତୁ"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"ପାୱାର ଓ ଏନର୍ଜି"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"ପରିବେଶ-ଅନୁକୂଳ ସେଟିଂସ"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"ଡିଭାଇସଗୁଡ଼ିକ"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"ଫର୍ମାଟ୍‌ ବାଛନ୍ତୁ"</string>
@@ -151,39 +151,12 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"ଉନ୍ନତ ସାଉଣ୍ଡ ସେଟିଂସ"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"ଗେମ୍ ମୋଡକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"ବିଷୟବସ୍ତୁର ଡାଇନାମିକ ରେଞ୍ଜ ମେଳ କରନ୍ତୁ"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"ଏହି ବିକଳ୍ପକୁ ସକ୍ଷମ କରିବା ସମୟରେ ବିଷୟବସ୍ତୁ ମେଳ କରିବା ପାଇଁ ଏହି ସିଷ୍ଟମଟି ବିଭିନ୍ନ ଡାଇନାମିକ ରେଞ୍ଜ ଫର୍ମାଟ ମଧ୍ୟରେ ସ୍ୱିଚ କରିବ। ଏକ ଫର୍ମାଟ ସ୍ୱିଚ ସମୟରେ ଏହା ଯୋଗୁଁ ସ୍କ୍ରିନ କଳା ହୋଇପାରେ।\n\nଅଧିକ ଡାଇନାମିକ ରେଞ୍ଜ ବିକଳ୍ପ ପାଇଁ ଉନ୍ନତ ଡିସପ୍ଲେ ସେଟିଂସରେ କ୍ଲିକ କରନ୍ତୁ।"</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"ପସନ୍ଦର ଡାଇନାମିକ ରେଞ୍ଜ"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"ସିଷ୍ଟମ-ପସନ୍ଦର କନଭର୍ସନ"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"ସିଷ୍ଟମକୁ ଫର୍ମାଟ କନଭର୍ସନ ପରିଚାଳନା କରିବାକୁ ଦିଅନ୍ତୁ"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"ଯେତେବେଳେ ଏହି ବିକଳ୍ପ ଚୟନ କରାଯାଏ, ଆପଣଙ୍କ ଡିସପ୍ଲେକୁ ପଠାଯିବା ପାଇଁ ସିଷ୍ଟମ ଏକ ଉପଯୁକ୍ତ ଡାଇନାମିକ ରେଞ୍ଜ ସ୍ଥିର କରିବ ଏବଂ ଆବଶ୍ୟକତା ଅନୁସାରେ ଏହି ଡାଇନାମିକ ରେଞ୍ଜକୁ ବିଷୟବସ୍ତୁ କନଭର୍ଟ କରିବ।"</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"ସର୍ବଦା ବିଷୟବସ୍ତୁର ଫର୍ମାଟ ସହ ମେଳ ହୁଏ"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"କନଭର୍ସନ ଲାଗୁ କରନ୍ତୁ"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"ପସନ୍ଦର ଫର୍ମାଟରେ କନଭର୍ସନ ଲାଗୁ କରେ"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"ଏକ ପସନ୍ଦର ଫର୍ମାଟରେ କନଭର୍ସନ ଲାଗୁ କରନ୍ତୁ। କନଭର୍ସନ ଲାଗୁ କରିବା ଫଳରେ ଏହା ଡିସପ୍ଲେ ମୋଡ କିମ୍ବା HDR ଫର୍ମାଟରେ ଅନ୍ୟ ସେଟିଂସକୁ ପ୍ରଭାବିତ କରିପାରେ।"</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"ସର୍ବଦା SDRରେ"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"ସର୍ବଦା <xliff:g id="HDR_TYPE">%s</xliff:g>ରେ"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"ଆପଣ HDR ଆଉଟପୁଟ ଲାଗୁ କରିବାକୁ ଚାହାଁନ୍ତି?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"ଡିଫଲ୍ଟ ଭାବେ କନଭର୍ସନକୁ <xliff:g id="HDR_TYPE">%s</xliff:g>ରେ ଲାଗୁ କରାଯିବ।"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"ଆପଣଙ୍କ ଡିସପ୍ଲେ 1080p 60Hz ରିଜୋଲ୍ୟୁସନରେ ଚାଲିବ। 4k 60Hz ରିଜୋଲ୍ୟୁସନରେ ଚାଲିବା ସମୟରେ ଏହି ବିକଳ୍ପ ଆପଣଙ୍କ ଡିସପ୍ଲେ ସହ କମ୍ପାଟିବଲ ନୁହେଁ।"</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"ବର୍ତ୍ତମାନର ରିଜୋଲ୍ୟୁସନରେ Dolby Vision ସମର୍ଥିତ ନୁହେଁ। ଯଦି ଆପଣ Dolby Visionକୁ ମାନୁଆଲୀ ସକ୍ଷମ କରନ୍ତି, ତେବେ ଆପଣଙ୍କ ଡିସପ୍ଲେର ରିଜୋଲ୍ୟୁସନ 1080p 60Hzକୁ ପରିବର୍ତ୍ତନ ହୋଇଯିବ"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"ରିଜୋଲ୍ୟୁସନକୁ 1080p 60Hzକୁ ପରିବର୍ତ୍ତନ କରିବେ?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"ସର୍ବଦା Dolby Visionରେ କନଭର୍ସନ ଲାଗୁ କରନ୍ତୁ"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"ଉନ୍ନତ ଡିସପ୍ଲେ ସେଟିଂସରେ ଥିବା HDR ଫର୍ମାଟରେ ଯଦି ଡଲବି ଭିଜନକୁ ଅକ୍ଷମ କରାଯାଏ, Dolby Visionରେ କନଭର୍ସନ ଲାଗୁ କରିବା ଏହାକୁ ପୁଣି-ସକ୍ଷମ କରିବ।"</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"ସର୍ବଦା HDR10ରେ କନଭର୍ସନ ଲାଗୁ କରନ୍ତୁ"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"ଉନ୍ନତ ଡିସପ୍ଲେ ସେଟିଂସରେ ଥିବା HDR ଫର୍ମାଟରେ ଯଦି HDR10କୁ ଅକ୍ଷମ କରାଯାଏ, HDR10ରେ କନଭର୍ସନ ଲାଗୁ କରିବା ଏହାକୁ ପୁଣି-ସକ୍ଷମ କରିବ।"</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"ସର୍ବଦା HLGରେ କନଭର୍ସନ ଲାଗୁ କରନ୍ତୁ"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"ଉନ୍ନତ ଡିସପ୍ଲେ ସେଟିଂସରେ ଥିବା HDR ଫର୍ମାଟରେ ଯଦି HLGକୁ ଅକ୍ଷମ କରାଯାଏ, HLGରେ କନଭର୍ସନ ଲାଗୁ କରିବା ଏହାକୁ ପୁଣି-ସକ୍ଷମ କରିବ।"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"ସର୍ବଦା HDR10+ରେ କନଭର୍ସନ ଲାଗୁ କରନ୍ତୁ"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"ଉନ୍ନତ ଡିସପ୍ଲେ ସେଟିଂସରେ ଥିବା HDR ଫର୍ମାଟରେ ଯଦି HDR10+କୁ ଅକ୍ଷମ କରାଯାଏ, HDR10+ରେ କନଭର୍ସନ ଲାଗୁ କରିବା ଏହାକୁ ପୁଣି-ସକ୍ଷମ କରିବ।"</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"ସର୍ବଦା SDRରେ କନଭର୍ସନ ଲାଗୁ କରନ୍ତୁ"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"SDRରେ କନଭର୍ସନ ଲାଗୁ କରିବା ଉନ୍ନତ ଡିସପ୍ଲେ ସେଟିଂସରେ HDR ଫର୍ମାଟରେ ଥିବା ସମସ୍ତ ଫର୍ମାଟକୁ ଅକ୍ଷମ କରିବ।"</string>
-    <string name="match_content_frame_rate_title" msgid="153291168560947689">"ବିଷୟବସ୍ତୁ ଫ୍ରେମ ରେଟ ମେଳ କରନ୍ତୁ"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"ବାଧାରହିତ-କେବଳ"</string>
+    <string name="match_content_frame_rate_title" msgid="153291168560947689">"ବିଷୟବସ୍ତୁ ଫ୍ରେମ୍ ରେଟ୍ ମେଳ କରନ୍ତୁ"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"ବାଧାହୀନ"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"ଯଦି ଆପଟି ଏଥିପାଇଁ ଅନୁରୋଧ କରେ, ତେବେ ଆପଣଙ୍କ ଟିଭି ବାଧାହୀନ ଟ୍ରାଞ୍ଜିସନ୍ ସମ୍ପାଦନ କରିପାରିଲେ ହିଁ କେବଳ ଆପଣଙ୍କ ଡିଭାଇସ୍ ଆପଣ ଦେଖୁଥିବା ବିଷୟବସ୍ତୁର ମୂଳ ଫ୍ରେମ୍ ରେଟ୍ ସହ ତାହାର ଆଉଟପୁଟକୁ ମେଳ କରିବ।"</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"କନେକ୍ଟ ଥିବା ଆପଣଙ୍କ ଡିସପ୍ଲେ ବାଧାରହିତ ରିଫ୍ରେସ ରେଟ ଟ୍ରାଞ୍ଜିସନକୁ ସମର୍ଥନ କରେ ନାହିଁ। ଏହାକୁ ସମର୍ଥନ କରୁଥିବା ଏକ ଡିସପ୍ଲେକୁ ଆପଣ ପରିବର୍ତ୍ତନ ନକଲେ, ଏହି ବିକଳ୍ପର କୌଣସି ପ୍ରଭାବ ରହିବ ନାହିଁ।"</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"ସର୍ବଦା"</string>
-    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"ଯଦି ଆପଟି ଏଥିପାଇଁ ଅନୁରୋଧ କରେ, ତେବେ ଆପଣଙ୍କ ଡିଭାଇସ ଆପଣ ଦେଖୁଥିବା ବିଷୟବସ୍ତୁର ମୂଳ ଫ୍ରେମ ରେଟ ସହ ତାହାର ଆଉଟପୁଟକୁ ମେଳ କରିବ। ଏହା ଫଳରେ ଏକ ଭିଡିଓ ପ୍ଲେବ୍ୟାକ ମୋଡ ଚାଲୁ କିମ୍ବା ବନ୍ଦ କରିବା ସମୟରେ ଏକ ସେକେଣ୍ଡ ପାଇଁ ଆପଣଙ୍କ ସ୍କ୍ରିନରେ କିଛି ଦେଖାଯାଇନପାରେ।"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"ବାଧାହୀନ-ନୁହେଁ"</string>
+    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"ଯଦି ଆପଟି ଏଥିପାଇଁ ଅନୁରୋଧ କରେ, ତେବେ ଆପଣଙ୍କ ଡିଭାଇସ୍ ଆପଣ ଦେଖୁଥିବା ବିଷୟବସ୍ତୁର ମୂଳ ଫ୍ରେମ୍ ରେଟ୍ ସହ ତାହାର ଆଉଟପୁଟକୁ ମେଳ କରିବ। ଏହା ଫଳରେ ଏକ ଭିଡିଓ ପ୍ଲେବ୍ୟାକ୍ ମୋଡ୍ ଚାଲୁ କିମ୍ବା ବନ୍ଦ କରିବା ସମୟରେ ଏକ ସେକେଣ୍ଡ ପାଇଁ ଆପଣଙ୍କ ସ୍କ୍ରିନରେ କିଛି ଦେଖାଯାଇନପାରେ।"</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"କେବେ ବି ନୁହେଁ"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"ଆପଟି ଏଥିପାଇଁ ଅନୁରୋଧ କଲେ ମଧ୍ୟ, ଆପଣଙ୍କ ଡିଭାଇସ୍ ଆପଣ ଦେଖୁଥିବା ବିଷୟବସ୍ତୁର ମୂଳ ଫ୍ରେମ୍ ରେଟ୍ ସହ ତାହାର ଆଉଟପୁଟକୁ କେବେ ବି ମେଳ କରିବାକୁ ଚେଷ୍ଟା କରିବ ନାହିଁ।"</string>
     <string name="font_scale_settings_title" msgid="4114019544800225980">"ଟେକ୍ସଟ୍ ସ୍କେଲିଂ"</string>
@@ -217,12 +190,12 @@
     <string name="resolution_selection_dialog_title" msgid="4029798035133645272">"ରିଜୋଲ୍ୟୁସନକୁ ପରିବର୍ତ୍ତନ କରାଯାଇଛି"</string>
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"ରିଜୋଲ୍ୟୁସନକୁ %1$sକୁ ବଦଳାଇବେ?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"ବର୍ତ୍ତମାନଠାରୁ %1$sକୁ ବ୍ୟବହାର କରିବା ପାଇଁ \"ଠିକ୍ ଅଛି\"କୁ ଚୟନ କରନ୍ତୁ।"</string>
-    <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$sରେ Dolby Vision ସମର୍ଥିତ ନୁହେଁ ଏବଂ ଏହା \'ଉନ୍ନତ ଡିସପ୍ଲେ ସେଟିଂସ\'ରେ ଅକ୍ଷମ ହୋଇଯିବ"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"ଏହି ମୋଡ ଏହାକୁ ସମର୍ଥନ କରେ: %1$s\nକିଛି ଟିଭିରେ, ଅଧିକ HDR ଫର୍ମାଟ ସକ୍ଷମ କରିବାକୁ ଆପଣଙ୍କୁ ଉନ୍ନତ HDMIକୁ ଚାଲୁ କରିବା ଆବଶ୍ୟକ ହୋଇପାରେ। ଏହା ସମର୍ଥିତ ନା ନୁହେଁ ଦେଖିବାକୁ ଆପଣଙ୍କ ଟିଭି ସେଟିଂସକୁ ଯାଞ୍ଚ କରନ୍ତୁ।"</string>
+    <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision %1$sରେ ସମର୍ଥିତ ନୁହେଁ ଏବଂ ଏହାକୁ \'ଉନ୍ନତ ଡିସପ୍ଲେ ସେଟିଂସ\'ରେ ଅକ୍ଷମ କରାଯିବ"</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"ଏହି ମୋଡ %1$sକୁ ସମର୍ଥନ କରେ। କିଛି ଟିଭିରେ, ଅଧିକ HDR ଫର୍ମାଟ ସକ୍ଷମ କରିବାକୁ ଆପଣଙ୍କୁ ଉନ୍ନତ HDMIକୁ ଚାଲୁ କରିବା ଆବଶ୍ୟକ ହୋଇପାରେ। ଏହା ସମର୍ଥିତ ନା ନୁହେଁ ଦେଖିବାକୁ ଆପଣଙ୍କ ଟିଭି ସେଟିଂସକୁ ଯାଞ୍ଚ କରନ୍ତୁ।"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"ବାତିଲ କରନ୍ତୁ"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ଠିକ୍ ଅଛି"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"କ୍ୟାଶ୍‌ ହୋଇଥିବା ଡାଟା ଖାଲି କରିବେ?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"ଏହା, ସମସ୍ତ ଡାଟା ପାଇଁ କ୍ୟାଶ୍ ହୋଇଥିବା ଡାଟାକୁ ଖାଲି କରିଦେବ"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -263,7 +236,7 @@
     <string name="bluetooth_known_devices_category" msgid="6895470515631452961">"ଆକସେସୋରୀଗୁଡ଼ିକ"</string>
     <string name="bluetooth_official_remote_category" msgid="5817814488268307170">"ରିମୋଟ୍ କଣ୍ଟ୍ରୋଲ୍"</string>
     <string name="bluetooth_official_remote_entry_title" msgid="6699700335229570038">"ରିମୋଟ କଣ୍ଟ୍ରୋଲ ସେଟିଂସ"</string>
-    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"ରିମୋଟ ବଟନଗୁଡ଼ିକୁ ସେଟ ଅପ କରନ୍ତୁ"</string>
+    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"ରିମୋଟ୍ ବଟନଗୁଡ଼ିକୁ ସେଟ୍ ଅପ୍ କରନ୍ତୁ"</string>
     <string name="bluetooth_ir_entry_subtitle" msgid="4606207128353416151">"ଟିଭି, ରିସିଭର୍ ଏବଂ ସାଉଣ୍ଡବାରଗୁଡ଼ିକରେ ଭଲ୍ୟୁମ୍, ପାୱାର, ଇନପୁଟକୁ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ"</string>
     <string name="bluetooth_connect_action_title" msgid="7715342395313781643">"ସଂଯୋଗ କରନ୍ତୁ"</string>
     <string name="bluetooth_connect_confirm" msgid="4769958536295137386">"%1$s ସହ ସଂଯୋଗ କରନ୍ତୁ"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"ଏହି ଡିଭାଇସ୍‌ ଆପଣଙ୍କ ସଂସ୍ଥା ଦ୍ୱାରା ପରିଚାଳିତ"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"ଏହି ଡିଭାଇସ୍‌ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ଦ୍ୱାରା ପରିଚାଳିତ ହେଉଛି।"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"ଅଧିକ ଜାଣନ୍ତୁ"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{କ୍ୟାମେରା ଆପ}other{କ୍ୟାମେରା ଆପ୍ସ}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"କ୍ୟାଲେଣ୍ଡର ଏପ"</string>
@@ -530,7 +504,7 @@
     <string name="storage_music_usage" msgid="5362871290115089474">"ଅଡିଓ"</string>
     <string name="storage_media_misc_usage" msgid="3404230292054880339">"ମିଶ୍ରିତ"</string>
     <string name="storage_media_cache_usage" msgid="6397941751551207630">"କ୍ୟାସ୍‌ ହୋଇଥିବା ଡାଟା"</string>
-    <string name="storage_eject" msgid="3268870873944951902">"କାଢ଼ି ଦିଅନ୍ତୁ"</string>
+    <string name="storage_eject" msgid="3268870873944951902">"ବାହାର କରନ୍ତୁ"</string>
     <string name="storage_format" msgid="5360900929128087085">"ଲିଭାନ୍ତୁ ଏବଂ ଫର୍ମାଟ୍ କରନ୍ତୁ"</string>
     <string name="storage_format_as_private" msgid="77945551149326052">"ଡିଭାଇସ୍ ‌ଷ୍ଟୋରେଜ୍‌ଭାବରେ ଲିଭାନ୍ତୁ ଏବଂ ଫର୍ମାଟ୍‌ କର"</string>
     <string name="storage_format_as_public" msgid="6745112917895223463">"ଲିଭାଇବା ଷ୍ଟୋରେଜ୍‌ ଭାବରେ ଲାଭାନ୍ତୁ ଏବଂ ଫର୍ମାଟ୍‌ କର"</string>
@@ -594,7 +568,7 @@
     <string name="storage_new_action_browse" msgid="3355241742574072658">"ବ୍ରାଉଜ୍ କରନ୍ତୁ"</string>
     <string name="storage_new_action_adopt" msgid="6809707961170895964">"ଡିଭାଇସ୍‌ ଷ୍ଟୋରେଜ୍‌ଭାବରେ ସେଟ୍‌ ଅପ୍‌ କରନ୍ତୁ"</string>
     <string name="storage_new_action_format_public" msgid="1964662216574764811">"ରିମୁଭ୍‍ କରିହେଉଥିବା ଷ୍ଟୋରେଜ‍ଭାବରେ ସେଟ୍‍ ଅପ୍‍ କରନ୍ତୁ"</string>
-    <string name="storage_new_action_eject" msgid="919249291814300000">"କାଢ଼ି ଦିଅନ୍ତୁ"</string>
+    <string name="storage_new_action_eject" msgid="919249291814300000">"ବାହାର କରନ୍ତୁ"</string>
     <string name="storage_missing_title" msgid="9068915586235805818">"<xliff:g id="NAME">%1$s</xliff:g>କୁ କାଢ଼ି ଦିଆଗଲା"</string>
     <string name="storage_missing_description" msgid="6835620703133204249">"ଡ୍ରାଇଭ୍‍ ପୁଣି ସଂଯୋଗ ନହେବା ପର୍ଯ୍ୟନ୍ତ କିଛି ଆପ୍‍ ଉପଲବ୍ଧ ରହିବ ନାହିଁ ବା ସଠିକ୍‍ ଭାବରେ କାର୍ଯ୍ୟ କରିବ ନାହିଁ।"</string>
     <string name="insufficient_storage" msgid="4175940286022466535">"ଷ୍ଟୋରେଜ୍‌ରେ ପର୍ଯ୍ୟାପ୍ତ ସ୍ଥାନ ନାହିଁ।"</string>
@@ -631,7 +605,7 @@
     <string name="open_mic_permissions" msgid="8121871594807641073">"ଆପର ମାଇକ୍ରୋଫୋନକୁ ଆକ୍ସେସ୍"</string>
     <string name="microphone_physical_privacy_enabled_title" msgid="6135130916399886772">"ମାଇକ୍ରୋଫୋନ ଆକ୍ସେସ ବ୍ଲକ କରାଯାଇଛି"</string>
     <string name="microphone_physical_privacy_enabled_text" msgid="401238365312924088">"ଅନବ୍ଲକ କରିବା ପାଇଁ, ଆପଣଙ୍କ ଡିଭାଇସରେ ଗୋପନୀୟତା ସ୍ୱିଚକୁ \"ମାଇକ୍ରୋଫୋନ ଚାଲୁ\" ସ୍ଥିତିକୁ ମୁଭ କରି ମାଇକ୍ରୋଫୋନ ଆକ୍ସେସ ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ।"</string>
-    <string name="camera" msgid="1226671478936288283">"କେମେରା"</string>
+    <string name="camera" msgid="1226671478936288283">"କ୍ୟାମେରା"</string>
     <string name="camera_toggle_title" msgid="5566469574224956142">"କ୍ୟାମେରା ଆକ୍ସେସ୍"</string>
     <string name="open_camera_permissions" msgid="301360297337141591">"ଆପର କ୍ୟାମେରାକୁ ଆକ୍ସେସ୍"</string>
     <string name="camera_physical_privacy_enabled_title" msgid="1944155695921165511">"କ୍ୟାମେରା ଆକ୍ସେସ ବ୍ଲକ କରାଯାଇଛି"</string>
@@ -786,7 +760,7 @@
     <string name="system_window_animation_scale" msgid="685477540250939659">"ୱିଣ୍ଡୋ ଆନିମେସନ୍‌ ସ୍କେଲ୍‌"</string>
     <string name="system_transition_animation_scale" msgid="7266380208347453619">"ଟ୍ରାଞ୍ଜିସନ୍‌ ଆନିମେସନ୍‌ ସ୍କେଲ୍‌"</string>
     <string name="system_animator_duration_scale" msgid="3829445237130423625">"ଆନିମେଟର୍‌ ଅବଧି ସ୍କେଲ୍‌"</string>
-    <string name="system_strict_mode_enabled" msgid="7392183793064579588">"ଷ୍ଟ୍ରିକ୍ଟ ମୋଡକୁ ସକ୍ଷମ କରାଯାଇଛି"</string>
+    <string name="system_strict_mode_enabled" msgid="7392183793064579588">"କଡ଼ା ମୋଡ୍ ସକ୍ଷମ କରାଯାଇଛି"</string>
     <string name="system_profile_gpu_rendering" msgid="1113416260742329348">"ପ୍ରୋଫାଇଲ୍‌ GPU ରେଣ୍ଡରିଂ"</string>
     <string name="system_enable_traces" msgid="108745519968154528">"ଟ୍ରେସ୍‌ ସକ୍ଷମ କରନ୍ତୁ"</string>
     <string name="system_dont_keep_activities" msgid="4641165963339846161">"କାର୍ଯ୍ୟକଳାପଗୁଡ଼ିକୁ ରଖନ୍ତୁ ନାହିଁ"</string>
@@ -939,7 +913,7 @@
     <string name="device_apps_app_management_licenses" msgid="4809737266551899869">"ତୃତୀୟ-ପକ୍ଷ ସୋର୍ସ"</string>
     <string name="device_apps_app_management_permissions" msgid="4951820230491375037">"ଅନୁମତିଗୁଡ଼ିକ"</string>
     <string name="device_apps_app_management_not_available" msgid="4198634078194500518">"ଆପ୍ଲିକେସନ୍ ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <string name="unused_apps" msgid="5539166745483454543">"ଅବ୍ୟବହୃତ ଆପ୍ସ"</string>
+    <string name="unused_apps" msgid="5539166745483454543">"ଅବ୍ୟବହୃତ ଆପଗୁଡ଼ିକ"</string>
     <string name="settings_ok" msgid="5950888975075541964">"ଠିକ୍ ଅଛି"</string>
     <string name="settings_confirm" msgid="4489126458677153411">"ସୁନିଶ୍ଚିତ କରନ୍ତୁ"</string>
     <string name="settings_cancel" msgid="576094334743686152">"ବାତିଲ କରନ୍ତୁ"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"ଏନର୍ଜି ବ୍ୟବହାର ବଢ଼ାଇବାର ସାମର୍ଥ୍ୟ ଥିବା ମିଡ଼ିଆ ପ୍ଲେବ୍ୟାକ ଦେଖିବା ସମୟରେ ଡିସପ୍ଲେ ବନ୍ଦ ହେବାରୁ ପ୍ରତିରୋଧ କରିବାକୁ ଦୟାକରି ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"ନିଷ୍କ୍ରିୟ ଥିବା ସମୟରେ"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"ଦେଖିବା ସମୟରେ"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"ସ୍ୱତଃ ବନ୍ଦ କରନ୍ତୁ"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"ନିଷ୍କ୍ରିୟ ଥିବା ସମୟରେ ସ୍ୱତଃ ବନ୍ଦ କରନ୍ତୁ"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"ଦେଖିବା ସମୟରେ ସ୍ୱତଃ ବନ୍ଦ କରନ୍ତୁ"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"ଟିଭିକୁ ସ୍ୱଚାଳିତ ଭାବେ ବନ୍ଦ କରନ୍ତୁ"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"ନିଷ୍କ୍ରିୟ ଥିବା ସମୟରେ ଟିଭିକୁ ସ୍ୱଚାଳିତ ଭାବେ ବନ୍ଦ କରନ୍ତୁ"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"ଦେଖିବା ସମୟରେ ଟିଭିକୁ ସ୍ୱଚାଳିତ ଭାବେ ବନ୍ଦ କରନ୍ତୁ"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"ନିଷ୍କ୍ରିୟ ଥିବା ସମୟରେ\" ଟାଇମର \"ଦେଖିବା ସମୟରେ\" ଟାଇମର ଅପେକ୍ଷା କମ ସମୟର ହେବା ଆବଶ୍ୟକ"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"ଦେଖିବା ସମୟରେ\" ଟାଇମର \"ନିଷ୍କ୍ରିୟ ଥିବା ସମୟରେ\" ଟାଇମର ଅପେକ୍ଷା ଅଧିକ ସମୟର ହେବା ଆବଶ୍ୟକ"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"ଷ୍ଟାଣ୍ଡବାଏରେ ନେଟୱାର୍କ କନେକ୍ସନକୁ ସୀମିତ କର"</string>
@@ -1039,7 +1013,7 @@
     <string name="permit_manage_external_storage" msgid="1776899171934627417">"ସମସ୍ତ ଫାଇଲକୁ ପରିଚାଳନା ପାଇଁ ଆକ୍ସେସ୍ ଦିଅନ୍ତୁ"</string>
     <string name="allow_manage_external_storage_description" msgid="4288250228151617611">"ଏହି ଡିଭାଇସ୍ କିମ୍ବା ଯେ କୌଣସି ସଂଯୁକ୍ତ ଥିବା ଷ୍ଟୋରେଜ୍ ଭଲ୍ୟୁମରେ ଥିବା ସମସ୍ତ ଫାଇଲକୁ ପଢ଼ିବା, ପରିବର୍ତ୍ତନ କରିବା ଏବଂ ଡିଲିଟ୍ କରିବା ପାଇଁ ଏହି ଆପକୁ ଅନୁମତି ଦିଅନ୍ତୁ। ଯଦି ଅନୁମତି ଦିଆଯାଏ, ତେବେ ଆପ୍ ଆପଣଙ୍କୁ ସ୍ପଷ୍ଟ ନକରି ଫାଇଲଗୁଡ଼ିକୁ ଆକ୍ସେସ୍ କରିପାରେ।"</string>
     <string name="picture_in_picture_title" msgid="2636935591386702348">"ପିକଚର୍-ଇନ୍-ପିକଚର୍"</string>
-    <string name="picture_in_picture_app_detail_switch" msgid="3688997906817583854">"ପିକଚର-ଇନ-ପିକଚରକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="3688997906817583854">"ପିକଚର୍-ଇନ୍-ପିକଚରର ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="picture_in_picture_empty_text" msgid="4370198922852736600">"ଛବି-ଭିତରେ-ଛବିକୁ ଇନ୍‌ଷ୍ଟଲ୍‌ ହୋଇଥିବା କୌଣସି ଆପ୍‌ ସପୋର୍ଟ କରୁନାହିଁ"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="3296649114939705896">"ଆପ୍‌ ଖୋଲା ଥିବାବେଳେ କିମ୍ୱା ଏହାକୁ ଆପଣ ଛାଡ଼ିବା ପରେ (ଉଦାହରଣସ୍ୱରୂପ, ଏକ ଭିଡିଓ ଦେଖିବା ଜାରି ରଖିବାକୁ) ଏକ ପିକଚର୍-ଇନ-ପିକଚର୍ ୱିଣ୍ଡୋ ତିଆରି କରିବା ପାଇଁ ଏହି ଆ‌ପ୍‌କୁ ଅନୁମତି ଦିଅନ୍ତୁ। ଏହି ୱିଣ୍ଡୋ, ଆପଣ ବ୍ୟବହାର କରୁଥିବା ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକ ଉପରେ ଦେଖାଦେବ।"</string>
     <string name="alarms_and_reminders_description" msgid="4063972350154624500">"ଆପଗୁଡ଼ିକୁ ଆଲାରାମ୍ ସେଟ୍ କରିବାକୁ ଏବଂ ସମୟ-ସମ୍ବେଦନଶୀଳ କାର୍ଯ୍ୟଗୁଡ଼ିକ ସିଡୁଲ୍ କରିବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ। ଏହା ଆପଗୁଡ଼ିକୁ ପୃଷ୍ଠପଟରେ ଚାଲିବାକୁ ଦେଇଥାଏ, ଯାହା ଅଧିକ ପାୱାର୍ ବ୍ୟବହାର କରିପାରେ।\n\nଯଦି ଏହି ଅନୁମତି ବନ୍ଦ ଅଛି, ତେବେ ଏହି ଆପ୍ ଦ୍ୱାରା ସିଡୁଲ୍ କରାଯାଇଥିବା ପୂର୍ବରୁ ଥିବା ଆଲାରାମ୍ ଏବଂ ସମୟ-ଆଧାରିତ ଇଭେଣ୍ଟଗୁଡ଼ିକ କାମ କରିବ ନାହିଁ।"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"ପାୱାର ଚାଲୁ ହେବା ସମୟରେ ବ୍ୟବହାର"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"ରିସେଟ୍ କରନ୍ତୁ"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"ଇଥରନେଟ ପେୟାରିଂ କୋଡ"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"ଏନର୍ଜି ମୋଡଗୁଡ଼ିକ"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"ଟିଭି ବ୍ୟବହାର କରାଯାଉନଥିବା ବେଳେ ଏନର୍ଜିର ଦକ୍ଷତାକୁ ଉନ୍ନତ କରନ୍ତୁ"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"ସକ୍ଷମ କରେ:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ଧ୍ଯାନ ଦିଅନ୍ତୁ ଯେ ଏହି ମୋଡ ଡିଭାଇସର ପାୱାର ବ୍ୟବହାରକୁ ବୃଦ୍ଧି କରିପାରେ।"</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\"କୁ ସକ୍ଷମ କରନ୍ତୁ"</string>
 </resources>
diff --git a/Settings/res/values-pa/energy-modes.xml b/Settings/res/values-pa/energy-modes.xml
deleted file mode 100644
index 198b2d693..000000000
--- a/Settings/res/values-pa/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"ਜ਼ਰੂਰੀ ਨੈੱਟਵਰਕ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ਊਰਜਾ ਦੀ ਘੱਟ ਵਰਤੋਂ"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"ਟੀਵੀ ਦੇ ਵਰਤੋਂ ਵਿੱਚ ਨਾ ਹੋਣ \'ਤੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਬੰਦ ਕਰੋ।"</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"ਮਹੱਤਵਪੂਰਨ ਅੱਪਡੇਟ ਅਤੇ ਫੰਕਸ਼ਨ"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"ਸਿਫ਼ਾਰਸ਼ੀ ਨੈੱਟਵਰਕ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ਊਰਜਾ ਦੀ ਸੁਯੋਗ ਵਰਤੋਂ"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ਨੈੱਟਵਰਕ (ਨੈੱਟਵਰਕ ਸਟੈਂਡਬਾਈ) \'ਤੇ ਟੀਵੀ ਨੂੰ ਚਾਲੂ ਕਰਨ ਦੀਆਂ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"ਵਧੀਕ ਨੈੱਟਵਰਕ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"ਊਰਜਾ ਦੀ ਵਰਤੋਂ ਵਿੱਚ ਵਾਧਾ"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"ਸਿਫ਼ਾਰਸ਼ ਕੀਤੀਆਂ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੋਂ ਇਲਾਵਾ, ਇਹ ਵਿਕਲਪ ਵਧੀਕ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਚਾਲੂ ਕਰਦਾ ਹੈ, ਜਦੋਂ ਟੀਵੀ ਵਰਤੋਂ ਵਿੱਚ ਨਹੀਂ ਹੁੰਦਾ ਜਿਸ ਨਾਲ ਊਰਜਾ ਦੀ ਵਰਤੋਂ ਵਧ ਸਕਦੀ ਹੈ।"</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-pa/strings.xml b/Settings/res/values-pa/strings.xml
index 91573682d..f1b85a484 100644
--- a/Settings/res/values-pa/strings.xml
+++ b/Settings/res/values-pa/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"ਬੈਕਅੱਪ ਲਓ ਅਤੇ ਮੁੜ-ਬਹਾਲ ਕਰੋ"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"ਫੈਕਟਰੀ ਡਾਟਾ ਰੀਸੈੱਟ"</string>
     <string name="device_calibration" msgid="2907914144048739705">"ਕੈਲੀਬਰੇਸ਼ਨ"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"ਟਾਈਮਰ ਬੰਦ ਕਰੋ"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"ਟੀਵੀ ਬੰਦ ਕਰਨ ਅਤੇ ਊਰਜਾ ਬਚਾਉਣ ਲਈ ਟਾਈਮਰ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"ਪਾਵਰ ਅਤੇ ਊਰਜਾ"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"ਈਕੋ ਮੋਡ ਦੀਆਂ ਸੈਟਿੰਗਾਂ"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"ਡੀਵਾਈਸ"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"ਫਾਰਮੈਟ ਚੁਣੋ"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"ਉੱਨਤ ਧੁਨੀ ਸੈਟਿੰਗਾਂ"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"ਗੇਮ ਮੋਡ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"ਮੇਲ ਖਾਂਦੀ ਸਮੱਗਰੀ ਦੀ ਪਰਿਵਰਤਨਸ਼ੀਲ ਰੇਂਜ"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"ਇਹ ਵਿਕਲਪ ਚਾਲੂ ਹੋਣ \'ਤੇ, ਸਿਸਟਮ ਸਮੱਗਰੀ ਨਾਲ ਮੇਲ ਖਾਉਣ ਲਈ ਪਰਿਵਰਤਨਸ਼ੀਲ ਰੇਂਜ ਵਾਲੇ ਵੱਖ-ਵੱਖ ਫਾਰਮੈਟਾਂ ਵਿਚਾਲੇ ਸਵਿੱਚ ਕਰੇਗਾ। ਇਸ ਨਾਲ ਫਾਰਮੈਟ ਸਵਿੱਚ ਦੌਰਾਨ ਸਕ੍ਰੀਨ ਕਾਲੀ ਹੋ ਸਕਦੀ ਹੈ।\n\nਪਰਿਵਰਤਨਸ਼ੀਲ ਰੇਂਜ ਵਾਲੇ ਹੋਰ ਵਿਕਲਪਾਂ ਲਈ ਅਡਵਾਂਸ ਡਿਸਪਲੇ ਸੈਟਿੰਗਾਂ \'ਤੇ ਕਲਿੱਕ ਕਰੋ।"</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"ਤਰਜੀਹੀ ਪਰਿਵਰਤਨਸ਼ੀਲ ਰੇਂਜ"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"ਸਿਸਟਮ-ਤਰਜੀਹੀ ਰੂਪਾਂਤਰਨ"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"ਸਿਸਟਮ ਨੂੰ ਫਾਰਮੈਟ ਰੂਪਾਂਤਰਨ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰਨ ਦਿਓ"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"ਇਹ ਵਿਕਲਪ ਚੁਣਨ \'ਤੇ ਸਿਸਟਮ ਤੁਹਾਡੀ ਡਿਸਪਲੇ \'ਤੇ ਭੇਜੇ ਜਾਣ ਲਈ ਢੁਕਵੀਂ ਗਤੀਸ਼ੀਲ ਦਰ ਨਿਰਧਾਰਿਤ ਕਰੇਗਾ ਅਤੇ ਲੋੜ ਮੁਤਾਬਕ ਸਮੱਗਰੀ ਨੂੰ ਇਸ ਗਤੀਸ਼ੀਲ ਦਰ ਵਿੱਚ ਬਦਲੇਗਾ।"</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"ਸਮੱਗਰੀ ਦੇ ਫਾਰਮੈਟ ਨਾਲ ਹਮੇਸ਼ਾਂ ਮੇਲ ਖਾਂਦਾ ਹੈ"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"ਜ਼ਬਰਦਸਤੀ ਰੂਪਾਂਤਰਨ"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"ਇਸ ਸਮੱਗਰੀ ਦਾ ਤੁਹਾਡੇ ਤਰਜੀਹੀ ਫਾਰਮੈਟ ਵਿੱਚ ਜ਼ਬਰਦਸਤੀ ਰੂਪਾਂਤਰਨ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"ਸਮੱਗਰੀ ਨੂੰ ਤਰਜੀਹੀ ਫਾਰਮੈਟ ਜ਼ਬਦਸਤੀ ਬਦਲੋ। ਜ਼ਬਰਦਸਤੀ ਰੂਪਾਂਤਰਨ ਨਾਲ ਡਿਸਪਲੇ ਫਾਰਮੈਟ ਜਾਂ HDR ਫਾਰਮੈਟ ਵਿਚਲੀਆਂ ਹੋਰ ਸੈਟਿੰਗਾਂ ਪ੍ਰਭਾਵਿਤ ਹੋ ਸਕਦੀਆਂ ਹਨ।"</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"ਹਮੇਸ਼ਾਂ SDR ਵਿੱਚ"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"ਹਮੇਸ਼ਾਂ <xliff:g id="HDR_TYPE">%s</xliff:g> ਵਿੱਚ"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"ਕੀ ਤੁਸੀਂ ਜ਼ਬਰਦਸਤੀ HDR ਆਊਟਪੁੱਟ ਚਾਹੁੰਦੇ ਹੋ?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਤੌਰ \'ਤੇ ਸਮੱਗਰੀ ਦਾ <xliff:g id="HDR_TYPE">%s</xliff:g> ਵਿੱਚ ਜ਼ਬਰਦਸਤੀ ਰੂਪਾਂਤਰਨ ਕੀਤਾ ਜਾਵੇਗਾ।"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"ਤੁਹਾਡੀ ਡਿਸਪਲੇ 1080p 60Hz ਰੈਜ਼ੋਲਿਊਸ਼ਨ \'ਤੇ ਚੱਲੇਗੀ। ਤੁਹਾਡੀ ਡਿਸਪਲੇ 4k 60Hz ਰੈਜ਼ੋਲਿਊਸ਼ਨ \'ਤੇ ਚੱਲਣ \'ਤੇ ਇਹ ਵਿਕਲਪ ਤੁਹਾਡੀ ਡਿਸਪਲੇ ਦੇ ਅਨੁਰੂਪ ਨਹੀਂ ਹੁੰਦਾ ਹੈ।"</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision ਮੌਜੂਦਾ ਰੈਜ਼ੋਲਿਊਸ਼ਨ \'ਤੇ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ। ਜੇ ਤੁਸੀਂ Dolby Vision ਨੂੰ ਹੱਥੀਂ ਚਾਲੂ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਡਿਸਪਲੇ ਦਾ ਰੈਜ਼ੋਲਿਊਸ਼ਨ 1080p 60Hz ਵਿੱਚ ਬਦਲ ਜਾਵੇਗਾ"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"ਕੀ ਰੈਜ਼ੋਲਿਊਸ਼ਨ ਨੂੰ ਬਦਲ ਕੇ 1080p 60Hz ਕਰਨਾ ਹੈ?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"ਹਮੇਸ਼ਾਂ Dolby Vision ਵਿੱਚ ਜ਼ਬਰਦਸਤੀ ਰੂਪਾਂਤਰਨ ਕਰੋ"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"ਜੇ ਅਡਵਾਂਸ ਡਿਸਪਲੇ ਸੈਟਿੰਗਾਂ ਵਿੱਚ Dolby Vision ਨੂੰ HDR ਫਾਰਮੈਟਾਂ ਵਿੱਚ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ, ਤਾਂ Dolby Vision ਵਿੱਚ ਜ਼ਬਰਦਸਤੀ ਰੂਪਾਂਤਰਨ ਕਰ ਕੇ ਇਸਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"ਹਮੇਸ਼ਾਂ HDR10 ਵਿੱਚ ਜ਼ਬਰਦਸਤੀ ਰੂਪਾਂਤਰਨ ਕਰੋ"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"ਜੇ ਅਡਵਾਂਸ ਡਿਸਪਲੇ ਸੈਟਿੰਗਾਂ ਵਿੱਚ HDR10 ਨੂੰ HDR ਫਾਰਮੈਟਾਂ ਵਿੱਚ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ, ਤਾਂ HDR10 ਵਿੱਚ ਜ਼ਬਰਦਸਤੀ ਰੂਪਾਂਤਰਨ ਕਰ ਕੇ ਇਸਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"ਹਮੇਸ਼ਾਂ HLG ਵਿੱਚ ਜ਼ਬਰਦਸਤੀ ਰੂਪਾਂਤਰਨ ਕਰੋ"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"ਜੇ ਅਡਵਾਂਸ ਡਿਸਪਲੇ ਸੈਟਿੰਗਾਂ ਵਿੱਚ HLG ਨੂੰ HDR ਫਾਰਮੈਟਾਂ ਵਿੱਚ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ, ਤਾਂ HLG ਵਿੱਚ ਜ਼ਬਰਦਸਤੀ ਰੂਪਾਂਤਰਨ ਕਰ ਕੇ ਇਸਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"ਹਮੇਸ਼ਾਂ HDR10+ ਵਿੱਚ ਜ਼ਬਰਦਸਤੀ ਰੂਪਾਂਤਰਨ ਕਰੋ"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"ਜੇ ਅਡਵਾਂਸ ਡਿਸਪਲੇ ਸੈਟਿੰਗਾਂ ਵਿੱਚ HDR10+ ਨੂੰ HDR ਫਾਰਮੈਟਾਂ ਵਿੱਚ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ, ਤਾਂ HDR10+ ਵਿੱਚ ਜ਼ਬਰਦਸਤੀ ਰੂਪਾਂਤਰਨ ਕਰ ਕੇ ਇਸਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"ਹਮੇਸ਼ਾਂ SDR ਵਿੱਚ ਜ਼ਬਰਦਸਤੀ ਰੂਪਾਂਤਰਨ ਕਰੋ"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"SDR ਵਿੱਚ ਜ਼ਬਰਦਸਤੀ ਰੂਪਾਂਤਰਨ ਕਰਨ ਨਾਲ ਅਡਵਾਂਸ ਡਿਸਪਲੇ ਸੈਟਿੰਗਾਂ ਵਿੱਚ HDR ਫਾਰਮੈਟਾਂ ਵਿੱਚ ਸਾਰੇ ਫਾਰਮੈਟ ਬੰਦ ਹੋ ਜਾਣਗੇ।"</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"ਸਮੱਗਰੀ ਦੇ ਫ੍ਰੇਮ ਰੇਟ ਦਾ ਮਿਲਾਨ ਕਰੋ"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"ਸਿਰਫ਼-ਸਹਿਜ"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"ਸਹਿਜ"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"ਜੇ ਐਪ ਵੱਲੋਂ ਇਸਦੀ ਬੇਨਤੀ ਕੀਤੀ ਜਾਂਦੀ ਹੈ, ਤਾਂ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਤੁਹਾਡੇ ਵੱਲੋਂ ਦੇਖੀ ਜਾ ਰਹੀ ਸਮੱਗਰੀ ਦੇ ਮੂਲ ਫ੍ਰੇਮ ਰੇਟ ਦਾ ਇਸਦੇ ਆਊਟਪੁੱਟ ਨਾਲ ਮਿਲਾਨ ਕਰੇਗਾ, ਸਿਰਫ਼ ਉਦੋਂ ਜੇ ਤੁਹਾਡਾ ਟੀਵੀ ਸਹਿਜ ਤਬਦੀਲੀ ਕਰ ਸਕਦਾ ਹੈ।"</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"ਤੁਹਾਡੀ ਕਨੈਕਟ ਕੀਤੀ ਡਿਸਪਲੇ ਸਹਿਜ ਰਿਫ੍ਰੈਸ਼ ਦਰ ਪਰਿਵਰਤਨਾਂ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ ਹੈ। ਇਸ ਵਿਕਲਪ ਦਾ ਉਦੋਂ ਤੱਕ ਕੋਈ ਪ੍ਰਭਾਵ ਨਹੀਂ ਹੋਵੇਗਾ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਇਸਦਾ ਸਮਰਥਨ ਕਰਨ ਵਾਲੀ ਡਿਸਪਲੇ ਵਿੱਚ ਨਹੀਂ ਬਦਲਦੇ ਹੋ।"</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"ਹਮੇਸ਼ਾਂ"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"ਸਹਿਜ ਨਹੀਂ"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"ਜੇ ਐਪ ਵੱਲੋਂ ਇਸਦੀ ਬੇਨਤੀ ਕੀਤੀ ਜਾਂਦੀ ਹੈ, ਤਾਂ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਤੁਹਾਡੇ ਵੱਲੋਂ ਦੇਖੀ ਜਾ ਰਹੀ ਸਮੱਗਰੀ ਦੇ ਮੂਲ ਫ੍ਰੇਮ ਰੇਟ ਦਾ ਇਸਦੇ ਆਊਟਪੁੱਟ ਨਾਲ ਮਿਲਾਨ ਕਰੇਗਾ। ਅਜਿਹਾ ਕਰਨ ਨਾਲ ਵੀਡੀਓ ਪਲੇਬੈਕ ਤੋਂ ਬਾਹਰ ਨਿਕਲਣ ਅਤੇ ਦਾਖਲ ਹੋਣ ਵੇਲੇ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਇੱਕ ਸਕਿੰਟ ਲਈ ਕਾਲੀ ਹੋ ਜਾਵੇਗੀ।"</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"ਕਦੇ ਵੀ ਨਹੀਂ"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"ਐਪ ਵੱਲੋਂ ਇਸਦੀ ਬੇਨਤੀ ਕਰਨ \'ਤੇ ਵੀ, ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਤੁਹਾਡੇ ਵੱਲੋਂ ਦੇਖੀ ਜਾ ਰਹੀ ਸਮੱਗਰੀ ਦੇ ਮੂਲ ਫ੍ਰੇਮ ਰੇਟ ਦਾ ਇਸਦੇ ਆਊਟਪੁੱਟ ਨਾਲ ਮਿਲਾਨ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਦੇ ਵੀ ਨਹੀਂ ਕਰੇਗਾ।"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"ਕੀ %1$s ਰੈਜ਼ੋਲਿਊਸ਼ਨ ਨੂੰ ਬਦਲਣਾ ਹੈ?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"ਹੁਣ ਤੋਂ %1$s ਵਰਤਣ ਲਈ \'ਠੀਕ ਹੈ\' ਚੁਣੋ।"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s \'ਤੇ Dolby Vision ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ ਅਤੇ ਇਸਨੂੰ \"ਅਡਵਾਂਸ ਡਿਸਪਲੇ ਸੈਟਿੰਗਾਂ\" ਵਿੱਚੋਂ ਬੰਦ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"ਇਹ ਮੋਡ ਇਸਦਾ ਸਮਰਥਨ ਕਰਦਾ ਹੈ: %1$s\nਕੁਝ ਟੀਵੀਆਂ \'ਤੇ, ਹੋਰ HDR ਫਾਰਮੈਟਾਂ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਵਿਸਤਰਿਤ HDMI ਨੂੰ ਚਾਲੂ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ। ਇਸ ਦੇ ਸਮਰਥਿਤ ਹੋਣ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਆਪਣੀਆਂ ਟੀਵੀ ਸੈਟਿੰਗਾਂ ਦੀ ਜਾਂਚ ਕਰੋ।"</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"ਇਹ ਮੋਡ %1$s ਦਾ ਸਮਰਥਨ ਕਰਦਾ ਹੈ। ਕੁਝ ਟੀਵੀਆਂ \'ਤੇ, ਹੋਰ HDR ਫਾਰਮੈਟਾਂ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਵਿਸਤਰਿਤ HDMI ਨੂੰ ਚਾਲੂ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ। ਇਸ ਦੇ ਸਮਰਥਿਤ ਹੋਣ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਆਪਣੀਆਂ ਟੀਵੀ ਸੈਟਿੰਗਾਂ ਦੀ ਜਾਂਚ ਕਰੋ।"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"ਰੱਦ ਕਰੋ"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ਠੀਕ ਹੈ"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"ਕੀ ਕੈਸ਼ ਕੀਤਾ ਡਾਟਾ ਹਟਾਉਣਾ ਹੈ?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"ਇਹ ਸਾਰੀਆਂ ਐਪਾਂ ਲਈ ਕੈਸ਼ ਕੀਤਾ ਡਾਟਾ ਕਲੀਅਰ ਕਰ ਦੇਵੇਗਾ।"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"ਇਸ ਡੀਵਾਈਸ ਦਾ ਪ੍ਰਬੰਧਨ ਤੁਹਾਡੇ ਸੰਗਠਨ ਵੱਲੋਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"ਇਸ ਡੀਵਾਈਸ ਦਾ ਪ੍ਰਬੰਧਨ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ਵੱਲੋਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"ਹੋਰ ਜਾਣੋ"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{ਕੈਮਰਾ ਐਪ}one{ਕੈਮਰਾ ਐਪ}other{ਕੈਮਰਾ ਐਪਾਂ}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"ਕੈਲੰਡਰ ਐਪ"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"ਕਿਰਪਾ ਕਰਕੇ ਦੇਖਣ ਵੇਲੇ ਡਿਸਪਲੇ ਦੇ ਬੰਦ ਹੋਣ ਤੋਂ ਬਚਣ ਦੀ ਤਸਦੀਕ ਕਰੋ, ਜਿਸ ਵਿੱਚ ਊਰਜਾ ਦੀ ਵਰਤੋਂ ਵਧ ਸਕਦੀ ਹੈ।"</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"ਅਕਿਰਿਆਸ਼ੀਲ ਹੋਣ ਵੇਲੇ"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"ਦੇਖਣ ਵੇਲੇ"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਬੰਦ ਕਰੋ"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"ਅਕਿਰਿਆਸ਼ੀਲ ਹੋਣ \'ਤੇ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਬੰਦ ਕਰੋ"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"ਦੇਖਣ ਵੇਲੇ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਬੰਦ ਕਰੋ"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"ਟੀਵੀ ਦੀ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਬੰਦ ਹੋਣ ਦੀ ਸੈਟਿੰਗ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"ਅਕਿਰਿਆਸ਼ੀਲ ਹੋਣ ਵੇਲੇ ਟੀਵੀ ਦੀ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਬੰਦ ਹੋਣ ਦੀ ਸੈਟਿੰਗ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"ਦੇਖਣ ਵੇਲੇ ਟੀਵੀ ਦੀ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਬੰਦ ਹੋਣ ਦੀ ਸੈਟਿੰਗ ਚਾਲੂ ਕਰੋ"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"ਅਕਿਰਿਆਸ਼ੀਲ ਹੋਣ \'ਤੇ\" ਦਾ ਟਾਈਮਰ \"ਦੇਖਦੇ ਸਮੇਂ\" ਦੇ ਟਾਈਮਰ ਤੋਂ ਛੋਟਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"ਦੇਖਦੇ ਸਮੇਂ\" ਦਾ ਟਾਈਮਰ \"ਅਕਿਰਿਆਸ਼ੀਲ ਹੋਣ \'ਤੇ\" ਦੇ ਟਾਈਮਰ ਤੋਂ ਲੰਮਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"ਸਟੈਂਡਬਾਈ ਵਿੱਚ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਸੀਮਤ ਕਰੋ"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"ਪਾਵਰ ਚਾਲੂ ਹੋਣ \'ਤੇ ਵਰਤਾਅ"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"ਈਥਰਨੈੱਟ ਜੋੜਾਬੱਧਕਰਨ ਕੋਡ"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"ਊਰਜਾ ਮੋਡ"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"ਟੀਵੀ ਦੇ ਵਰਤੋਂ ਵਿੱਚ ਨਾ ਹੋਣ \'ਤੇ ਊਰਜਾ ਦੀ ਸਮਰੱਥਾ ਨੂੰ ਵਧਾਓ"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"ਚਾਲੂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ਨੋਟ ਕਰੋ ਕਿ ਇਹ ਮੋਡ ਡੀਵਾਈਸ ਦੀ ਪਾਵਰ ਖਪਤ ਨੂੰ ਵਧਾ ਸਕਦਾ ਹੈ।"</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
 </resources>
diff --git a/Settings/res/values-pl/energy-modes.xml b/Settings/res/values-pl/energy-modes.xml
deleted file mode 100644
index d93131d18..000000000
--- a/Settings/res/values-pl/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Niezbędne funkcje sieciowe"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Niskie zużycie energii"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Wyłącz połączenie sieciowe, kiedy nie używasz telewizora."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Kluczowe aktualizacje i funkcje"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Zalecane funkcje sieciowe"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Zoptymalizowane zużycie energii"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Włącza funkcje, które aktywują telewizor za pomocą sieci (tryb czuwania przy podłączeniu do sieci)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Wstawić funkcję 1]"</item>
-    <item msgid="8724721267222341891">"[Wstawić funkcję 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Dodatkowe funkcje sieciowe"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Zwiększone zużycie energii"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Oprócz włączenia zalecanych funkcji ta opcja powoduje też włączenie dodatkowych funkcji, kiedy telewizor nie jest używany, co może zwiększyć zużycie energii."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Wstawić funkcję 1]"</item>
-    <item msgid="170760143032597722">"[Wstawić funkcję 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-pl/strings.xml b/Settings/res/values-pl/strings.xml
index f2fc84271..67cf90082 100644
--- a/Settings/res/values-pl/strings.xml
+++ b/Settings/res/values-pl/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Tworzenie i przywracanie kopii zapasowej"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Przywracanie danych fabrycznych"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibracja"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Odliczanie czasu do wyłączenia"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Ustaw minutnik, który wyłączy telewizor, aby oszczędzać prąd"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Zasilanie i energia"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Ustawienia trybu Eko"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Urządzenia"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Wybierz formaty"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Zaawansowane ustawienia dźwięku"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Zezwalaj na tryb gry"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Dopasuj do zakresu dynamicznego treści"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Po włączeniu tej opcji system będzie się przełączał między różnymi formatami zakresu dynamicznego zależnie od treści. Może to spowodować wyświetlenie czarnego ekranu podczas zmiany formatu.\n\nAby zobaczyć więcej opcji zakresu dynamicznego, kliknij Zaawansowane ustawienia wyświetlacza."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Preferowany zakres dynamiczny"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Konwersja preferowana przez system"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Zezwalaj systemowi na zarządzanie konwersją formatu"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Po wybraniu tej opcji odpowiedni to system będzie określać zakres dynamiczny wysyłany do wyświetlacza. W razie potrzeby treść zostanie przekonwertowana na ten zakres."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Zawsze zgodnie z formatem treści"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Wymuszaj konwersję"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Wymusza konwersję na preferowany format"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Wymuszaj konwersję na preferowany format. Wymuszanie konwersji może mieć wpływ na inne ustawienia trybu wyświetlania lub formatu HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Zawsze na SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Zawsze na <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Czy chcesz wymusić sygnał HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Domyślnie wymuszona będzie konwersja <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Obraz będzie wyświetlany w rozdzielczości 1080p przy 60 Hz. Ta opcja nie jest zgodna z Twoim wyświetlaczem w przypadku obrazu w rozdzielczości 4K przy 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Format Dolby Vision nie jest obsługiwany w bieżącej rozdzielczości. Jeśli ręcznie wybierzesz Dolby Vision, rozdzielczość wyświetlacza zmieni się na 1080p i 60 Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Zmienić rozdzielczość na 1080p i 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Zawsze wymuszaj konwersję na Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Jeśli standard Dolby Vision jest wyłączony w przypadku formatów HDR w Zaawansowanych ustawieniach wyświetlacza, wymuszenie konwersji na Dolby Vision spowoduje jego ponowne włączenie."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Zawsze wymuszaj konwersję na HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Jeśli standard HDR10 jest wyłączony w przypadku formatów HDR w Zaawansowanych ustawieniach wyświetlacza, wymuszenie konwersji na HDR10 spowoduje jego ponowne włączenie."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Zawsze wymuszaj konwersję na HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Jeśli standard HLG jest wyłączony w przypadku formatów HDR w Zaawansowanych ustawieniach wyświetlacza, wymuszenie konwersji na HLG spowoduje jego ponowne włączenie."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Zawsze wymuszaj konwersję na HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Jeśli standard HDR10+ jest wyłączony w przypadku formatów HDR w Zaawansowanych ustawieniach wyświetlacza, wymuszenie konwersji na HDR10+ spowoduje jego ponowne włączenie."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Zawsze wymuszaj konwersję na SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Wymuszenie konwersji na SDR spowoduje wyłączenie wszystkich formatów HDR w Zaawansowanych ustawieniach wyświetlacza."</string>
-    <string name="match_content_frame_rate_title" msgid="153291168560947689">"Dostosuj do liczby klatek oglądanych treści"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Tylko płynnie"</string>
+    <string name="match_content_frame_rate_title" msgid="153291168560947689">"Dopasuj do liczby klatek treści"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Płynnie"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Jeśli aplikacja o to poprosi, urządzenie będzie dopasowywać sygnał wyjściowy do pierwotnej liczby klatek oglądanych treści, TYLKO jeśli telewizor może to zrobić płynnie."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Podłączony wyświetlacz nie obsługuje płynnej zmiany częstotliwości odświeżania. Ta opcja nie zadziała, dopóki nie podłączysz wyświetlacza, który ją obsługuje."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Zawsze"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Niepłynnie"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Jeśli aplikacja o to poprosi, urządzenie będzie dopasowywać sygnał wyjściowy do pierwotnej liczby klatek oglądanych treści. Może to spowodować, że gdy włączysz lub wyłączysz odtwarzanie, obraz na sekundę zniknie."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Nigdy"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Nawet jeśli aplikacja o to poprosi, urządzenie nigdy nie będzie próbowało dopasować sygnału wyjściowego do pierwotnej liczby klatek oglądanych treści."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Zmienić rozdzielczość na %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Kliknij OK, aby od teraz używać rozdzielczości %1$s."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Format Dolby Vision nie jest obsługiwany w trybie %1$s i zostanie wyłączony w „Zaawansowanych ustawieniach wyświetlacza”"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Ten tryb obsługuje: %1$s\nNa niektórych telewizorach, żeby korzystać z dodatkowych formatów HDR, może być konieczne włączenie rozszerzonego trybu HDMI. Sprawdź w ustawieniach telewizora, czy ta funkcja jest obsługiwana."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Ten tryb obsługuje: %1$s. W niektórych telewizorach żeby korzystać z dodatkowych formatów HDR, może być konieczne włączenie rozszerzonego trybu HDMI. Sprawdź w ustawieniach telewizora, czy ta funkcja jest obsługiwana."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Anuluj"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Wyczyścić dane z pamięci podręcznej?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Usuwasz dane z pamięci podr. wszystkich aplikacji."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Tym urządzeniem zarządza Twoja organizacja."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Tym urządzeniem zarządza <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">"  "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Więcej informacji"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplikacja aparatu}few{Aplikacje aparatu}many{Aplikacje aparatu}other{Aplikacje aparatu}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplikacja kalendarza"</string>
@@ -757,7 +731,7 @@
     <string name="system_drawing" msgid="5802739024643871942">"Rysowanie"</string>
     <string name="system_monitoring" msgid="7997260748312620855">"Monitorowanie"</string>
     <string name="system_apps" msgid="8481888654606868074">"Aplikacje"</string>
-    <string name="system_stay_awake" msgid="5935117574414511413">"Nie usypiaj"</string>
+    <string name="system_stay_awake" msgid="5935117574414511413">"Pozostaw włączony ekran"</string>
     <string name="keep_screen_on_summary" msgid="4680661166009970792">"Ekran nigdy nie będzie usypiany"</string>
     <string name="system_hdcp_checking" msgid="3757586362130048838">"Sprawdzanie HDCP"</string>
     <string name="system_hdmi_optimization" msgid="4122753440620724144">"Optymalizacja HDMI"</string>
@@ -771,7 +745,7 @@
     <string name="system_usb_debugging" msgid="2158285492172755923">"Debugowanie USB"</string>
     <string name="system_allow_mock_locations" msgid="2483106887711851466">"Pozorowanie lokalizacji"</string>
     <string name="system_select_debug_app" msgid="6200987902307533721">"Wybierz aplikację do debugowania"</string>
-    <string name="system_wait_for_debugger" msgid="5715878008542589060">"Czekaj na debugera"</string>
+    <string name="system_wait_for_debugger" msgid="5715878008542589060">"Poczekaj na debugera"</string>
     <string name="system_verify_apps_over_usb" msgid="7289212844195483932">"Weryfikuj aplikacje przez USB"</string>
     <string name="system_desc_verify_apps_over_usb" msgid="7737988681480237094">"Sprawdzaj, czy aplikacje zainstalowane przez ADB/ADT nie zachowują się w szkodliwy sposób"</string>
     <string name="system_wifi_verbose_logging" msgid="3097788974146704831">"Szczegółówe rejestrowanie Wi-Fi"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Potwierdź wyłączenie tego ustawienia, aby ekran nie wyłączał się podczas oglądania filmów. Może to zwiększyć wykorzystanie energii."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Podczas braku aktywności"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Podczas oglądania"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Wyłącz automatycznie"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Wyłącz automatycznie przy braku aktywności"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Wyłącz automatycznie podczas oglądania"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Automatycznie wyłącz telewizor"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Automatycznie wyłącz telewizor podczas braku aktywności"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Automatycznie wyłącz telewizor podczas oglądania"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Czas „Podczas braku aktywności” musi być krótszy niż czas „Podczas oglądania”"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Czas „Podczas oglądania” musi być dłuższy niż „Podczas braku aktywności”"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Wyłącz sieć w trybie gotowości"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Działanie po włączeniu"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Resetowanie"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Kod parowania Ethernetu"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Tryby energetyczne"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Zwiększ wydajność energetyczną, kiedy telewizor nie jest używany"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Włącza:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Uwaga: ten tryb może powodować większe zużycie energii na urządzeniu."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Włącz tryb „<xliff:g id="ENERGYMODENAME">%s</xliff:g>”"</string>
 </resources>
diff --git a/Settings/res/values-pt-rBR/energy-modes.xml b/Settings/res/values-pt-rBR/energy-modes.xml
deleted file mode 100644
index f526219a9..000000000
--- a/Settings/res/values-pt-rBR/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Recursos de rede essenciais"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Baixo uso de energia"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Desative a conexão de rede quando a TV não estiver em uso."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Atualizações e funções importantes"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Recursos de rede recomendados"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Uso otimizado de energia"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Habilita recursos que ativam a TV na rede (standby em rede)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Outros recursos de rede"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Maior uso de energia"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Além dos recursos recomendados, essa opção ativa outros recursos quando a TV não está em uso, o que pode aumentar o uso de energia."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-pt-rBR/strings.xml b/Settings/res/values-pt-rBR/strings.xml
index f20257e90..f7c77fd35 100644
--- a/Settings/res/values-pt-rBR/strings.xml
+++ b/Settings/res/values-pt-rBR/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Backup e restauração"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Redefinição para configuração original"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Calibração"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Timer de desligamento"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Defina um timer para desligar a TV e economizar energia"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Energia"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Configurações do modo Eco"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Dispositivos"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Selecionar formatos"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Configurações de som avançadas"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Permitir modo jogo"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Usar o mesmo alcance dinâmico do conteúdo"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Ao ativar essa opção, o sistema vai alternar entre diferentes formatos de alcance dinâmico para usar o mesmo do conteúdo. Isso pode causar uma tela preta durante a troca de formato.\n\nClique em \"Configurações avançadas de tela\" para mais opções de alcance dinâmico."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Alcance dinâmico principal"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Conversão preferencial do sistema"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Deixar que o sistema gerencie a conversão de formato"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Quando essa opção for selecionada, o sistema vai determinar um alcance dinâmico adequado para a tela e converter o conteúdo a esse alcance conforme necessário."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Sempre corresponder ao formato do conteúdo"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Forçar a conversão"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Força a conversão para formato preferencial"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Forçar a conversão para um formato preferencial. Isso pode afetar outras configurações no modo de exibição ou no formato HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Sempre para SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Sempre para <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Quer forçar a saída HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Por padrão, a conversão será forçada para <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"A tela vai funcionar com uma resolução de 1080p e 60 Hz. Essa opção não é compatível com a resolução de 4K e 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"A resolução atual não tem suporte para o Dolby Vision. Se você ativar o Dolby Vision manualmente, a resolução da tela vai mudar para 1080p a 60Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Mudar resolução para 1080p a 60Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Sempre forçar a conversão para Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Se o Dolby Vision estiver desativado nos formatos HDR nas configurações avançadas de exibição, forçar a conversão para Dolby Vision vai reativá-lo."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Sempre forçar a conversão para HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Se o HDR10 estiver desativado nos formatos HDR nas configurações avançadas de exibição, forçar a conversão para HDR10 vai reativá-lo."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Sempre forçar a conversão para HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Se o HLG estiver desativado nos formatos HDR nas configurações avançadas de exibição, forçar a conversão para HLG vai reativá-lo."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Sempre forçar a conversão para HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Se o HDR10+ estiver desativado nos formatos HDR nas configurações avançadas de exibição, forçar a conversão para HDR10+ vai reativá-lo."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Sempre forçar a conversão para SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Forçar a conversão para SDR desativa todos os formatos nos formatos HDR nas configurações avançadas de exibição."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Ajuste de frame rate do conteúdo"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Apenas frame rate contínuo"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Uniforme"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Se o app solicitar, o dispositivo usará um frame rate igual ao original do conteúdo que você está assistindo, mas APENAS se a TV puder fazer uma transição uniforme."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"A tela conectada não oferece suporte a transições uniformes entre as taxas de atualização. Essa opção só terá efeito se você conectar uma tela com suporte."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Sempre"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Não uniforme"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Se o app solicitar, o dispositivo usará um frame rate igual ao original do conteúdo que você está assistindo. Isso pode fazer com que a tela fique em branco por um segundo ao sair ou entrar em uma reprodução de vídeo."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Nunca"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Mesmo se o app solicitar, o dispositivo nunca tentará usar um frame rate igual ao original do conteúdo que você está assistindo."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Quer mudar a resolução para %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Selecione \"Ok\" para usar a resolução %1$s de agora em diante."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Não há suporte a Dolby Vision no modo %1$s, e ele vai ser desativado em \"Configurações avançadas de tela\""</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Esse modo está disponível para: %1$s\nEm algumas TVs, talvez você tenha que ativar a opção \"HDMI avançado\" para permitir mais formatos HDR. Verifique as configurações da TV para conferir se esse opção está disponível."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Este modo oferece suporte a %1$s. Em algumas TVs, talvez você tenha que ativar a opção \"HDMI avançado\" para permitir mais formatos HDR. Verifique as configurações da TV para conferir se esse opção está disponível."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Cancelar"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Limpar os dados em cache?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Esta ação limpa dados em cache de todos os apps."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Este dispositivo é gerenciado pela sua organização."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Este dispositivo é gerenciado por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Saiba mais"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{App de câmera}one{App de câmera}other{Apps de câmera}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"App Calendário"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Confirme para evitar que a tela desligue enquanto você estiver assistindo. A tela ligada aumenta o uso de energia."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Durante a inatividade"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Durante a reprodução de mídia"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Desligar automaticamente"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Desligar automaticamente durante a inatividade"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Desligar automaticamente enquanto assiste"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Desligar a TV automaticamente"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Desligar a TV automaticamente quando estiver em inatividade"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Desligar a TV automaticamente enquanto estiver assistindo"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"O timer \"Durante a inatividade\" precisa durar menos que o timer \"Durante a reprodução de mídia\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"O timer \"Durante a reprodução de mídia\" precisa durar mais que o timer \"Durante a inatividade\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Limitar conexão de rede no modo de espera"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Comportamento ao ligar"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Reiniciar"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Código de pareamento Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Modos de energia"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Melhore o consumo de energia quando a TV não está em uso"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Ativa:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Esse modo pode aumentar o consumo de energia do dispositivo."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Ativar \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/Settings/res/values-pt-rPT/energy-modes.xml b/Settings/res/values-pt-rPT/energy-modes.xml
deleted file mode 100644
index cd091603a..000000000
--- a/Settings/res/values-pt-rPT/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Funcionalidades de rede essenciais"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Baixo consumo de energia"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Desative a ligação de rede quando a TV não está em utilização."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Funções e atualizações críticas"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Funcionalidades de rede recomendadas"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Consumo de energia otimizado"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Ativa funcionalidades que permitem a ativação da TV através da rede (modo de espera em rede)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Introduzir funcionalidade 1]"</item>
-    <item msgid="8724721267222341891">"[Introduzir funcionalidade 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Funcionalidades de rede adicionais"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Maior consumo de energia"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Além das funcionalidades recomendadas, esta opção ativa funcionalidades adicionais, quando a TV não está em utilização, que podem aumentar o consumo de energia."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Introduzir funcionalidade 1]"</item>
-    <item msgid="170760143032597722">"[Introduzir funcionalidade 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-pt-rPT/strings.xml b/Settings/res/values-pt-rPT/strings.xml
index 272135a3c..1a3f21390 100644
--- a/Settings/res/values-pt-rPT/strings.xml
+++ b/Settings/res/values-pt-rPT/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Cópia de segurança e restauro"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Reposição de dados de fábrica"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Calibração"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Temporizador de desativação"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Defina temporizadores para desligar a TV e poupar energia"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Alimentação e energia"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Definições do modo Eco"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Dispositivos"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Selecionar formatos"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Definições de som avançadas"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Permitir modo de jogo"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Faça a correspondência com a amplitude dinâmica do conteúdo"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Ao ativar esta opção, o sistema vai alternar entre diferentes formatos de amplitude dinâmica para corresponder ao conteúdo. Isto pode resultar num ecrã preto durante uma mudança de formato.\n\nClique em Definições de visualização avançadas para obter mais opções de amplitude dinâmica."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Amplitude dinâmica preferida"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Conversão preferida do sistema"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Permite que o sistema faça a gestão da conversão do formato"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Quando esta opção está selecionada, o sistema vai determinar uma amplitude dinâmica adequada para ser enviada para o seu ecrã e converter o conteúdo nesta amplitude dinâmica conforme necessário."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Corresponde sempre ao formato do conteúdo"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Force a conversão"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Força a conversão no formato preferido"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Force a conversão no formato preferido. Forçar a conversão pode afetar outras definições no Modo de apresentação ou formato HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Sempre para SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Sempre para <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Quer forçar a saída HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Por predefinição, a conversão vai ser forçada para <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"O ecrã vai ter uma resolução 1080p a 60 Hz. Esta opção não é compatível com o seu ecrã na resolução 4K a 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"O Dolby Vision não é suportado na resolução atual. Se ativar o Dolby Vision manualmente, a resolução do ecrã é alterada para 1080p a 60Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Alterar a resolução para 1080p a 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Forçar sempre a conversão para o Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Se o Dolby Vision estiver desativado nos Formatos HDR nas Definições de visualização avançadas, forçar a conversão para o Dolby Vision vai reativá-lo."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Forçar sempre a conversão para o HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Se o HDR10 estiver desativado nos Formatos HDR nas Definições de visualização avançadas, forçar a conversão para o HDR1 vai reativá-lo."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Forçar sempre a conversão para o HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Se o HLG estiver desativado nos Formatos HDR nas Definições de visualização avançadas, forçar a conversão para o HLG vai reativá-lo."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Forçar sempre a conversão para o HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Se o HDR10+ estiver desativado nos Formatos HDR nas Definições de visualização avançadas, forçar a conversão para o HDR10+ vai reativá-lo."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Forçar sempre a conversão para o SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Forçar a conversão para o SDR vai desativar todos os formatos nos Formatos HDR nas Definições de visualização avançadas."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Igualar a velocidade de frames do conteúdo"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Apenas sem interrupções"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Sem interrupções"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Se a app o solicitar, o dispositivo irá fazer corresponder a respetiva saída à velocidade de frames original do conteúdo que está a ver APENAS se a sua TV conseguir efetuar uma transição sem interrupções."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"O seu ecrã ligado não suporta transições integradas da taxa de atualização. Esta opção só vai ter efeito se mudar para um ecrã que as suporte."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Sempre"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Com interrupções"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Se a app o solicitar, o dispositivo irá fazer corresponder a respetiva saída à velocidade de frames original do conteúdo que está a ver. Isto pode fazer com que o ecrã fique em branco por alguns instantes quando sai ou entra numa reprodução de vídeo."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Nunca"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Mesmo que a app o solicite, o dispositivo nunca vai tentar fazer corresponder a respetiva saída à velocidade de frames original do conteúdo que está a ver."</string>
@@ -195,7 +168,7 @@
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Seleção de formato"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automático"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manual"</string>
-    <string name="hdr_format_selection_auto_desc" msgid="1542210944552409996">"Usar os formatos do dispositivo indicados"</string>
+    <string name="hdr_format_selection_auto_desc" msgid="1542210944552409996">"Utilizar os formatos do dispositivo indicados"</string>
     <string name="hdr_format_selection_manual_desc" msgid="8865649615882146772">"Escolher os formatos manualmente a partir dos formatos disponíveis"</string>
     <string name="hdr_format_supported_title" msgid="1458594819224612431">"FORMATOS SUPORTADOS"</string>
     <string name="hdr_format_unsupported_title" msgid="715318408107924941">"FORMATOS NÃO SUPORTADOS"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Alterar resolução para %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Selecione OK para utilizar %1$s a partir de agora."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"O Dolby Vision não é suportado no modo %1$s e vai ser desativado nas \"Definições de visualização avançadas\""</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Este modo suporta: %1$s\nEm algumas TVs, pode ter de ligar o HDMI melhorado para ativar mais formatos HDR (elevada amplitude dinâmica). Verifique as definições da sua TV para ver se isto é suportado."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Este modo suporta %1$s. Em algumas TVs, pode ter de ligar o HDMI melhorado para ativar mais formatos HDR. Verifique as definições da sua TV para ver se isto é suportado."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Cancelar"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Pretende limpar os dados em cache?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Isto limpa os dados em cache de todas as app"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -245,11 +218,11 @@
     <string name="accessories_autopair_msg" msgid="2501824457418285019">"Foi encontrado um dispositivo e será automaticamente sincronizado dentro de <xliff:g id="COUNTDOWN">%1$s</xliff:g> segundos"</string>
     <string name="error_action_not_supported" msgid="5377532621386080296">"Esta ação não é suportada"</string>
     <string name="bluetooth_pairing_request" msgid="6120176967230348092">"Pedido de sincronização de Bluetooth"</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="7397401633869153520">"Para sincronizar com: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, certifique-se de que apresenta esta token de acesso: &lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="7397401633869153520">"Para sincronizar com: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, certifique-se de que apresenta esta chave de acesso: &lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="8587851808387685613">"De: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;Sincronizar com este dispositivo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="6934651048757228432">"Para sincronizar com: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;Introduza no dispositivo: &lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; e, em seguida, prima Enter."</string>
     <string name="bluetooth_enter_pin_msg" msgid="8905524093007140634">"Para sincronizar com: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, &lt;br&gt;Introduza o PIN obrigatório do dispositivo:"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="889584097447402492">"Para sincronizar com: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, &lt;br&gt;Introduza o token de acesso obrigatória do dispositivo:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="889584097447402492">"Para sincronizar com: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, &lt;br&gt;Introduza a chave de acesso obrigatória do dispositivo:"</string>
     <string name="bluetooth_pin_values_hint" msgid="6237371515577342950">"Geralmente, 0000 ou 1234"</string>
     <string name="bluetooth_pair" msgid="2410285813728786067">"Sincronizar"</string>
     <string name="bluetooth_cancel" msgid="4415185529332987034">"Cancelar"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Este dispositivo é gerido pela sua entidade."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Este dispositivo é gerido por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Saiba mais"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{App de câmara}other{Apps de câmara}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplicação de calendário"</string>
@@ -351,7 +325,7 @@
     <string name="default_email_app_title" msgid="3712283056326496555">"{count,plural, =1{App de cliente de email}other{Apps de cliente de email}}"</string>
     <string name="default_map_app_title" msgid="9051013257374474801">"Aplicação de mapas"</string>
     <string name="default_phone_app_title" msgid="4833449131501871644">"{count,plural, =1{App de telefone}other{Apps de telefone}}"</string>
-    <string name="default_browser_title" msgid="3612813200586492159">"App de navegador"</string>
+    <string name="default_browser_title" msgid="3612813200586492159">"App do navegador"</string>
     <string name="app_names_concatenation_template_2" msgid="5297284354915830297">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="4932774380339466733">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="tutorials" msgid="7880770425872110455">"Tutoriais"</string>
@@ -584,7 +558,7 @@
     <string name="storage_wizard_eject_private_title" msgid="1336088625197134497">"Ejetar armazenamento do dispositivo"</string>
     <string name="storage_wizard_eject_private_description" msgid="4341905730016007385">"As aplicações no armazenamento deste dispositivo deixarão de funcionar quando ejetar a unidade. Esta unidade USB está formatada para funcionar apenas neste dispositivo. Não funciona em mais nenhum."</string>
     <string name="storage_wizard_eject_progress_title" msgid="6025569356827683446">"A ejetar <xliff:g id="NAME">%1$s</xliff:g>…"</string>
-    <string name="storage_wizard_move_app_title" msgid="6504922588346440942">"Armazenamento usado"</string>
+    <string name="storage_wizard_move_app_title" msgid="6504922588346440942">"Armazenamento utilizado"</string>
     <string name="storage_wizard_move_app_progress_title" msgid="7058465372227392453">"A mover <xliff:g id="NAME">%1$s</xliff:g>…"</string>
     <string name="storage_wizard_move_app_progress_description" msgid="7673347796805764888">"Não remova a unidade durante a transferência.\nA aplicação <xliff:g id="APPNAME">%1$s</xliff:g> neste dispositivo não está disponível até terminar a transferência."</string>
     <string name="storage_wizard_forget_confirm_title" msgid="3709482471888830896">"Pretende esquecer o armazenamento do dispositivo?"</string>
@@ -609,16 +583,16 @@
     <string name="system_set_time" msgid="7179243042276057341">"Definir hora"</string>
     <string name="system_set_time_zone" msgid="6471564469883225195">"Definir fuso horário"</string>
     <string name="desc_set_time_zone" msgid="4926392006501180047">"<xliff:g id="OFFSET">%1$s</xliff:g>, <xliff:g id="NAME">%2$s</xliff:g>"</string>
-    <string name="system_set_time_format" msgid="902518158066450918">"Usar formato de 24 horas"</string>
+    <string name="system_set_time_format" msgid="902518158066450918">"Utilizar formato de 24 horas"</string>
     <string name="desc_set_time_format" msgid="8688587526768572230">"<xliff:g id="STATE">%1$s</xliff:g> (<xliff:g id="SAMPLE">%2$s</xliff:g>)"</string>
     <string name="system_auto_date_time" msgid="8458199433555868708">"Data e hora automáticas"</string>
   <string-array name="auto_date_time_entries">
-    <item msgid="8119837829162871025">"Usar hora fornecida pela rede"</item>
+    <item msgid="8119837829162871025">"Utilizar hora fornecida pela rede"</item>
     <item msgid="369146066143710034">"Desativado"</item>
   </string-array>
   <string-array name="auto_date_time_ts_entries">
-    <item msgid="1010003447137304123">"Usar hora fornecida pela rede"</item>
-    <item msgid="5645263357181875427">"Usar hora fornecida pelo fluxo contínuo de transporte"</item>
+    <item msgid="1010003447137304123">"Utilizar hora fornecida pela rede"</item>
+    <item msgid="5645263357181875427">"Utilizar hora fornecida pelo fluxo contínuo de transporte"</item>
     <item msgid="5501503537181350884">"Desativado"</item>
   </string-array>
     <string name="sensor_toggle_description" msgid="7415801459994303159">"Para todas as apps e serviços"</string>
@@ -654,7 +628,7 @@
     <string name="location_no_recent_apps" msgid="7033474075806435793">"Nenhuma aplicação solicitou a localização recentemente"</string>
     <string name="location_high_battery_use" msgid="5325556609027887602">"Utilização de bateria elevada"</string>
     <string name="location_low_battery_use" msgid="728585923412018253">"Utilização de bateria baixa"</string>
-    <string name="location_mode_wifi_description" msgid="84697248707903061">"Usar Wi-Fi para calcular a localização"</string>
+    <string name="location_mode_wifi_description" msgid="84697248707903061">"Utilizar Wi-Fi para calcular a localização"</string>
     <string name="location_status" msgid="3037321737386011224">"Estado de localização"</string>
     <string name="location_services" msgid="551503779736382878">"Serviços de localização"</string>
     <string name="on" msgid="4899322147062342542">"Ativado"</string>
@@ -740,7 +714,7 @@
     <string name="accessibility_audio_description_summary" msgid="2027813223650517036">"Ouça uma descrição do que se passa no ecrã em filmes e programas suportados"</string>
     <string name="system_accessibility_status" msgid="8504842254080682515">"Ativar"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Configuração"</string>
-    <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Utilizar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"O <xliff:g id="SERVICE">%1$s</xliff:g> poderá recolher todo o texto que digita, exceto palavras-passe. Isto inclui dados pessoais como números de cartões de crédito."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Parar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Ao selecionar OK, para o <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
@@ -764,16 +738,16 @@
     <string name="system_reboot_confirm" msgid="7035370306447878560">"Pretende reiniciar agora?"</string>
     <string name="system_desc_reboot_confirm" msgid="1567738857421128179">"Para alterar esta definição, é necessário reiniciar o dispositivo"</string>
     <string name="system_never_check" msgid="2860070727606369055">"Nunca verificar"</string>
-    <string name="system_check_for_drm_content_only" msgid="6667617772587997533">"Rever apenas conteúdo DRM"</string>
-    <string name="system_always_check" msgid="384870282800221580">"Rever sempre"</string>
+    <string name="system_check_for_drm_content_only" msgid="6667617772587997533">"Verificar apenas conteúdo DRM"</string>
+    <string name="system_always_check" msgid="384870282800221580">"Verificar sempre"</string>
     <string name="system_bt_hci_log" msgid="1891838112637932603">"Registo HCI Bluetooth"</string>
     <string name="system_email_address" msgid="3725494874473757217">"Endereço de email"</string>
     <string name="system_usb_debugging" msgid="2158285492172755923">"Depuração USB"</string>
     <string name="system_allow_mock_locations" msgid="2483106887711851466">"Permitir locais fictícios"</string>
     <string name="system_select_debug_app" msgid="6200987902307533721">"Selecionar app a depurar"</string>
     <string name="system_wait_for_debugger" msgid="5715878008542589060">"Aguardar pelo depurador"</string>
-    <string name="system_verify_apps_over_usb" msgid="7289212844195483932">"Rever apps por USB"</string>
-    <string name="system_desc_verify_apps_over_usb" msgid="7737988681480237094">"Rever se existem comportamentos prejudiciais nas aplicações instaladas via ADB/ADT"</string>
+    <string name="system_verify_apps_over_usb" msgid="7289212844195483932">"Verificar apps por USB"</string>
+    <string name="system_desc_verify_apps_over_usb" msgid="7737988681480237094">"Verificar se existem comportamentos prejudiciais nas aplicações instaladas via ADB/ADT"</string>
     <string name="system_wifi_verbose_logging" msgid="3097788974146704831">"Registo detalhado de Wi-Fi"</string>
     <string name="system_desc_wifi_verbose_logging" msgid="3537578245428327314">"Ativar o registo detalhado de Wi-Fi"</string>
     <string name="system_show_touches" msgid="8244331695139748286">"Apresentar toques"</string>
@@ -793,7 +767,7 @@
     <string name="system_background_process_limit" msgid="1985373407150771045">"Limite do processo em 2.º plano"</string>
     <string name="system_show_all_anrs" msgid="5353216640638263217">"Mostrar todos os ANRs"</string>
     <string name="system_desc_stay_awake" msgid="8485868071929937500">"Desativar suspensão"</string>
-    <string name="system_desc_hdcp_checking" msgid="1664068008848077241">"Usar apenas para conteúdo DRM"</string>
+    <string name="system_desc_hdcp_checking" msgid="1664068008848077241">"Utilizar apenas para conteúdo DRM"</string>
     <string name="system_desc_hdmi_optimization" msgid="5695603795556335912">"Otimize o visor para obter a máxima resolução ou a máxima velocidade de fotogramas. Esta ação apenas afeta os visores Ultra HD. Se alterar esta definição, reiniciará o dispositivo."</string>
     <string name="system_desc_bt_hci_log" msgid="2592649923221658103">"Ativar registo de monitorização HCI Bluetooth"</string>
     <string name="system_desc_usb_debugging" msgid="5672275208185222785">"Modo de depuração com USB ligado"</string>
@@ -927,7 +901,7 @@
     <string name="device_apps_app_management_disable_desc" msgid="9143166267511427607">"Desativar esta aplicação?"</string>
     <string name="device_apps_app_management_enable" msgid="9173340340253029114">"Ativar"</string>
     <string name="device_apps_app_management_enable_desc" msgid="8686291003061136476">"Ativar esta aplicação?"</string>
-    <string name="device_apps_app_management_storage_used" msgid="6725789557993296433">"Armazenamento usado"</string>
+    <string name="device_apps_app_management_storage_used" msgid="6725789557993296433">"Armazenamento utilizado"</string>
     <string name="device_apps_app_management_storage_used_desc" msgid="8928632612101487179">"<xliff:g id="SIZE">%1$s</xliff:g> utilizado(s) no <xliff:g id="VOLUME">%2$s</xliff:g>"</string>
     <string name="device_apps_app_management_clear_data" msgid="7305471678286735600">"Limpar dados"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="170972356946852847">"Todos os dados desta aplicação serão eliminados permanentemente.\nIsto inclui todos os ficheiros, as definições, as contas, as bases de dados, etc."</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Confirme para impedir que o ecrã se desligue enquanto estiver a ver algo, o que pode aumentar a utilização de energia."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Quando está inativo"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Quando está a ver"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Desative automaticamente"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Desative automaticamente quando está inativo"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Desative automaticamente quando está a ver"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Desligar automaticamente a TV"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Desligar automaticamente a TV quando estiver inativo"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Desligar automaticamente a TV quando estiver a ver"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"O temporizador de \"Quando está inativo\" deve ser inferior ao temporizador de \"Quando está a ver\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"O temporizador de \"Quando está a ver\" deve ser superior ao temporizador de \"Quando está inativo\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Limitar lig. de rede no modo de espera"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Comportamento ao ligar"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Reposição"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Código de sincronização da Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Modos de energia"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Melhore a eficiência energética quando a TV não está em utilização"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Ativa:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Tenha em atenção que este modo pode aumentar o consumo de energia do dispositivo."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Ativa \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/Settings/res/values-pt/energy-modes.xml b/Settings/res/values-pt/energy-modes.xml
deleted file mode 100644
index f526219a9..000000000
--- a/Settings/res/values-pt/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Recursos de rede essenciais"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Baixo uso de energia"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Desative a conexão de rede quando a TV não estiver em uso."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Atualizações e funções importantes"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Recursos de rede recomendados"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Uso otimizado de energia"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Habilita recursos que ativam a TV na rede (standby em rede)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Outros recursos de rede"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Maior uso de energia"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Além dos recursos recomendados, essa opção ativa outros recursos quando a TV não está em uso, o que pode aumentar o uso de energia."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-pt/strings.xml b/Settings/res/values-pt/strings.xml
index f20257e90..f7c77fd35 100644
--- a/Settings/res/values-pt/strings.xml
+++ b/Settings/res/values-pt/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Backup e restauração"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Redefinição para configuração original"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Calibração"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Timer de desligamento"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Defina um timer para desligar a TV e economizar energia"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Energia"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Configurações do modo Eco"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Dispositivos"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Selecionar formatos"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Configurações de som avançadas"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Permitir modo jogo"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Usar o mesmo alcance dinâmico do conteúdo"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Ao ativar essa opção, o sistema vai alternar entre diferentes formatos de alcance dinâmico para usar o mesmo do conteúdo. Isso pode causar uma tela preta durante a troca de formato.\n\nClique em \"Configurações avançadas de tela\" para mais opções de alcance dinâmico."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Alcance dinâmico principal"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Conversão preferencial do sistema"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Deixar que o sistema gerencie a conversão de formato"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Quando essa opção for selecionada, o sistema vai determinar um alcance dinâmico adequado para a tela e converter o conteúdo a esse alcance conforme necessário."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Sempre corresponder ao formato do conteúdo"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Forçar a conversão"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Força a conversão para formato preferencial"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Forçar a conversão para um formato preferencial. Isso pode afetar outras configurações no modo de exibição ou no formato HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Sempre para SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Sempre para <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Quer forçar a saída HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Por padrão, a conversão será forçada para <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"A tela vai funcionar com uma resolução de 1080p e 60 Hz. Essa opção não é compatível com a resolução de 4K e 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"A resolução atual não tem suporte para o Dolby Vision. Se você ativar o Dolby Vision manualmente, a resolução da tela vai mudar para 1080p a 60Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Mudar resolução para 1080p a 60Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Sempre forçar a conversão para Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Se o Dolby Vision estiver desativado nos formatos HDR nas configurações avançadas de exibição, forçar a conversão para Dolby Vision vai reativá-lo."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Sempre forçar a conversão para HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Se o HDR10 estiver desativado nos formatos HDR nas configurações avançadas de exibição, forçar a conversão para HDR10 vai reativá-lo."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Sempre forçar a conversão para HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Se o HLG estiver desativado nos formatos HDR nas configurações avançadas de exibição, forçar a conversão para HLG vai reativá-lo."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Sempre forçar a conversão para HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Se o HDR10+ estiver desativado nos formatos HDR nas configurações avançadas de exibição, forçar a conversão para HDR10+ vai reativá-lo."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Sempre forçar a conversão para SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Forçar a conversão para SDR desativa todos os formatos nos formatos HDR nas configurações avançadas de exibição."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Ajuste de frame rate do conteúdo"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Apenas frame rate contínuo"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Uniforme"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Se o app solicitar, o dispositivo usará um frame rate igual ao original do conteúdo que você está assistindo, mas APENAS se a TV puder fazer uma transição uniforme."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"A tela conectada não oferece suporte a transições uniformes entre as taxas de atualização. Essa opção só terá efeito se você conectar uma tela com suporte."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Sempre"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Não uniforme"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Se o app solicitar, o dispositivo usará um frame rate igual ao original do conteúdo que você está assistindo. Isso pode fazer com que a tela fique em branco por um segundo ao sair ou entrar em uma reprodução de vídeo."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Nunca"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Mesmo se o app solicitar, o dispositivo nunca tentará usar um frame rate igual ao original do conteúdo que você está assistindo."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Quer mudar a resolução para %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Selecione \"Ok\" para usar a resolução %1$s de agora em diante."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Não há suporte a Dolby Vision no modo %1$s, e ele vai ser desativado em \"Configurações avançadas de tela\""</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Esse modo está disponível para: %1$s\nEm algumas TVs, talvez você tenha que ativar a opção \"HDMI avançado\" para permitir mais formatos HDR. Verifique as configurações da TV para conferir se esse opção está disponível."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Este modo oferece suporte a %1$s. Em algumas TVs, talvez você tenha que ativar a opção \"HDMI avançado\" para permitir mais formatos HDR. Verifique as configurações da TV para conferir se esse opção está disponível."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Cancelar"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Limpar os dados em cache?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Esta ação limpa dados em cache de todos os apps."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Este dispositivo é gerenciado pela sua organização."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Este dispositivo é gerenciado por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Saiba mais"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{App de câmera}one{App de câmera}other{Apps de câmera}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"App Calendário"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Confirme para evitar que a tela desligue enquanto você estiver assistindo. A tela ligada aumenta o uso de energia."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Durante a inatividade"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Durante a reprodução de mídia"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Desligar automaticamente"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Desligar automaticamente durante a inatividade"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Desligar automaticamente enquanto assiste"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Desligar a TV automaticamente"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Desligar a TV automaticamente quando estiver em inatividade"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Desligar a TV automaticamente enquanto estiver assistindo"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"O timer \"Durante a inatividade\" precisa durar menos que o timer \"Durante a reprodução de mídia\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"O timer \"Durante a reprodução de mídia\" precisa durar mais que o timer \"Durante a inatividade\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Limitar conexão de rede no modo de espera"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Comportamento ao ligar"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Reiniciar"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Código de pareamento Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Modos de energia"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Melhore o consumo de energia quando a TV não está em uso"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Ativa:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Esse modo pode aumentar o consumo de energia do dispositivo."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Ativar \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/Settings/res/values-ro/energy-modes.xml b/Settings/res/values-ro/energy-modes.xml
deleted file mode 100644
index 859aba4e5..000000000
--- a/Settings/res/values-ro/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Funcții esențiale pentru rețea"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Consum de energie redus"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Dezactivează conexiunea la rețea când televizorul nu este folosit."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Actualizări și funcții esențiale"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Funcții de rețea recomandate"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Consum de energie optimizat"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Pornește funcții care activează televizorul prin rețea (standby în rețea)"</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Inserează funcția 1]"</item>
-    <item msgid="8724721267222341891">"[Inserează funcția 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Funcții suplimentare pentru rețea"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Consum de energie crescut"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Pe lângă funcțiile recomandate, opțiunea activează funcții suplimentare când televizorul nu este folosit, care pot mări consumul de energie"</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Inserează funcția 1]"</item>
-    <item msgid="170760143032597722">"[Inserează funcția 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-ro/strings.xml b/Settings/res/values-ro/strings.xml
index c691ba9c7..98e90f6ff 100644
--- a/Settings/res/values-ro/strings.xml
+++ b/Settings/res/values-ro/strings.xml
@@ -100,7 +100,7 @@
     <string name="all_apps_installed" msgid="8217778476185598971">"Aplicații instalate"</string>
     <string name="all_apps_other" msgid="4420174882983813158">"Aplicații de sistem"</string>
     <string name="all_apps_disabled" msgid="2776041242863791053">"Aplicații dezactivate"</string>
-    <string name="device_daydream" msgid="2631191946958113220">"Screensaver"</string>
+    <string name="device_daydream" msgid="2631191946958113220">"Economizor de ecran"</string>
     <string name="device_display" msgid="244634591698925025">"Afișaj"</string>
     <string name="device_display_sound" msgid="7399153506435649193">"Afișare și sunet"</string>
     <string name="device_sound" msgid="8616320533559404963">"Sunet"</string>
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Creează și restabilește copii de rezervă"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Revenire la setările din fabrică"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Calibrare"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Oprește temporizatorul"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Setează temporizatoare pentru a închide televizorul și a economisi energie"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Alimentare și energie"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Setări Eco"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Dispozitive"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Selectează formatele"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Setări de sunet avansate"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Permite modul de joc"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Intervalul dinamic al conținutului recomandat"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Când activezi opțiunea, sistemul va comuta între diferite formate de intervale dinamice, în funcție de conținut Acest lucru poate provoca un ecran negru la comutarea formatului.\n\nDă clic pe Setări de afișare avansate pentru mai multe opțiuni de interval dinamic."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Intervalul dinamic preferat"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Conversie preferată de sistem"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Permite ca sistemul să gestioneze conversia formatului"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Când se selectează opțiunea, sistemul va stabili un interval dinamic potrivit de trimis spre ecran și va converti conținutul în acest interval dinamic după caz."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Corespunde întotdeauna cu formatul conținutului"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Forțează conversia"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Forțează conversia în formatul preferat"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Forțează conversia într-un format preferat. Forțarea conversiei poate afecta alte setări în Modul Display sau în format HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Întotdeauna în SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Întotdeauna în <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Forțezi ieșirea HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"În mod prestabilit, conversia va fi forțată să <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Ecranul va folosi rezoluția de 1080p 60 Hz. Opțiunea nu este compatibilă cu ecranul când rulează la rezoluție 4k 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision nu este acceptat la rezoluția actuală. Dacă activezi manual Dolby Vision, rezoluția ecranului se va schimba la 1080p 60 Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Schimbi rezoluția la 1080p 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Forțează întotdeauna conversia la Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Dacă Dolby Vision este dezactivat în Formatele HDR din Setările de afișare avansate, forțarea conversiei la Dolby Vision îl va reactiva."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Forțează întotdeauna conversia la HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Dacă HDR10 este dezactivat în Formatele HDR din Setările de afișare avansate, forțarea conversiei la HDR10 îl va reactiva."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Forțează întotdeauna conversia la HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Dacă HLG este dezactivat în Formatele HDR din Setările de afișare avansate, forțarea conversiei la HLG îl va reactiva."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Forțează întotdeauna conversia la HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Dacă HDR10+ este dezactivat în Formatele HDR din Setările de afișare avansate, forțarea conversiei la HDR10+ îl va reactiva."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Forțează întotdeauna conversia la SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Forțarea conversiei la SDR va dezactiva toate formatele din Formate HDR din Setări de afișare avansate."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Potrivește cu rata de cadre a conținutului"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Exclusiv fără întreruperi"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Perfectă"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Dacă aplicația solicită acest lucru, dispozitivul își va potrivi ieșirea cu rata de cadre inițială a conținutului pe care îl vizionezi NUMAI dacă televizorul poate face o tranziție perfectă."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Ecranul conectat nu acceptă tranzițiile fluide privind rata de actualizare. Opțiunea nu va avea niciun efect dacă nu treci la un ecran care o acceptă."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Întotdeauna"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Imperfectă"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Dacă aplicația solicită acest lucru, dispozitivul își va potrivi ieșirea cu rata de cadre inițială a conținutului pe care îl vizionezi. Aceasta poate face ca ecranul să se golească timp de o secundă când se termină sau începe redarea unui clip."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Niciodată"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Chiar dacă aplicația solicită acest lucru, dispozitivul nu va încerca niciodată să își potrivească ieșirea cu rata de cadre inițială a conținutului pe care îl vizionezi."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Schimbi rezoluția la %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Selectează OK pentru a folosi %1$s de acum înainte"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision nu este acceptat la %1$s și va fi dezactivat în Setări de afișare avansate"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Acest mod acceptă: %1$s\nPe unele televizoare poate fi nevoie să activezi HDMI îmbunătățit ca să accepte mai multe formate HDR. Verifică setările televizorului ca să vezi dacă opțiunea este acceptată."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Acest mod acceptă %1$s. Pe unele televizoare poate fi nevoie să activezi HDMI îmbunătățit ca să accepte mai multe formate HDR. Verifică setările televizorului ca să vezi dacă opțiunea este acceptată."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Anulează"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Ștergi datele memorate în cache?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Datele din cache ale aplicațiilor vor fi șterse."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Acest dispozitiv este gestionat de organizația ta."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Acest dispozitiv este gestionat de <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" U+2060"</string>
     <string name="learn_more" msgid="820336467414665686">"Află mai multe"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplicația Cameră foto}few{Aplicațiile Cameră foto}other{Aplicațiile Cameră foto}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplicația Calendar"</string>
@@ -946,7 +920,7 @@
     <string name="settings_on" msgid="7734010120323404333">"Activat"</string>
     <string name="settings_off" msgid="4060451657850476369">"Dezactivat"</string>
     <string name="device_daydreams_none" msgid="3405655350757277348">"Dezactivează ecranul"</string>
-    <string name="device_daydreams_select" msgid="7203264446482623438">"Screensaver"</string>
+    <string name="device_daydreams_select" msgid="7203264446482623438">"Economizor de ecran"</string>
     <string name="device_daydreams_test" msgid="7828275397550076567">"Începe acum"</string>
     <string name="device_daydreams_sleep" msgid="6847770718407377357">"Când pornește"</string>
     <string name="device_daydreams_sleep_description" msgid="6237610484915504587">"Economizorul de ecran începe după această perioadă de inactivitate. Dacă nu este selectat niciun economizor de ecran, ecranul se va dezactiva."</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Confirmă pentru a împiedica închiderea ecranului în timpul vizionării. Această acțiune are potențial de utilizare sporită a energiei."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Când dispozitivul este inactiv"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Când vizionezi"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Dezactivează automat"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Dezactivează automat când este inactiv"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Dezactivează automat când urmărești"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Oprește automat televizorul"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Oprește automat televizorul când este inactiv"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Oprește automat televizorul când vizionezi"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Temporizatorul Când dispozitivul este inactiv trebuie să aibă o valoare mai mică decât temporizatorul Când vizionezi"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Temporizatorul Când vizionezi trebuie să aibă o valoare mai mare decât temporizatorul Când dispozitivul este inactiv"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Limitează conexiunea la rețea în standby"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Comportament la pornire"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Resetează"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Codul de conectare prin Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Moduri de energie"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Îmbunătățește eficiența energetică atunci când televizorul nu este folosit"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Activează:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Reține că acest mod poate mări consumul de energie al dispozitivului."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Activează <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
 </resources>
diff --git a/Settings/res/values-ru/energy-modes.xml b/Settings/res/values-ru/energy-modes.xml
deleted file mode 100644
index 656cc5578..000000000
--- a/Settings/res/values-ru/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Основные сетевые функции"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Низкое энергопотребление"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Когда телевизор не используется, режим приостанавливает сетевое подключение."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Важные обновления и функции"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Рекомендуемые сетевые функции"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Оптимизированное энергопотребление"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Режим включит функции, которые по сети выводят телевизор из режима ожидания."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Дополнительные сетевые функции"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Повышенное энергопотребление"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Когда телевизор не используется, режим включает не только рекомендуемые, но и дополнительные функции, которые могут увеличить потребление электроэнергии."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-ru/strings.xml b/Settings/res/values-ru/strings.xml
index 544018ca8..ba6466513 100644
--- a/Settings/res/values-ru/strings.xml
+++ b/Settings/res/values-ru/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Резервное копирование и восстановление"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Сброс настроек"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Калибровка"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Таймер отключения устройства"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Отключайте телевизор с помощью таймера, чтобы экономить энергию"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Питание и энергопотребление"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Настройки экономичного режима"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Устройства"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Выбор форматов"</string>
@@ -151,39 +151,12 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Расширенные настройки звука"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Разрешить игровой режим"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Приводить в соответствие с динамическим диапазоном контента"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Если включить этот параметр, устройство будет переключаться на формат динамического диапазона, который используется в контенте. Во время смены формата экран может погаснуть.\n\nДополнительные параметры динамического диапазона находятся в разделе \"Расширенные настройки экрана\"."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Предпочтительный динамический диапазон"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Автоматическая настройка формата"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Формат автоматически выбирается системой"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Если включить этот параметр, то при необходимости система будет определять динамический диапазон, подходящий для вашего экрана, и выводить контент в этом диапазоне."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Выбор формата по параметрам контента"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Принудительное изменение формата"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Принудительно устанавливается предпочтительный формат"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Принудительно устанавливается предпочтительный формат. Это может повлиять на другие настройки в режиме отображения или при использовании формата HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Всегда в формате SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Всегда в формате <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Выводить контент принудительно в формате HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Формат контента будет принудительно меняться на <xliff:g id="HDR_TYPE">%s</xliff:g> по умолчанию."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Разрешение вашего экрана составит 1080 пкс, а частота обновления – 60 Гц. Эта функция не поддерживается на устройствах с разрешением 4K и частотой обновления 60 ГЦ."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision не поддерживается для текущего разрешения. Если включить Dolby Vision вручную, разрешение экрана изменится на 1080p (60 Гц)."</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Изменить разрешение на 1080p (60 Гц)?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Принудительно конвертировать в формат Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Если формат Dolby Vision был выключен в расширенных настройках экрана, принудительная конвертация повторно активирует его"</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Принудительно конвертировать в формат HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Если формат HDR10 был выключен в расширенных настройках экрана, принудительная конвертация повторно активирует его"</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Принудительно конвертировать в формат HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Если формат HLG был выключен в расширенных настройках экрана, принудительная конвертация повторно активирует его"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Принудительно конвертировать в формат HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Если формат HDR10+ был выключен в расширенных настройках экрана, принудительная конвертация повторно активирует его"</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Принудительно конвертировать в формат SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Принудительная конвертация в SDR отключает все форматы HDR в расширенных настройках экрана"</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Использовать частоту кадров контента"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Только с плавным переходом"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Согласовывать частоту кадров"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Устройство переключит формат вывода изображения в соответствии с исходной частотой кадров воспроизводимого видео, если поступит соответствующий запрос от приложения, но ТОЛЬКО при условии, что телевизор может осуществить плавный переход."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Подключенный экран не поддерживает плавные переходы частоты обновления. Чтобы этот параметр работал, замените экран на совместимый."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Всегда"</string>
-    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Если поступит запрос от приложения, устройство установит для экрана частоту обновления, соответствующую исходной частоте кадров в контенте, который вы смотрите. Из-за этого в начале и в конце воспроизведения видео экран может на секунду погаснуть."</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Не согласовывать частоту кадров"</string>
+    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Устройство переключит формат вывода изображения в соответствии с исходной частотой кадров видео, если поступит соответствующий запрос от приложения. При этом в начале воспроизведения видео или после его просмотра экран может ненадолго погаснуть."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Никогда"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Устройство не будет переключать формат вывода изображения в соответствии с исходной частотой кадров воспроизводимого видео, даже если поступит соответствующий запрос от приложения."</string>
     <string name="font_scale_settings_title" msgid="4114019544800225980">"Масштабирование текста"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Изменить разрешение на %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Нажмите ОК, чтобы использовать разрешение %1$s."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Формат Dolby Vision не поддерживается в режиме %1$s и будет отключен в расширенных настройках экрана."</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Этот режим поддерживает: %1$s\nЧтобы поддерживалось больше форматов HDR, на некоторых телевизорах нужно включить расширенный формат HDMI. Проверьте наличие этой функции в настройках телевизора."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Этот режим поддерживает %1$s. На некоторых телевизорах нужно включить расширенный формат HDMI, чтобы поддерживалось больше форматов HDR. Проверьте наличие этой функции в настройках телевизора."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Отмена"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ОК"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Гц"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Гц)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Гц)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Очистить кеш?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Будут удалены данные всех приложений."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Этим устройством управляет ваша организация."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Этим устройством управляет <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Подробнее"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Приложение камеры}one{Приложения камеры}few{Приложения камеры}many{Приложения камеры}other{Приложения камеры}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Календарь"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Подтвердите изменение, чтобы предотвратить отключение экрана во время просмотра. Возможно, это повлечет увеличение расхода энергии."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"При бездействии"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"При просмотре"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Автоматическое отключение"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Автоматическое отключение, если отсутствуют действия"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Автоматическое отключение при просмотре"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Автоматическое отключение телевизора"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Автоматическое отключение телевизора, если отсутствуют действия"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Автоматическое отключение телевизора при просмотре"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"У таймера \"При бездействии\" значение должно быть меньше, чем у таймера \"При просмотре\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"У таймера \"При просмотре\" значение должно быть больше, чем у таймера \"При бездействии\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Ограничение сети в режиме ожидания"</string>
@@ -1042,7 +1016,7 @@
     <string name="picture_in_picture_app_detail_switch" msgid="3688997906817583854">"Картинка в картинке"</string>
     <string name="picture_in_picture_empty_text" msgid="4370198922852736600">"Установленные приложения не поддерживают режим \"Картинка в картинке\"."</string>
     <string name="picture_in_picture_app_detail_summary" msgid="3296649114939705896">"Когда приложение открыто или когда вы выходите из него, оно может создавать окно \"Картинка в картинке\". Так вы можете, например, продолжить просмотр видео. Это окно отображается поверх остальных приложений."</string>
-    <string name="alarms_and_reminders_description" msgid="4063972350154624500">"Вы можете разрешить приложениям устанавливать будильники и планировать запуск действий в определенное время. В этом случае они будут работать в фоновом режиме и быстрее расходовать заряд батареи.\n\nЕсли отключить это разрешение, текущие будильники и созданные приложениями события перестанут запускаться."</string>
+    <string name="alarms_and_reminders_description" msgid="4063972350154624500">"Если вы разрешите приложениям устанавливать будильники и планировать на определенное время действия, то эти приложения будут работать в фоновом режиме. В таком случае заряд батареи может расходоваться быстрее.\n\nЕсли отключить эту настройку, текущие будильники и созданные приложением мероприятия перестанут запускаться."</string>
     <string name="turn_screen_on_title" msgid="5293798529284629011">"Включение экрана"</string>
     <string name="allow_turn_screen_on" msgid="4903401106871656521">"Разрешить приложению включать экран"</string>
     <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Приложение сможет в любое время включать экран без явного согласия с вашей стороны"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Состояние при включении"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Сброс"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Код подключения к Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Режимы энергопотребления"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Когда телевизор не используется, он будет эффективнее потреблять электроэнергию."</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Функции, которые будут включены:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Обратите внимание, что этот режим может увеличить энергопотребление устройства."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Включить режим \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\"?"</string>
 </resources>
diff --git a/Settings/res/values-si/energy-modes.xml b/Settings/res/values-si/energy-modes.xml
deleted file mode 100644
index 43977cb91..000000000
--- a/Settings/res/values-si/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"අත්‍යවශ්‍යාංග ජාල විශේෂාංග"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"අඩු බලශක්ති භාවිතය"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"රූපවාහිනිය භාවිතයේ නොමැති විට ජාල සබැඳුම ක්‍රියා විරහිත කරන්න."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"තීරණාත්මක යාවත්කාලීන සහ කාර්යයන්"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"නිර්දේශිත ජාල විශේෂාංග"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ප්‍රශස්ත බලශක්ති භාවිතය"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ජාලය හරහා රූපවාහිනිය අවදි කරන විශේෂාංග ක්‍රියාත්මක කරයි (ජාලගත පොරොත්තුවෙන්)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[විශේෂාංගය 1 ඇතුළත් කරන්න]"</item>
-    <item msgid="8724721267222341891">"[විශේෂාංගය 2 ඇතුළත් කරන්න]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"අතිරේක ජාල විශේෂාංග"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"වැඩි වූ බලශක්ති පරිභෝජනය"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"නිර්දේශිත විශේෂාංගවලට අමතරව, මෙම විකල්පය රූපවාහිනිය භාවිතයේ නොමැති විට බලශක්ති භාවිතය වැඩි කළ හැකි අතිරේක විශේෂාංග ක්‍රියාත්මක කරයි."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[විශේෂාංගය 1 ඇතුළත් කරන්න]"</item>
-    <item msgid="170760143032597722">"[විශේෂාංගය 2 ඇතුළත් කරන්න]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-si/strings.xml b/Settings/res/values-si/strings.xml
index d621d731f..5ca41f925 100644
--- a/Settings/res/values-si/strings.xml
+++ b/Settings/res/values-si/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"උපස්ථය සහ ප්‍රතිසාධනය"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"කර්මාන්ත ශාලා දත්ත යළි සැකසීම"</string>
     <string name="device_calibration" msgid="2907914144048739705">"ක්‍රමාංකණය"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"වසා දැමීමේ ටයිමරය"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"රූපවාහිනිය ක්‍රියා විරහිත කිරීමට සහ ශක්තිය ඉතිරි කිරීමට ටයිමර සකසන්න"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"බලය සහ බලශක්තිය"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"පරිසර සැකසීම්"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"උපාංග"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"ආකෘති තෝරන්න"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"උසස් ශබ්ද සැකසීම්"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"ක්‍රීඩා ප්‍රකාරයට ඉඩ දෙන්න"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"අන්තර්ගත ගතික පරාසය ගළපන්න"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"මෙම විකල්පය සබල කරන විට, පද්ධතිය අන්තර්ගතයට ගැළපෙන පරිදි විවිධ ගතික පරාස ආකෘති අතර මාරු වනු ඇත. මෙය ආකෘති මාරු කිරීම අතරතුර කළු තිරයක් ඇති කිරීමට හැක.\n\nතවත් ගතික පරාස විකල්ප සඳහා උසස් සංදර්ශක සැකසීම් ක්ලික් කරන්න."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"කැමති ගතික පරාසය"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"පද්ධතියට කැමති පරිවර්තනය"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"පද්ධතියට ආකෘති පරිවර්තනය කළමනාකරණයට ඉඩ දෙයි"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"මෙම විකල්පය තෝරා ඇති විට, පද්ධතිය ඔබේ සංදර්ශකය වෙත යැවීමට සුදුසු ගතික පරාසයක් තීරණය කර අවශ්‍ය පරිදි අන්තර්ගතය මෙම ගතික පරාසයට පරිවර්තනය කරනු ඇත."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"සෑම විටම අන්තර්ගතයේ ආකෘතියට ගැළපෙයි"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"බලෙන් පරිවර්තනය"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"කැමති ආකෘතියට පරිවර්තනය කිරීමට බල කරයි"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"කැමති ආකෘතියකට බලෙන් පරිවර්තනය කරන්න. බලනේ පරිවර්තනය කිරීම සංදර්ශක ප්‍රකාරයේ හෝ HDR ආකෘතියේ වෙනත් සැකසීම්වලට බලපෑ හැක."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"සෑම විටම SDR වෙත"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"සෑම විටම <xliff:g id="HDR_TYPE">%s</xliff:g> වෙත"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"ඔබට HDR ප්‍රතිදානය බල කිරීමට අවශ්‍ය ද?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"පෙරනිමියෙන් පරිවර්තනය <xliff:g id="HDR_TYPE">%s</xliff:g> වෙතට බල කෙරෙනු ඇත."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"ඔබේ සංදර්ශකය 1080p 60Hz විභේදනයකින් ධාවනය වනු ඇත. 4k 60Hz විභේදනයෙන් ධාවනය වන විට මෙම විකල්පය ඔබේ සංදර්ශකය සමග නොගැළපෙයි."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision වත්මන් විභේදනයේ දී සහාය නොදක්වයි. ඔබ Dolby Vision හස්තීයව සබල කරන්නේ නම්, ඔබේ සංදර්ශකයෙහි විභේදනය 1080p 60Hz ලෙස වෙනස් වනු ඇත."</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"විභේදනය 1080p 60Hz වෙත වෙනස් කරන්න ද?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"සෑම විටම Dolby Vision වෙත පරිවර්තනයට බල කරන්න"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"උසස් සංදර්ශක සැකසීම් තුළ HDR ආකෘතිවලින් Dolby Vision අබල කර ඇත්නම්, Dolby Vision වෙත බලෙන් පරිවර්තනය කිරීම එය යළි සබල කරනු ඇත."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"සෑම විටම HDR10 වෙත පරිවර්තනයට බල කරන්න"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"උසස් සංදර්ශක සැකසීම් තුළ HDR ආකෘතිවල HDR10 අබල කර ඇත්නම්, HDR10 වෙත බලෙන් පරිවර්තනය කිරීම එය යළි සබල කරනු ඇත."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"සෑම විටම HLG වෙත පරිවර්තනයට බල කරන්න"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"උසස් සංදර්ශක සැකසීම් තුළ HDR ආකෘතිවල HLG අබල කර ඇත්නම්, HLG වෙත බලෙන් පරිවර්තනය කිරීම එය යළි සබල කරනු ඇත."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"සෑම විටම HDR10+ වෙත පරිවර්තනයට බල කරන්න"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"උසස් සංදර්ශක සැකසීම් තුළ HDR ආකෘතිවල HDR10+ අබල කර ඇත්නම්, HDR10+ වෙත බලෙන් පරිවර්තනය කිරීම එය යළි සබල කරනු ඇත."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"සෑම විටම SDR වෙත පරිවර්තනයට බල කරන්න"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"SDR වෙත බලෙන් පරිවර්තනය කිරීම උසස් සංදර්ශක සැකසීම් තුළ HDR ආකෘතිවල සියලු ආකෘති අබල කරනු ඇත."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"අන්තර්ගත රාමු අනුපාතය ගළපන්න"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"බාධාවකින් තොරව පමණි"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"සුමට"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"යෙදුම එය ඉල්ලුවහොත්, ඔබගේ උපාංගය එහි ප්‍රතිදානය ඔබ නරඹන අන්තර්ගතයේ මුල් රාමු අනුපාතයට, ඔබගේ TV හට සුමට සංක්‍රමනයක් සිදු කළ හැකි නම් පමණක් ගළපනු ඇත."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"ඔබේ සම්බන්ධිත සංදර්ශකය බාධාවකින් තොරව නැවුම් කිරීමේ අනුපාත සංක්‍රාන්ති වෙත සහාය නොදක්වයි. ඔබ එයට සහාය දක්වන සංදර්ශකයකට වෙනස් වන්නේ නම් මිස මෙම විකල්පය කිසිදු බලපෑමක් ඇති නොකරනු ඇත."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"සැම විට"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"සුමට නොවන"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"යෙදුම එය ඉල්ලුවහොත්, ඔබගේ උපාංගය එහි ප්‍රතිදානය ඔබ නරඹන අන්තර්ගතයේ මුල් රාමු අනුපාතයට ගළපනු ඇත. වීඩියෝ පසුධාවනයකින් පිටවන විට හෝ ඇතුළු වන විට තත්පරයකට ඔබගේ තිරය හිස් වීමට මෙය හේතු විය හැකිය."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"කවදාවත් නෑ"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"යෙදුම එය ඉල්ලුවහොත් පවා, ඔබගේ උපාංගය කිසි විටක එහි ප්‍රතිදානය ඔබ නරඹන අන්තර්ගතයේ මුල් රාමු අනුපාතයට ගැළපීමට උත්සාහ නොකරනු ඇත."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"විභේදනය %1$s ලෙස මාරු කරන්නද?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"දැන් සිට %1$s භාවිත කිරීමට හරි තෝරන්න."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s තුළ Dolby Vision හට සහය නොදැක්වේ, එය \"උසස් සංදර්ශන සැකසීම්\" තුළ අබල කරනු ලැබේ"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"මෙම ප්‍රකාරය සහාය දක්වයි: %1$s\nසමහර රූපවාහිනීවල, තවත් HDR ආකෘති සබල කිරීමට ඔබට ඉහළ නැංවූ HDMI ක්‍රියාත්මක කිරීමට අවශ්‍ය වේවි. මෙයට සහාය දැක්වෙන්නේ ද යන්න බැලීමට ඔබේ රූපවාහිනී සැකසීම් පරීක්ෂා කරන්න."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"මෙම ප්‍රකාරය %1$s හට සහය දක්වයි. සමහර රූපවාහිනිවල, තවත් HDR ආකෘති සබල කිරීමට ඔබට වැඩිදියුණු කළ HDMI සක්‍රීය කිරීමට අවශ්‍ය වේවි. මෙයට සහය දැක්වෙන්නේද යන්න බැලීමට ඔබේ රූපවාහිනී සැකසීම් පරීක්‍ෂා කරන්න."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"අවලංගු කරන්න"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"හරි"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"හැඹිලිගත කළ දත්ත හිස් කරන්න ද?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"මෙය සියලුම යෙදුම් සඳහා හැඹිලිගත කළ දත්ත හිස් කරනු ඇත."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"මෙම උපාංගය ඔබගේ සංවිධානය විසින් කළමනාකරණය කරනු ලැබේ."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"මෙම උපාංගය <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> මගින් කළමනාකරණය කෙරේ"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"තව දැන ගන්න"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{කැමරා යෙදුම}one{කැමරා යෙදුම්}other{කැමරා යෙදුම්}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"දින දර්ශන යෙදුම"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"බලශක්ති භාවිතය වැඩි කිරීමට හැකියාව ඇති, බලමින් සිටින අතරේ සංදර්ශකය ක්‍රියාවිරහිත වීම වැළැක්වීමට තහවුරු කරන්න."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"අක්‍රිය විට"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"නරඹන විට"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"ස්වයංක්‍රීයව ක්‍රියාවිරහිත කරන්න"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"අක්‍රිය විට ස්වයංක්‍රීයව ක්‍රියාවිරහිත කරන්න"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"නරඹන විට ස්වයංක්‍රීයව ක්‍රියාවිරහිත කරන්න"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"රූපවාහිනිය ස්වයංක්‍රීයව ක්‍රියාවිරහිත කරන්න"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"අක්‍රිය විට රූපවාහිනිය ස්වයංක්‍රීයව ක්‍රියාවිරහිත කරන්න"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"රූපවාහිනිය නරඹන විට ස්වයංක්‍රීයව ක්‍රියා විරහිත කරන්න"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"අක්‍රිය විට\" ටයිමරය \"නරඹන විට\" ටයිමරයට වඩා කෙටි විය යුතු වේ"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"නරඹන විට\" ටයිමරය \"අක්‍රිය විට\" ටයිමරයට වඩා දිගු විය යුතු වේ"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"පොරොත්තුවෙන් ජාල සබැඳුම සීමා කරන්න"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"බලය ක්‍රියාත්මක කිරීමේ චර්යාව"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"යළි සකසන්න"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"ඊතර්නෙට් යුගලන කේතය"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"බලශක්ති ප්‍රකාර"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"රූපවාහිනිය භාවිතයේ නොමැති විට බලශක්ති කාර්යක්ෂමතාව වැඩි දියුණු කරන්න"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"සබල කරයි:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"මෙම ප්‍රකාරය උපාංගයෙහි බලශක්ති පරිභෝජනය වැඩි කළ හැකි බව සලකන්න."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" සබල කරන්න"</string>
 </resources>
diff --git a/Settings/res/values-sk/energy-modes.xml b/Settings/res/values-sk/energy-modes.xml
deleted file mode 100644
index 9dfc67c4e..000000000
--- a/Settings/res/values-sk/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Základné funkcie siete"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Nízka spotreba energie"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Vypnite pripojenie k sieti, keď sa televízor nepoužíva."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Dôležité aktualizácie a funkcie"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Odporúčané funkcie siete"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimalizovaná spotreba energie"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Cez sieť zapne funkcie, ktoré televízor prebudia (pohotovostný režim siete)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Ďalšie funkcie siete"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Zvýšená spotreba energie"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Okrem odporúčaných funkcií zapne toto nastavenie aj ďalšie funkcie, keď sa televízor nebude používať, čím sa môže zvýšiť spotreba energie."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-sk/strings.xml b/Settings/res/values-sk/strings.xml
index 56316eb1f..d1c8332b1 100644
--- a/Settings/res/values-sk/strings.xml
+++ b/Settings/res/values-sk/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Zálohovanie a obnovenie"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Obnovenie výrobných nastavení"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibrácia"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Časovač vypnutia"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Nastavte časovače, ktoré vypnú televízor a ušetria energiu"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Výkon a energia"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Nastavenia ekorežimu"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Zariadenia"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Vybrať formáty"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Rozšírené nastavenia zvuku"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Povolenie herného režimu"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Dynamický rozsah relevantného obsahu"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Keď je táto možnosť zapnutá, systém prepína medzi rôznymi formátmi dynamického rozsahu, aby zodpovedal obsahu. Počas prepínania formátu sa môže obrazovka stmaviť.\n\nAk si chcete zobraziť ďalšie možnosti dynamického rozsahu, kliknite na rozšírené nastavenia zobrazenia."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Preferovaný dynamický rozsah"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Konverzia určovaná systémom"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Povoľte systému spravovať konverziu formátu"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Keď je vybraná táto možnosť, systém bude určovať vhodný dynamický rozsah obrazovky a podľa potreby doň konvertovať obsah."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Vždy bude zodpovedať formátu obsahu"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Vynucovať konverziu"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Vynúti konverziu do preferovaného formátu"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Vynúťte konverziu do preferovaného formátu. Vynucovanie konverzie môže ovplyvniť iné nastavenia režimu zobrazenia alebo formátu HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Vždy do formátu SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Vždy do formátu <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Chcete vynútiť výstup HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Videá budú predvolene vynútene konvertované do formátu <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Rozlíšenie obrazovky bude 1080p, 60 Hz. Táto možnosť nie je kompatibilná s obrazovkou pri rozlíšení 4K, 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Aktuálne rozlíšenie technológiu Dolby Vision nepodporuje. Ak Dolby Vision zapnete ručne, rozlíšenie obrazovky sa zmení na 1080p 60 Hz."</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Chcete zmeniť rozlíšenie na 1080p 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Vždy vynucovať konverziu do formátu Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Ak je možnosť Dolby Vision v sekcii Formáty HDR v rozšírených nastaveniach zobrazenia zakázaná, vynucovanie konverzie do formátu Dolby Vision ju znova povolí."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Vždy vynucovať konverziu do formátu HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Ak je možnosť HDR10 v sekcii Formáty HDR v rozšírených nastaveniach zobrazenia zakázaná, vynucovanie konverzie do formátu HDR10 ju znova povolí."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Vždy vynucovať konverziu do formátu HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Ak je možnosť HLG v sekcii Formáty HDR v rozšírených nastaveniach zobrazenia zakázaná, vynucovanie konverzie do formátu HLG ju znova povolí."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Vždy vynucovať konverziu do formátu HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Ak je možnosť HDR10+ v sekcii Formáty HDR v rozšírených nastaveniach zobrazenia zakázaná, vynucovanie konverzie do formátu HDR10+ ju znova povolí."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Vždy vynucovať konverziu do formátu SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Vynucovanie konverzie do formátu SDR zakáže všetky formáty v sekcii Formáty HDR v rozšírených nastaveniach zobrazenia."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Prispôsobiť snímkovej frekvencii obsahu"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Iba plynulý"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Plynulé"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Ak o to aplikácia požiada, vaše zariadenie prispôsobí výstup pôvodnej snímkovej frekvencii obsahu, ktorý pozeráte, ale IBA vtedy, keď váš televízor dokáže zaistiť plynulý prechod."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Vaša pripojená obrazovka nepodporuje plynulé prechody frekvencie obnovenia. Táto možnosť nebude mať žiadny vplyv, kým nepripojíte obrazovku, ktorá ju podporuje."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Vždy"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Neplynulé"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Ak o to aplikácia požiada, vaše zariadenie prispôsobí výstup pôvodnej snímkovej frekvencii obsahu, ktorý pozeráte. Môže to spôsobiť, že pri ukončení prehrávania videa alebo prejdení naň bude vaša obrazovka chvíľu prázdna."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Nikdy"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Vaše zariadenie sa nikdy nepokúsi prispôsobiť výstup pôvodnej snímkovej frekvencii obsahu, ktorý pozeráte, ani keď o to aplikácia požiada."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Chcete zmeniť rozlíšenie na %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Ak chcete odteraz používať rozlíšenie %1$s, vyberte OK."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Technológia Dolby Vision nie je podporovaná pri rozlíšení %1$s a bude deaktivovaná v rozšírených nastaveniach zobrazenia"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Tento režim podporuje: %1$s\nAk budete chcieť v niektorých televízoroch povoliť ďalšie formáty HDR, zrejme budete musieť zapnúť rozšírené HDMI. V nastaveniach televízora skontrolujte, či je to podporované."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Tento režim podporuje %1$s. Ak chcete povoliť ďalšie formáty HDR, v niektorých televízoroch zrejme budete musieť zapnúť Rozšírené HDMI. Skontrolujte v nastaveniach televízora, či je to podporované."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Zrušiť"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Vymazať údaje vo vyrovnávacej pamäti?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Vymažú sa údaje v pamäti pre všetky aplikácie"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Toto zariadenie spravuje vaša organizácia."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Toto zariadenie spravuje organizácia <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">"  "</string>
     <string name="learn_more" msgid="820336467414665686">"Ďalšie informácie"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplikácia kamery}few{Aplikácie kamery}many{Aplikácie kamery}other{Aplikácie kamery}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplikácia Kalendár"</string>
@@ -651,7 +625,7 @@
     <string name="system_network_location_confirm" msgid="7128162421781085332">"Súhlas so zhromažďovaním údajov o polohe"</string>
     <string name="location_mode_title" msgid="728244518174115443">"Režim"</string>
     <string name="location_category_recent_location_requests" msgid="4541924383164183490">"Nedávne žiadosti o polohu"</string>
-    <string name="location_no_recent_apps" msgid="7033474075806435793">"V poslednom čase nepožiadali o polohu žiadne aplikácie"</string>
+    <string name="location_no_recent_apps" msgid="7033474075806435793">"V poslednom čase žiadne aplikácie o polohu nepožiadali"</string>
     <string name="location_high_battery_use" msgid="5325556609027887602">"Vysoká spotreba batérie"</string>
     <string name="location_low_battery_use" msgid="728585923412018253">"Nízka spotreba batérie"</string>
     <string name="location_mode_wifi_description" msgid="84697248707903061">"Odhadovať polohu pomocou Wi‑Fi"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Potvrďte, že sa obrazovka pri pozeraní nemá vypínať (môže to spôsobiť vyššiu spotrebu energie)."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Pri neaktivite"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Pri pozeraní"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Automaticky vypnúť"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Bez aktivity automaticky vypnúť"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Pri pozeraní automaticky vypnúť"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Automatické vypínanie televízora"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Automatické vypínanie televízora pri nečinnosti"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Automatické vypínanie televízora pri pozeraní"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Časovač Pri nečinnosti musí byť nastavený na kratšie ako časovač Pri pozeraní"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Časovač Pri pozeraní musí byť nastavený na dlhšie ako časovač Pri nečinnosti"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Obmedziť pripoj. k sieti v pohot. režime"</string>
@@ -1042,7 +1016,7 @@
     <string name="picture_in_picture_app_detail_switch" msgid="3688997906817583854">"Povoliť obraz v obraze"</string>
     <string name="picture_in_picture_empty_text" msgid="4370198922852736600">"Žiadna z nainštalovaných aplikácií nepodporuje obraz v obraze"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="3296649114939705896">"Povoľte aplikáciám vytvoriť okno v režime obraz v obraze, kým je aplikácia otvorená alebo potom, čo ju opustíte (napríklad aby ste mohli pokračovať v pozeraní videa). Toto okno sa zobrazuje nad ostatnými aplikáciami, ktoré používate."</string>
-    <string name="alarms_and_reminders_description" msgid="4063972350154624500">"Povoľte aplikáciám nastavovať budíky a plánovať akcie s časovým obmedzením. Aplikáciám to umožní pracovať na pozadí, čo môže zvýšiť spotrebu energie.\n\nAk je toto povolenie vypnuté, existujúce budíky a udalosti s časovým obmedzením naplánované aplikáciou nebudú fungovať."</string>
+    <string name="alarms_and_reminders_description" msgid="4063972350154624500">"Povoľte aplikáciám nastavovať budíky a plánovať akcie s časovým obmedzením. Aplikáciám to umožní pracovať na pozadí, čo môže zvýšiť spotrebu energie.\n\nAk je toto povolenie vypnuté, súčasné budíky a udalosti s časovým obmedzením naplánované aplikáciou nebudú fungovať."</string>
     <string name="turn_screen_on_title" msgid="5293798529284629011">"Zapínanie obrazovky"</string>
     <string name="allow_turn_screen_on" msgid="4903401106871656521">"Povoľte zapínanie obrazovky"</string>
     <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Povoľte aplikácii zapínať obrazovku. Ak to urobíte, daná aplikácia bude môcť zapínať obrazovku kedykoľvek, a to aj vtedy, keď to nebudete mať v úmysle."</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Správanie pri zapnutí"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Obnoviť"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Párovací kód ethernetu"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Režimy spotreby energie"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Zlepšite efektivitu využívania energie, keď sa televízor nepoužíva"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Povolí:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Upozorňujeme, že tento režim môže zvýšiť spotrebu energie zariadením."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Povolenie režimu <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
 </resources>
diff --git a/Settings/res/values-sl/energy-modes.xml b/Settings/res/values-sl/energy-modes.xml
deleted file mode 100644
index 96d4efca3..000000000
--- a/Settings/res/values-sl/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Temeljne omrežne funkcije"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Nizka poraba energije"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Izklopite omrežno povezavo, ko televizor ni v uporabi."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Nujne posodobitve in funkcije"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Priporočene omrežne funkcije"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimizirana poraba energije"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Vklopi funkcije, ki preklopijo televizor iz stanja pripravljenosti prek omrežja (omrežno stanje pripravljenosti)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Vstavi funkcijo 1]"</item>
-    <item msgid="8724721267222341891">"[Vstavi funkcijo 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Dodatne omrežne funkcije"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Povečana poraba energije"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Poleg priporočenih funkcij ta možnost vklopi dodatne funkcije, ki morda povečajo porabo energije, ko televizor ni v uporabi."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Vstavi funkcijo 1]"</item>
-    <item msgid="170760143032597722">"[Vstavi funkcijo 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-sl/strings.xml b/Settings/res/values-sl/strings.xml
index 0c6e89073..2e565b02c 100644
--- a/Settings/res/values-sl/strings.xml
+++ b/Settings/res/values-sl/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Varnostno kopiranje in obnovitev"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Ponastavitev na tovarniške nastavitve"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Umerjanje"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Časovnik za izklop"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Nastavitev časovnikov za izklop televizorja in varčevanje z energijo"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Napajanje in energija"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Nastavitve načina »Eko«"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Naprave"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Izbira oblik zvoka"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Dodatne nastavitve zvoka"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Omogočanje načina za igre"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Ujemanje dinamičnega razpona vsebine"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Če omogočite to možnost, bo sistem preklapljal med različnimi oblikami zapisa dinamičnega razpona, da se bodo ujemale z vsebino. Med preklopom oblike zapisa je lahko prikazan črn zaslon.\n\nČe želite več možnosti dinamičnega razpona, kliknite možnost dodatnih nastavitev prikaza."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Prednostni dinamični razpon"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Sistemska pretvorba"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Sistemu omogoči upravljanje pretvorbe oblike."</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Če je ta možnost izbrana, sistem določi ustrezni dinamični razpon, ki je poslan v zaslon, in po potrebi vsebino pretvori v ta dinamični razpon."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Vedno se prilagodi obliki vsebine."</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Vsiljenje pretvorbe"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Vsili pretvorbo v prednostno obliko."</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Vsiljenje pretvorbe v prednostno obliko. Vsiljena pretvorba morda vpliva na druge nastavitve v načinu prikaza ali obliki HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Vedno v SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Vedno v <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Ali želite vsiliti prikaz HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Pretvorba bo privzeto vsiljeno nastavljena na <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Zaslon bo v ločljivosti 1080p 60 Hz. Ta možnost ni združljiva z vašim zaslonom, če je nastavljen na ločljivost 4k 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision pri trenutni ločljivosti ni podprt. Če Dolby Vision omogočite ročno, bo ločljivost zaslona spremenjena na 1080p s frekvenco 60 Hz."</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Želite spremeniti ločljivost na 1080p s frekvenco 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Pretvorba v Dolby Vision se vedno vsili"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Če je v dodatnih nastavitvah prikaza Dolby Vision onemogočen pri oblikah HDR-ja, ga z vsiljeno pretvorbo v Dolby Vision znova omogočite."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Pretvorba v HDR10 se vedno vsili"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Če je v dodatnih nastavitvah prikaza HDR10 onemogočen pri oblikah HDR-ja, ga z vsiljeno pretvorbo v HDR10 znova omogočite."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Pretvorba v HLG se vedno vsili"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Če je v dodatnih nastavitvah prikaza HLG onemogočen pri oblikah HDR-ja, ga z vsiljeno pretvorbo v HLG znova omogočite."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Pretvorba v HDR10+ se vedno vsili"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Če je v dodatnih nastavitvah prikaza HDR10+ onemogočen pri oblikah HDR-ja, ga z vsiljeno pretvorbo v HDR10+ znova omogočite."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Pretvorba v SDR se vedno vsili"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Vsiljena pretvorba v SDR v dodatnih nastavitvah prikaza onemogoči vse oblike pri oblikah HDR."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Ujemanje s številom sličic v sekundi vsebine"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Samo brez prekinitev"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Brez prekinitev"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Če to zahteva aplikacija, bo naprava svoj izhod uskladila z izvirnim številom sličic v sekundi vsebine, ki jo gledate, SAMO v primeru, če lahko televizor opravi prehod brez prekinitev."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Povezani zaslon ne podpira nemotenih preklopov hitrosti osveževanja. Ta možnost ne bo imela učinka, če ne preklopite na zaslon, ki jo podpira."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Vedno"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"S prekinitvami"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Če to zahteva aplikacija, bo naprava svoj izhod uskladila z izvirnim številom sličic v sekundi vsebine, ki jo gledate. Zaradi tega bo med začetkom ali ustavitvijo predvajanja videoposnetka zaslon za nekaj sekund morda prazen."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Nikoli"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Tudi če to zahteva aplikacija, naprava svojega izhoda ne bo nikoli poskušala uskladiti z izvirnim številom sličic v sekundi vsebine, ki jo gledate."</string>
@@ -217,12 +190,12 @@
     <string name="resolution_selection_dialog_title" msgid="4029798035133645272">"Ločljivost je spremenjena"</string>
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Želite spremeniti ločljivost na %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Izberite »V redu«, če želite od zdaj naprej uporabljati %1$s."</string>
-    <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision pri ločljivosti %1$s ni podprt in bo v možnosti »Dodatne nastavitve slike« onemogočen."</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Ta način podpira: %1$s\nV nekaterih televizorjih morate morda vklopiti izboljšan HDMI, če želite omogočiti več oblik HDR-ja. V nastavitvah televizorja si oglejte, ali je to podprto."</string>
+    <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision pri ločljivosti %1$s ni podprt in bo v »Dodatnih nastavitvah zaslona« onemogočen."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Ta način podpira %1$s. V nekaterih televizorjih morate morda vklopiti izboljšan HDMI, če želite omogočiti več oblik HDR-ja. V nastavitvah televizorja si oglejte, ali je to podprto."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Prekliči"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"V redu"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Želite izbrisati predpomnjene podatke?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Izbrisali boste predpomn. pod. vseh aplikacij."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"To napravo upravlja vaša organizacija."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"To napravo upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Več o tem"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Fotografska aplikacija}one{Fotografske aplikacije}two{Fotografske aplikacije}few{Fotografske aplikacije}other{Fotografske aplikacije}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplikacija za koledar"</string>
@@ -696,9 +670,9 @@
     <string name="palette_color_purple" msgid="2123828754639683555">"Vijolična"</string>
     <string name="palette_color_gray" msgid="4014534773994261194">"Siva"</string>
     <string name="accessibility_shortcut" msgid="5856158637840030531">"Bližnjica za dostopnost"</string>
-    <string name="accessibility_shortcut_enable" msgid="6603542432267329986">"Omogoči bližnjico za dostopnost"</string>
+    <string name="accessibility_shortcut_enable" msgid="6603542432267329986">"Omogoči bližnjico funkcij za ljudi s posebnimi potrebami"</string>
     <string name="accessibility_shortcut_service" msgid="2053250146891420311">"Storitev z bližnjico"</string>
-    <string name="accessibility_shortcut_description" msgid="2050424178481510046">"Ko je bližnjica vklopljena, lahko pritisnete gumba s puščico za vrnitev in puščico navzdol ter ju pridržite tri sekunde, če želite zagnati funkcijo dostopnosti."</string>
+    <string name="accessibility_shortcut_description" msgid="2050424178481510046">"Ko je bližnjica vklopljena, lahko pritisnete gumba s puščico za vrnitev in puščico navzdol ter ju pridržite tri sekunde, če želite zagnati funkcijo za ljudi s posebnimi potrebami."</string>
     <string name="accessibility_captions" msgid="3411554568812306549">"Podnapisi"</string>
     <string name="accessibility_captions_description" msgid="3827820027578548160">"Nastavitve prekrivanja za besedilo podnapisov v videoposnetku"</string>
     <string name="captions_display" msgid="2598662495450633375">"Prikaz"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Potrdite, če želite preprečiti, da se zaslon med gledanjem izklopi, vendar lahko to povzroči povečanje porabe energije."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Ob nedejavnosti"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Med gledanjem"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Samodejni izklop"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Samodejni izklop, ko naprava ni aktivna"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Samodejni izklop med gledanjem"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Samodejni izklop televizorja"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Samodejni izklop televizorja, ko je nedejaven"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Samodejni izklop televizorja med gledanjem"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Časovnik načina »Ob nedejavnosti« mora biti krajši od časovnika načina »Med gledanjem«."</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Časovnik načina »Med gledanjem« mora biti daljši od časovnika načina »Ob nedejavnosti«."</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Omejitev omrežne povezave v načinu pripravljenosti"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Delovanje ob vklopu"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Ponastavi"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Koda za seznanjanje za ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Energijski načini"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Izboljšajte energijsko učinkovitost, ko televizor ni v uporabi"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Omogoča:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Upoštevajte, da lahko ta način poveča porabo energije naprave."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Omogočite »<xliff:g id="ENERGYMODENAME">%s</xliff:g>«"</string>
 </resources>
diff --git a/Settings/res/values-sq/energy-modes.xml b/Settings/res/values-sq/energy-modes.xml
deleted file mode 100644
index eaaab025e..000000000
--- a/Settings/res/values-sq/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Veçori thelbësore të rrjetit"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Përdorim i ulët i energjisë"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Çaktivizo lidhjen e rrjetit kur TV nuk është në përdorim."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Përditësime dhe funksione kritike"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Veçoritë e rekomanduara të rrjetit"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Përdorim i optimizuar i energjisë"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Aktivizon veçoritë që zgjojnë TV nëpërmjet rrjetit (modaliteti i gatishmërisë së rrjetit)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Fut veçorinë 1]"</item>
-    <item msgid="8724721267222341891">"[Fut veçorinë 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Veçori shtesë të rrjetit"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Përdorim i rritur i energjisë"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Përveç veçorive të rekomanduara, ky opsion aktivizon veçoritë shtesë kur TV nuk është në përdorim, që mund të rrisë përdorimin e energjisë."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Fut veçorinë 1]"</item>
-    <item msgid="170760143032597722">"[Fut veçorinë 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-sq/strings.xml b/Settings/res/values-sq/strings.xml
index c8053efd2..9dbbf26fd 100644
--- a/Settings/res/values-sq/strings.xml
+++ b/Settings/res/values-sq/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Rezervo dhe restauro"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Rivendosja e të dhënave të fabrikës"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibrimi"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Kohëmatësi i fikjes"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Cakto kohëmatësit për të fikur televizorin dhe kursyer energji"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Fuqia dhe energjia"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Cilësimet e modalitetit ekonomik"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Pajisjet"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Zgjidh formatet"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Cilësimet e përparuara të tingullit"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Lejo modalitetin e lojës"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Përshtate me gamën dinamike të përmbajtjes"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Kur aktivizohet ky opsion, sistemi do të kalojë midis formateve të ndryshme të gamës dinamike për t\'u përputhur me përmbajtjen. Kjo mund të shkaktojë një ekran të zi gjatë ndërrimit të formatit.\n\nKliko \"Cilësimet e përparuara të ekranit\" për më shumë opsione të gamës dinamike."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Gama e preferuar dinamike"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Konvertimi i preferuar nga sistemi"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Lejo që sistemi të menaxhojë konvertimin e formatit"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Kur ky opsion është i zgjedhur, sistemi do të përcaktojë një gamë dinamike të përshtatshme për t\'u dërguar në ekranin tënd dhe për ta konvertuar përmbajtjen në këtë gamë dinamike sipas nevojës."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Përputhet gjithmonë me formatin e përmbajtjes"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Zbato me forcë konvertimin"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Zbaton me forcë konvertimin në formatin e preferuar"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Kaloje me forcë konvertimin në një format të preferuar. Zbatimi me forcë i konvertimit mund të ketë ndikim në cilësimet e tjera në modalitetin e ekranit ose në formatin HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Gjithmonë në SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Gjithmonë në <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Dëshiron të zbatosh me forcë daljen në HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Si parazgjedhje, konvertimi do të kalohet me forcë në <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Ekrani yt do të funksionojë me rezolucion 1080p 60 Hz. Ky opsion nuk është i përputhshëm me ekranin tënd kur ai funksionon me rezolucion 4k 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision nuk mbështetet në rezolucionin aktual. Nëse e aktivizon Dolby Vision në mënyrë manuale, rezolucioni i ekranit tënd do të kalohet në 1080p 60 Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Të ndryshohet rezolucioni në 1080p 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Zbato gjithmonë me forcë konvertimin në Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Nëse Dolby Vision është çaktivizuar në \"Formatet HDR\" te \"Cilësimet e përparuara të ekranit\", zbatimi me detyrim i konvertimit në Dolby Vision do ta aktivizojë përsëri atë."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Zbato gjithmonë me forcë konvertimin në HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Nëse HDR10 është çaktivizuar në \"Formatet HDR\" te \"Cilësimet e përparuara të ekranit\", zbatimi me detyrim i konvertimit në HDR10 do ta aktivizojë përsëri atë."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Zbato gjithmonë me forcë konvertimin në HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Nëse HLG është çaktivizuar në \"Formatet HDR\" te \"Cilësimet e përparuara të ekranit\", zbatimi me detyrim i konvertimit në HLG do ta aktivizojë përsëri atë."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Zbato gjithmonë me forcë konvertimin në HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Nëse HDR10+ është çaktivizuar në \"Formatet HDR\" te \"Cilësimet e përparuara të ekranit\", zbatimi me detyrim i konvertimit në HDR10+ do ta aktivizojë përsëri atë."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Zbato gjithmonë me forcë konvertimin në SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Zbatimi me forcë i konvertimit në SDR do të çaktivizojë të gjitha formatet në \"Formatet HDR\" te \"Cilësimet e përplaruara të ekranit\"."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Përshtat shpejtësinë e kuadrove të përmbajtjes"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Vetëm pa ndërprerje"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"I thjeshtuar"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Nëse aplikacioni e kërkon, pajisja jote do ta përshtatë daljen e saj me shpejtësinë origjinale të kuadrove që shikon, VETËM nëse televizori mund të kryejë një kalim të thjeshtuar."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Ekrani yt i lidhur nuk mbështet kalimet pa ndërprerje të shpejtësisë së rifreskimit. Ky opsion nuk do të ketë asnjë efekt nëse nuk e ndryshon në një ekran që e mbështet atë."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Gjithmonë"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Jo i thjeshtuar"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Nëse aplikacioni e kërkon, pajisja jote do ta përshtatë daljen e saj me shpejtësinë origjinale të kuadrove që shikon. Kjo mund të bëjë që ekrani të jetë bosh për një sekondë kur del ose hyn në luajtjen e një videoje."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Asnjëherë"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Edhe nëse aplikacioni e kërkon, pajisja jote asnjëherë nuk do të përpiqet ta përshtatë daljen e saj me shpejtësinë origjinale të kuadrove që shikon."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Të ndryshohet rezolucioni në %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Zgjidh \"Në rregull\" për të përdorur %1$s nga tani e tutje."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision nuk mbështetet në %1$s dhe do të çaktivizohet te \"Cilësimet e përparuara të ekranit\""</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Ky modalitet mbështet: %1$s\nNë disa televizorë mund të duhet të aktivizosh lidhjen HDMI të përparuar për të aktivizuar formate të tjera HDR. Kontrollo cilësimet e televizorit për të parë nëse kjo mbështetet."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Ky modalitet mbështet %1$s. Në disa televizorë mund të duhet të aktivizosh lidhjen HDMI të përparuar për të aktivizuar formate të tjera HDR. Kontrollo cilësimet e televizorit për të parë nëse kjo mbështetet."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Anulo"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Në rregull"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Të pastrohen të dhënat e memories specifike?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Kjo do të pastrojë të dhënat e memories specifike për të gjitha aplikacionet."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Kjo pajisje menaxhohet nga organizata jote."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Kjo pajisje menaxhohet nga <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Mëso më shumë"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplikacioni i kamerës}other{Aplikacionet e kamerës}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplikacioni i kalendarit"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Konfirmo për të parandaluar fikjen e ekranit gjatë shikimit, pasi kjo ka mundësi të konsumojë më shumë energji."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Gjatë mungesës së aktivitetit"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Gjatë shikimit"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Çaktivizoje automatikisht"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Çaktivizoje automatikisht kur është joaktive"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Çaktivizoje automatikisht kur je duke shikuar"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Fike automatikisht televizorin"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Fike automatikisht televizorin kur nuk ka aktivitet"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Fike automatikisht televizorin kur je duke e shikuar"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Kohëmatësi \"Gjatë mungesës së aktivitetit\" duhet të jetë më i shkurtër se kohëmatësi \"Gjatë shikimit\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Kohëmatësi \"Gjatë shikimit\" duhet të jetë më i gjatë se kohëmatësi \"Gjatë mungesës së aktivitetit\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Kufizo lidhjen me rrjetin në gatishmëri"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Sjellja pas ndezjes"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Rivendos"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Kodi i çiftimit i ethernet-it"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Modalitetet e energjisë"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Përmirëso efikasitetin e energjisë kur TV nuk është në përdorim"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Aktivizon:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Ki parasysh se ky modalitet mund të rrisë konsumimin e energjisë së pajisjes."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Aktivizo \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/Settings/res/values-sr/energy-modes.xml b/Settings/res/values-sr/energy-modes.xml
deleted file mode 100644
index 97fdd8607..000000000
--- a/Settings/res/values-sr/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Основне мрежне функције"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Мала потрошња енергије"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Искључите мрежну везу када се ТВ не користи."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Важна ажурирања и функције"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Препоручене мрежне функције"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Оптимизована потрошња енергије"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Укључује функције које буде ТВ преко мреже (режим мировања на мрежи)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Уметните функцију 1]"</item>
-    <item msgid="8724721267222341891">"[Уметните функцију 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Додатне мрежне функције"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Повећана потрошња енергије"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Поред препоручених функција, ова опција укључује додатне функције када се ТВ не користи које могу да повећају потрошњу енергије."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Уметните функцију 1]"</item>
-    <item msgid="170760143032597722">"[Уметните функцију 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-sr/strings.xml b/Settings/res/values-sr/strings.xml
index 9fde48ad3..c2aae065f 100644
--- a/Settings/res/values-sr/strings.xml
+++ b/Settings/res/values-sr/strings.xml
@@ -67,7 +67,7 @@
     <string name="add_account" msgid="7386223854837017129">"Додај налог"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Уклањање налога"</string>
     <string name="account_sync" msgid="4315295293211313989">"Изаберите синхронизоване апликације"</string>
-    <string name="sync_now" msgid="4335217984374620551">"Синхронизуј"</string>
+    <string name="sync_now" msgid="4335217984374620551">"Синхронизуј одмах"</string>
     <string name="sync_in_progress" msgid="8081367667406185785">"Синхронизовање…"</string>
     <string name="last_synced" msgid="8371967816955123864">"Последњи пут синхронизовано <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="sync_disabled" msgid="6652778349371079140">"Онемогућено је"</string>
@@ -75,7 +75,7 @@
     <string name="account_remove_failed" msgid="5654411101098531690">"Није могуће уклонити налог"</string>
     <!-- no translation found for sync_item_title (5884138264243772176) -->
     <skip />
-    <string name="sync_one_time_sync" msgid="1665961083810584134">"Синхронизуј<xliff:g id="LAST_SYNC_TIME">
+    <string name="sync_one_time_sync" msgid="1665961083810584134">"Синхронизуј одмах<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_failed" msgid="2998289556481804047">"Синхронизација није успела"</string>
     <string name="sync_active" msgid="1621239982176888680">"Синхронизација је активна"</string>
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Прављење резервне копије и враћање"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Ресетовање на фабричка подешавања"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Калибрација"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Тајмер за искључивање"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Подесите тајмере за искључивање ТВ-а и уштеду енергије"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Напајање и енергија"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Еко подешавања"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Уређаји"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Изаберите формате"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Напредна подешавања звука"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Дозволи режим за игре"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Користи исти динамички опсег садржаја"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Када омогућите ову опцију, систем ће мењати формат динамичког опсега ради подударања са садржајем. То може да изазове црни екран током промене формата.\n\nКликните на Напредна подешавања екрана за више опција динамичког опсега."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Жељени динамички опсег"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Системска конверзија"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Омогућава систему да управља конверзијом формата"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Када је ова опција изабрана, систем одређује одговарајући динамички опсег који ће послати на екран и према потреби ће конвертовати садржај у тај динамички опсег."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Увек се подудара с форматом садржаја"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Наметни конверзију"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Намеће се конверзија у жељени формат"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Намеће конверзију у жељени формат. Наметање конверзије може да утиче на друга подешавања у режим приказа или HDR формат."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Увек у SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Увек у <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Желите да наметнете HDR излаз?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Подразумевано наметнуће се конверзија у <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Резолуција екрана биће 1080 пиксела на 60 Hz. Та опција није компатибилна са вашим екраном резолуције 4K на 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision није подржан при актуелној резолуцији. Ако ручно омогућите Dolby Vision, резолуција екрана ће се променити у 1080 пиксела на 60 Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Желите да промените резолуцију у 1080 пиксела на 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Увек обављај принудну конверзију у Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Ако је Dolby Vision онемогућен у HDR форматима у Напредним подешавањима екрана, принудна конверзија у Dolby Vision ће га поново омогућити."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Увек обављај принудну конверзију у HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Ако је HDR10 онемогућен у HDR форматима у Напредним подешавањима екрана, принудна конверзија у HDR10 ће га поново омогућити."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Увек обављај принудну конверзију у HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Ако је HLG онемогућен у HDR форматима у Напредним подешавањима екрана, принудна конверзија у HLG ће га поново омогућити."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Увек обављај принудну конверзију у HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Ако је HDR10+ онемогућен у HDR форматима у Напредним подешавањима екрана, принудна конверзија у HDR10+ ће га поново омогућити."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Увек обављај принудну конверзију у SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Принудна конверзија у SDR ће онемогућити све формате у HDR форматима у Напредним подешавањима екрана."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Користи брзину кадрова садржаја"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Само неприметно"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Неприметно"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Ако апликација то тражи, уређај ће усклађивати брзину кадрова садржаја који приказује са оригиналном брзином кадрова садржаја који гледате САМО под условом да ТВ може да обави неприметан прелаз."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Повезани екран не подржава неприметне промене учесталости освежавања. Ова опција неће имати ефекта ако не пређете на екран који је подржава."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Увек"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Није неприметно"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Ако апликација то тражи, уређај ће усклађивати брзину кадрова садржаја који приказује са оригиналном брзином кадрова садржаја који гледате. Због тога ће екран можда накратко бити празан када заустављате или почињете репродукцију видеа."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Никад"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Чак и ако апликација то тражи, уређај никада неће покушавати да усклади брзину кадрова садржаја који приказује са оригиналном брзином кадрова садржаја који гледате."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Желите да промените резолуцију у %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Изаберите Потврди да бисте користили %1$s од сада."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolbi Vision није подржан на %1$s и биће онемогућен у „Напредним подешавањима приказа“"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Овај режим подржава: %1$s\nНа неким телевизорима ћете можда морати да укључите побољшан HDMI да бисте омогућили више HDR формата. Проверите подешавања ТВ-а да бисте видели да ли је то подржано."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Овај режим подржава %1$s. На неким телевизорима ћете можда морати да укључите побољшан HDMI да бисте омогућили више HDR формата. Проверите подешавања ТВ-а да бисте видели да ли је то подржано."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Откажи"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Потврди"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Желите ли да обришете кеширане податке?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Биће обрисани кеширани подаци за све апликације."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Овим уређајем управља организација."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Овим уређајем управља <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Сазнајте више"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Апликација за камеру}one{Апликације за камеру}few{Апликације за камеру}other{Апликације за камеру}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Апликација Календар"</string>
@@ -757,7 +731,7 @@
     <string name="system_drawing" msgid="5802739024643871942">"Цртање"</string>
     <string name="system_monitoring" msgid="7997260748312620855">"Надгледање"</string>
     <string name="system_apps" msgid="8481888654606868074">"Апликације"</string>
-    <string name="system_stay_awake" msgid="5935117574414511413">"Не гаси екран"</string>
+    <string name="system_stay_awake" msgid="5935117574414511413">"Не закључавај"</string>
     <string name="keep_screen_on_summary" msgid="4680661166009970792">"Екран никада неће бити у режиму спавања"</string>
     <string name="system_hdcp_checking" msgid="3757586362130048838">"HDCP провера"</string>
     <string name="system_hdmi_optimization" msgid="4122753440620724144">"HDMI оптимизација"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Потврдите да бисте спречили да се екран искључује док гледате, што може да изазове повећану потрошњу енергије."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Током неактивности"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Током гледања"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Аутоматски искључи"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Аутоматски искључи током неактивности"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Аутоматски искључи током гледања"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Аутоматски искључи ТВ"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Аутоматско искључивање ТВ-а при неактивности"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Аутоматско искључивање ТВ-а при гледању"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Тајмер „Током неактивности“ мора да буде краћи од тајмера „Током гледања“"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Тајмер „Током гледања“ мора да буде дужи од тајмера „Током неактивности“"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Ограничи мрежну везу у режиму мировања"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Понашање при укључивању"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Ресетуј"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Кôд за упаривање за етернет"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Режими потрошње енергије"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Побољшајте ефикасност енергије када се ТВ не користи"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Омогућава:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Имајте на уму да овај режим може да повећа потрошњу енергије на уређају."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Омогућите режим <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
 </resources>
diff --git a/Settings/res/values-sv/energy-modes.xml b/Settings/res/values-sv/energy-modes.xml
deleted file mode 100644
index 479d273b6..000000000
--- a/Settings/res/values-sv/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Viktiga nätverksfunktioner"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Låg energiförbrukningen"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Inaktivera nätverksanslutningen när tv:n inte används."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Viktiga uppdateringar och funktioner"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Rekommenderade nätverksfunktioner"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimerad energiförbrukning"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Inaktiverar funktioner som väcker tv:n via nätverket (nätverksanslutet standbyläge)"</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Ytterligare nätverksfunktioner"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Ökad energiförbrukning"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Utöver de rekommenderade funktionerna aktiverar det här alternativet ytterligare funktioner när tv:n inte används som kan öka energiförbrukningen."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-sv/strings.xml b/Settings/res/values-sv/strings.xml
index 7028f63b0..753241bec 100644
--- a/Settings/res/values-sv/strings.xml
+++ b/Settings/res/values-sv/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Säkerhetskopiera och återställ"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Återställ standardinställningarna"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibrering"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Avstängningstimer"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Ställ in timers för att stänga av tv:n och sänka energiförbrukningen"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Ström och energi"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Eko-inställningar"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Enheter"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Välj format"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Avancerade ljudinställningar"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Tillåt spelläge"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Matcha innehållets dynamiska omfång"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"När du aktiverar det här alternativet byter systemet mellan olika format för dynamiskt omfång för att matcha innehållet. Du kan se en svart skärm under formatbytet.\n\nKlicka på Avancerade skärminställningar för att se fler alternativ för dynamiskt omfång."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Önskat dynamiskt omfång"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Systemföredragen konvertering"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Låter systemet hantera formatkonverteringen"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"När det här alternativet är valt bestämmer systemet ett passande dynamiskt intervall som skickas till din skärm för att konvertera innehåll till detta dynamiska intervall efter behov."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Matchar alltid innehållets format"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Tvångskonvertera"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Tvångskonverterar till önskat format"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Tvångskonvertera till önskat format. Tvångskonverterar du kan det påverka andra inställningar för skärmläget eller HDR-format."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Alltid till SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Alltid till <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Vill du tvångskonvertera HDR-utmatningen?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Som standard tvångskonverteras den till <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Din skärm kommer att köras med upplösningen 1080p 60 Hz. Det här alternativet är inte kompatibelt med din skärm när den körs med upplösningen 4K 60 Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision stöds inte för den aktuella upplösningen. Om du aktiverar Dolby Vision manuellt ändras skärmens upplösning till 1080p 60 Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Vill du ändra upplösningen till 1080p 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Tvångskonvertera alltid till Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Om du tvångskonverterar till Dolby Vision när det är inaktiverat i HDR Formats i avancerade skärminställningar återaktiveras Dolby Vision."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Tvångskonvertera alltid till HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Om du tvångskonverterar till HDR10 när det är inaktiverat i HDR Formats i avancerade skärminställningar återaktiveras HDR10."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Tvångskonvertera alltid till HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Om du tvångskonverterar till HLG när det är inaktiverat i HDR Formats i avancerade skärminställningar återaktiveras HLG."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Tvångskonvertera alltid till HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Om du tvångskonverterar till HDR10+ när det är inaktiverat i HDR Formats i avancerade skärminställningar återaktiveras HDR10+."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Tvångskonvertera alltid till SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Om du tvångskonverterar till SDR inaktiveras alla format i HDR Formats i avancerade skärminställningar."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Matcha innehållets bildfrekvens"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Endast sömlös"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Sömlöst"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Om appen begär det matchar enheten utdatan med den ursprungliga bildfrekvensen av det du tittar på, ENDAST om tv:n har stöd för sömlös övergång."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Din anslutna skärm har inte stöd för sömlösa övergångar mellan uppdateringsfrekvenser. Det här alternativet har ingen effekt såvida du inte byter till en kompatibel skärm."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Alltid"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Inte sömlöst"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Om appen begär det matchar enheten utdatan med den ursprungliga bildfrekvensen av det du tittar på. Detta kan leda till att skärmen blir svart i någon sekund när du avslutar eller startar videouppspelning."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Aldrig"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Enheten försöker aldrig matcha utdatan med den ursprungliga bildfrekvensen av det du tittar på, även om appen begär det."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Vill du byta upplösning till %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Välj OK om du vill använda %1$s i fortsättningen."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision stöds inte för %1$s och inaktiveras i de avancerade skärminställningarna"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Det här läget har stöd för: %1$s\nPå en del tv:ar kan du behöva aktivera utökad HDMI för att få tillgång till fler HDR-format. Du kan se om detta stöds i tv-inställningarna."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Det här läget stödjer %1$s. På en del tv:ar kan du behöva aktivera Utökad HDMI för att aktivera fler HDR-format. Du kan se om detta stöds i tv-inställningarna."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Avbryt"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Vill du ta bort cachelagrad data?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Cachelagrad data tas bort i alla appar."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Den här enheten hanteras av organisationen."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Den här enheten hanteras av <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Läs mer"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kameraapp}other{Kameraappar}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Kalenderapp"</string>
@@ -410,7 +384,7 @@
     <string name="terms_title" msgid="192888187310800678">"Användarvillkor"</string>
     <string name="webview_license_title" msgid="5370270485188947540">"Systemet WebView-licens"</string>
     <string name="consumer_information_title" msgid="7729729568416672733">"Konsumentinformation"</string>
-    <string name="consumer_information_message" msgid="205236637689468764">"Innehållet som finns på Android TV tillhandahålls både av Google och av tredjepartspartners såsom apputvecklare och filmbolag. Du hittar mer information på "<a href="g.co/tv/androidtvinfo">"g.co/tv/androidtvinfo"</a></string>
+    <string name="consumer_information_message" msgid="205236637689468764">"Innehållet som finns på Android TV tillhandahålls både av Google och av tredjepartspartner såsom apputvecklare och filmbolag. Du hittar mer information på "<a href="g.co/tv/androidtvinfo">"g.co/tv/androidtvinfo"</a></string>
     <string name="consumer_information_button_ok" msgid="6979480064600038080">"OK"</string>
   <string-array name="wifi_signal_strength">
     <item msgid="4475363344103354364">"Dålig"</item>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Bekräfta att skärmen inte ska inaktiveras medan du tittar på något. Detta kan leda till ökad energiförbrukning."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Vid inaktivitet"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Vid uppspelning"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Stäng av automatiskt"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Stäng av automatiskt vid inaktivitet"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Stäng av automatiskt vid uppspelning"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Stäng av tv:n automatiskt"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Stäng av tv:n automatiskt när den är inaktiv"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Stäng av tv:n automatiskt när du tittar"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Timern för Vid inaktivitet måste vara kortare än timern för Vid uppspelning"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Timern för Vid uppspelning måste vara längre än timern för Vid inaktivitet"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Begränsa nätverksanslutning i viloläge"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Beteende när tv:n slås på"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Återställ"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Ethernet-kopplingskod"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Energilägen"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Förbättra energieffektiviteten när tv:n inte används"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Aktiverar följande:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Tänk på att det här läget kan öka enhetens energiförbrukning."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Aktivera <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
 </resources>
diff --git a/Settings/res/values-sw/energy-modes.xml b/Settings/res/values-sw/energy-modes.xml
deleted file mode 100644
index cabc7c247..000000000
--- a/Settings/res/values-sw/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Vipengele muhimu vya mtandao"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Utumiaji mdogo wa nishati"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Zima muunganisho wa mtandao wakati TV haitumiki."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Masasisho na utendaji muhimu"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Vipengele vya mtandao vinavyopendekezwa"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Utumiaji wa nishati ulioboreshwa"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Huwasha vipengele vinavyowasha skrini ya TV kwenye mtandao (hali tuli ya mtandao)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Vipengele vya mtandao vya ziada"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Utumiaji wa nishati umeongezeka"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Mbali na vipengele vinavyopendekezwa, chaguo hili huwasha vipengele vya ziada wakati TV haitumiki, hali inayoweza kuongeza utumiaji wa nishati."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-sw/strings.xml b/Settings/res/values-sw/strings.xml
index 8065a520b..988fc10e3 100644
--- a/Settings/res/values-sw/strings.xml
+++ b/Settings/res/values-sw/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Kipengele cha Kuhifadhi na Kurejesha Nakala"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Kurejesha data iliyotoka nayo kiwandani"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Marekebisho"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Zima Kipima Muda"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Weka vipima muda ili kuzima TV na kuokoa nishati"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Umeme na Nishati"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Mipangilio ya Kuokoa Nishati"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Vifaa"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Chagua miundo"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Mipangilio ya kina ya sauti"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Ruhusu hali ya mchezo"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Linganisha mfululizo wa ubadilikaji wa maudhui"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Unapowasha chaguo hili, mfumo utabadilisha kati ya miundo tofauti ya mfululizo wa ubadilikaji ili kulingansha maudhui. Hali hii inaweza kusababisha skrini nyeusi wakati wa kubadilisha muundo.\n\nBofya mipangilio ya Kina ya Skrini ili upate chaguo zaidi za mfululizo wa ubadilikaji."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Mfululizo wa ubadilikaji unaopendelewa"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Ubadilishaji unaopendelewa na mfumo"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Huruhusu mfumo kudhibiti ubadilishaji wa muundo"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Ukiteua chaguo hili, mfumo utabainisha masafa yanayobadilika yanayofaa kutumwa kwenye skrini yako na kubadilisha maudhui kuwa katika masafa haya yanayobadilika kadiri inavyohitajika."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Hulingana na muundo wa maudhui wakati wote"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Kulazimisha ubadilishaji"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Italazimisha ubadilishaji uwe katika muundo unaopendelewa"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Lazimisha ubadilishaji uwe katika muundo unaopendelewa. Kulazimisha ubadilishaji huenda kukaathiri mipangilio mingine ya Hali ya Skrini au Muundo wa HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Wakati wote iwe SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Wakati wote huwa <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Je, ungependa kulazimisha matumizi ya mfumo wa HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Kwa chaguomsingi, ubadilishaji utalazimishwa kuwa <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Skrini yako itaonyesha katika ubora wa 1080p 60Hz. Chaguo hili halioani na skrini yako linapoonyesha katika ubora wa 4k 60Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision haioani na ubora wa sasa. Ukiwasha Dolby Vision mwenyewe, ubora wa maudhui kwenye skrini utabadilika kuwa 1080p 60Hz."</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Ungependa kubadilisha ubora kuwa 1080p 60Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Lazimisha ubadilishaji uwe katika muundo wa Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Ikiwa Dolby Vision imezimwa katika Miundo ya HDR katika Mipangilio ya Skrini ya Kina, kulazimisha ubadilishaji uwe katika muundo wa Dolby Vision kutaiwasha tena."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Lazimisha ubadilishaji uwe katika muundo wa HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Ikiwa HDR10 imezimwa katika Miundo ya HDR katika Mipangilio ya Skrini ya Kina, kulazimisha ubadilishaji uwe katika muundo wa HDR10 kutaiwasha tena."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Lazimisha ubadilishaji uwe katika muundo wa HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Ikiwa HLG imezimwa katika Miundo ya HDR katika Mipangilio ya Skrini ya Kina, kulazimisha ubadilishaji uwe katika muundo wa HLG kutaiwasha tena."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Lazimisha ubadilishaji uwe katika muundo wa HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Ikiwa HDR10+ imezimwa katika Miundo ya HDR katika Mipangilio ya Skrini ya Kina, kulazimisha ubadilishaji uwe katika muundo wa HDR10+ kutaiwasha tena."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Lazimisha ubadilishaji uwe katika muundo wa SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Kulazimisha ubadilishaji uwe katika muundo wa SDR kutazima miundo yote katika Miundo ya HDR kwenye Mipangilio ya Skrini ya Kina."</string>
-    <string name="match_content_frame_rate_title" msgid="153291168560947689">"Kulinganisha kasi ya maudhui"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Mtiririko laini pekee"</string>
+    <string name="match_content_frame_rate_title" msgid="153291168560947689">"Kasi ya picha ya kulinganisha maudhui"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Mtiririko laini"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Ikihitajika na programu, kifaa chako kitalinganisha kasi yake ya utoaji maudhui na kasi halisi ya picha ya maudhui unayotazama, ikiwa TU TV yako inaweza kuonyesha maudhui kwa mtiririko laini."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Skrini yako uliyounganisha haionyeshi kwa urahisi kipengele cha uhamishaji kiwango cha kuonyesha upya. Chaguo hili halitakuwa na matokeo mazuri isipokuwa ubadilishe ili utumie skrini inayoonyesha."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Kila wakati"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Haina mtiririko laini"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Ikihitajika na programu, kifaa chako kitalinganisha kasi yake ya utoaji maudhui na kasi halisi ya picha ya maudhui unayotazama. Huenda hii ikasababisha skrini kutoonyesha maudhui yoyote kwa muda mfupi unapoanza kucheza au unapositisha video."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Kamwe"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Hata ikihitajika na programu, kifaa chako kamwe hakitajaribu kulinganisha kasi yake ya utoaji maudhui na kasi halisi ya picha ya maudhui unayotazama."</string>
@@ -215,14 +188,14 @@
     <string name="resolution_selection_title" msgid="2873993320284587853">"Ubora"</string>
     <string name="resolution_selection_auto_title" msgid="4738671207331027385">"Otomatiki"</string>
     <string name="resolution_selection_dialog_title" msgid="4029798035133645272">"Umebadilisha ubora"</string>
-    <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Ungependa kubadilisha ubora uwe %1$s?"</string>
+    <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Ungependa kubadilisha ubora kuwa %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Chagua Sawa ili utumie %1$s kuanzia sasa."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Kipengele cha Dolby Vision hakitumiki kwenye %1$s na kitazimwa kwenye \"Mipangilio ya Kina ya Skrini\""</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Hali hii inatumia: %1$s\nKwenye baadhi ya TV, huenda ukahitaji kuwasha HDMI Iliyoboreshwa ili uruhusu miundo zaidi ya HDR Angalia mipangilio ya TV yako ili uone ikiwa hali hii inatumika."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Hali hii inatumia %1$s. Kwenye baadhi ya TV, huenda ukahitaji kuwasha HDMI Iliyoboreshwa ili kuwasha miundo zaidi ya HDR. Angalia mipangilio ya TV yako ili uone ikiwa hali hii inatumika."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Ghairi"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Sawa"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (Hz <xliff:g id="REFRESH_RATE">%2$s</xliff:g>)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (Hz <xliff:g id="REFRESH_RATE">%2$s</xliff:g>)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Ungependa kufuta data iliyo kwenye akiba?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Hii itafuta data iliyo kwenye akiba ya programu zote."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Kifaa hiki kinadhibitiwa na shirika lako."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Kifaa hiki kinasimamiwa na <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Pata maelezo zaidi"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Programu ya kamera}other{Programu za kamera}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Programu ya kalenda"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Tafadhali thibitisha ili uzuie skrini isizime unapotazama maudhui, hatua ambayo huenda ikaongeza kiwango cha nishati inayotumika."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Wakati hakitumiki"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Wakati unatazama"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Zima kiotomatiki"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Zima kiotomatiki wakati hakitumiki"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Zima kiotomatiki unapotazama"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Zima televisheni kiotomatiki"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Zima televisheni kiotomatiki wakati haitumiki"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Zima televisheni kiotomatiki wakati unatazama"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Kipima muda cha \"Wakati hakitumiki\" ni lazima kiwe kifupi zaidi ya kipima muda cha \"Wakati unatazama\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Kipima muda cha \"Wakati unatazama\" ni lazima kiwe kirefu zaidi ya kipima muda cha \"Wakati hakitumiki\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Dhibiti muunganisho wa mtandao katika hali tuli"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Mipangilio inayotumika unapowasha"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Weka upya"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Msimbo wa kuoanisha wa ethaneti"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Hali za Nishati"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Boresha ufanisi wa nishati wakati TV haitumiki"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Huwasha:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Kumbuka kuwa hali hii inaweza kuongeza utumiaji wa nishati kwenye kifaa."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Washa \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/Settings/res/values-ta/energy-modes.xml b/Settings/res/values-ta/energy-modes.xml
deleted file mode 100644
index c6b05b85d..000000000
--- a/Settings/res/values-ta/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"அத்தியாவசிய நெட்வொர்க் அம்சங்கள்"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"குறைவான மின்சார உபயோகம்"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"டிவி உபயோகத்தில் இல்லாதபோது நெட்வொர்க் இணைப்பை முடக்கும்."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"முக்கிய அறிவிப்புகளும் செயல்பாடுகளும்"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"பரிந்துரைக்கப்படும் நெட்வொர்க் அம்சங்கள்"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"மேம்படுத்தப்பட்ட மின்சார உபயோகம்"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"நெட்வொர்க் வழியாக டிவியை எழுப்பும் அம்சங்களை இயக்கும் (நெட்வொர்க் மின்சாரச் சேமிப்பு)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"கூடுதல் நெட்வொர்க் அம்சங்கள்"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"அதிக மின்சார உபயோகம்"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"பரிந்துரைக்கப்படும் அம்சங்கள் மட்டுமின்றி, டிவி உபயோகத்தில் இல்லாதபோது கூடுதல் அம்சங்களை இந்த விருப்பத்தேர்வு இயக்கும். இது மின்சார உபயோகத்தை அதிகரிக்கக்கூடும்."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-ta/strings.xml b/Settings/res/values-ta/strings.xml
index 9ebfee915..12446285a 100644
--- a/Settings/res/values-ta/strings.xml
+++ b/Settings/res/values-ta/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"காப்புப்பிரதி &amp; மீட்டெடுத்தல்"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"தரவின் ஆரம்பநிலை மீட்டமைப்பு"</string>
     <string name="device_calibration" msgid="2907914144048739705">"அளவுக்குறியீடு"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"ஆஃப் செய்வதற்கான டைமர்"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"டிவியை ஆஃப் செய்வதற்கான டைமர்களை அமைத்து மின்சாரத்தைச் சேமிக்கலாம்"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"பவர் &amp; எனர்ஜி"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"சுற்றுச்சூழல் அமைப்புகள்"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"சாதனங்கள்"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"வடிவங்களைத் தேர்ந்தெடுக்கவும்"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"மேம்பட்ட ஒலி அமைப்புகள்"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"கேம் பயன்முறையை அனுமதி"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"உள்ளடக்கத்திற்குப் பொருந்தும் டைனமிக் வரம்பு"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"இந்த விருப்பத்தை இயக்கும்போது, உள்ளடக்கத்துடன் பொருந்துவதற்காகப் பல்வேறு டைனமிக் வரம்பு வடிவங்களுக்கிடையே இந்த அமைப்பு மாறும். வடிவங்களுக்கிடையே மாறும்போது திரை கருப்பாக மாறக்கூடும்.\n\nகூடுதல் டைனமிக் வரம்பு விருப்பங்கள் காட்டப்பட, மேம்பட்ட காட்சி அமைப்புகளைக் கிளிக் செய்யவும்."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"விருப்பமான டைனமிக் வரம்பு"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"சிஸ்டம் பரிந்துரைக்கும் வடிவமைப்பு மாற்றம்"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"வடிவமைப்பு மாற்றத்தை நிர்வகிக்க சிஸ்டத்தை அனுமதிக்கும்"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"இந்த விருப்பம் தேர்ந்தெடுக்கப்பட்டிருக்கும்போது, உங்கள் டிஸ்ப்ளேக்கு அனுப்ப வேண்டிய பொருத்தமான டைனமிக் ரேஞ்சை சிஸ்டம் தீர்மானிக்கும். அதன் பிறகு, தேவைக்கேற்ப இந்த டைனமிக் ரேஞ்சிற்கு உள்ளடக்கத்தை மாற்றும்."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"எப்போதும் உள்ளடக்கத்தின் வடிவமைப்போடு பொருந்தும்"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"வடிவமைப்பை மாற்றுதல்"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"விருப்பமான வடிவமைப்பிற்கு மாற்றும்"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"விருப்பமான வடிவமைப்பிற்கு மாற்றும். வடிவமைப்பை மாற்றுவது காட்சிப் பயன்முறையிலோ HDR வடிவத்திலோ உள்ள மற்ற அமைப்புகளில் மாற்றத்தை ஏற்படுத்தக்கூடும்."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"எப்போதும் SDR வடிவமைப்பிற்கு மாற்றுதல்"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"எப்போதும் <xliff:g id="HDR_TYPE">%s</xliff:g> வடிவமைப்பிற்கு மாற்றுதல்"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"HDR அவுட்புட்டை மாற்ற வேண்டுமா?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"இயல்பாக, <xliff:g id="HDR_TYPE">%s</xliff:g> வடிவமைப்பிற்கு மாற்றப்படும்."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"உங்கள் டிஸ்ப்ளே 1080பி. 60Hz தெளிவுத்திறனில் இயங்கும். 4k 60Hz தெளிவுத்திறனில் இயங்கும்போது உங்கள் டிஸ்பிளேயுடன் இந்த விருப்பம் இணக்கமாக இருக்காது."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"தற்போதுள்ள தெளிவுத்திறனில் Dolby Vision ஆதரிக்கப்படவில்லை. நீங்களே நேரடியாக Dolby Visionனை இயக்கினால், உங்கள் திரையின் தெளிவுத்திறன் 1080p 60Hz என்பதற்கு மாற்றப்படும்"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"1080p 60Hz தெளிவுத்திறனுக்கு மாற்றவா?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"எப்போதும் Dolby Vision வடிவத்திற்கு மாற்று"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"மேம்பட்ட காட்சி அமைப்புகளில் \'HDR வடிவங்கள்\' என்பதில் Dolby Vision முடக்கப்பட்டிருந்தால், வடிவத்தை Dolby Visionனுக்கு மாற்றும்பட்சத்தில் அது மீண்டும் இயக்கப்படும்."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"எப்போதும் HDR10 வடிவத்திற்கு மாற்று"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"மேம்பட்ட காட்சி அமைப்புகளில் \'HDR வடிவங்கள்\' என்பதில் HDR10 முடக்கப்பட்டிருந்தால், வடிவத்தை HDR10க்கு மாற்றும்பட்சத்தில் அது மீண்டும் இயக்கப்படும்."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"எப்போதும் HLG வடிவத்திற்கு மாற்று"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"மேம்பட்ட காட்சி அமைப்புகளில் \'HDR வடிவங்கள்\' என்பதில் HLG முடக்கப்பட்டிருந்தால், வடிவத்தை HLGக்கு மாற்றும்பட்சத்தில் அது மீண்டும் இயக்கப்படும்."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"எப்போதும் HDR10+ வடிவத்திற்கு மாற்று"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"மேம்பட்ட காட்சி அமைப்புகளில் \'HDR வடிவங்கள்\' என்பதில் HDR10+ முடக்கப்பட்டிருந்தால், வடிவத்தை HDR10+க்கு மாற்றும்பட்சத்தில் அது மீண்டும் இயக்கப்படும்."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"எப்போதும் SDR வடிவத்திற்கு மாற்று"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"வடிவத்தை SDRருக்கு மாற்றினால், மேம்பட்ட காட்சி அமைப்புகளில் \'HDR வடிவங்கள்\' என்பதில் இருக்கும் அனைத்து வடிவங்களும் முடக்கப்படும்."</string>
-    <string name="match_content_frame_rate_title" msgid="153291168560947689">"வீடியோவின் ஃபிரேம் வீதத்துடன் பொருத்துதல்"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"தடையற்றவை மட்டும்"</string>
+    <string name="match_content_frame_rate_title" msgid="153291168560947689">"வீடியோவின் ஃபிரேம் வீதத்தைப் பொருத்து"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"தடையற்ற ஒளிபரப்பு"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"ஆப்ஸ் கோரினால், டிவியில் தடையற்ற ஒளிபரப்புக்கான வசதி இருந்தால் மட்டுமே நீங்கள் பார்த்துக் கொண்டிருக்கும் வீடியோவின் அசல் ஃபிரேம் வீதத்துடன் திரையின் ஃபிரேமை உங்கள் சாதனம் பொருத்தும்."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"இணைக்கப்பட்ட உங்கள் டிஸ்பிளேயில் \'புதுப்பிக்கும் விகிதத்தைத்\' தடையின்றி மாற்றுவதற்கான வசதியில்லை. இந்த வசதியுள்ள டிஸ்பிளேயுடன் இணைக்காதபட்சத்தில் இந்த விருப்பத்தைப் பயன்படுத்த முடியாது."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"எப்போதும்"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"எப்போதும் தடையற்ற ஒளிபரப்பு"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"ஆப்ஸ் கோரினால், நீங்கள் பார்த்துக் கொண்டிருக்கும் வீடியோவின் அசல் ஃபிரேம் வீதத்துடன் திரையின் ஃபிரேமை உங்கள் சாதனம் பொருத்தும். இதனால், வீடியோவின் இயக்கத்திலிருந்து வெளியேறும்போதோ உள்நுழையும்போதோ திரை ஒரு நொடி மறைந்து தெரியக்கூடும்."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"ஒருபோதும் வேண்டாம்"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"நீங்கள் பார்த்துக் கொண்டிருக்கும் வீடியோவின் அசல் ஃபிரேம் வீதத்துடன் திரையின் ஃபிரேமைப் பொருத்துவதற்கு ஆப்ஸே கோரினாலும் அதை உங்கள் சாதனம் ஒருபோதும் முயற்சிக்காது."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"தெளிவுத்திறனை %1$sக்கு மாற்றவா?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"இப்போதிலிருந்து %1$s தெளிவுத்திறனைப் பயன்படுத்த \"சரி\" என்பதைத் தேர்ந்தெடுக்கவும்."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s பயன்முறையில் Dolby Vision ஆதரிக்கப்படவில்லை, எனவே \"மேம்பட்ட காட்சி அமைப்புகளில்\" இது முடக்கப்படும்"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"இந்தப் பயன்முறையை இதில் பயன்படுத்தலாம்: %1$s\nசில டிவிகளில், கூடுதல் HDR வடிவமைப்புகளை இயக்க மேம்படுத்தப்பட்ட HDMIயை இயக்க வேண்டியிருக்கலாம். இதைப் பயன்படுத்த முடிகிறதா என்பதைத் தெரிந்துகொள்ள உங்கள் TV அமைப்புகளைப் பார்க்கவும்."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"%1$s வகையை இந்தப் பயன்முறை ஆதரிக்கும். சில டிவிகளில், கூடுதல் HDR வடிவமைப்புகளை இயக்க மேம்படுத்தப்பட்ட HDMIயை இயக்க வேண்டியிருக்கலாம். இது ஆதரிக்கப்படுகிறதா என்று பார்க்க உங்கள் TV அமைப்புகளைச் சரிபார்க்கவும்."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"ரத்துசெய்"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"சரி"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"தற்காலிகச் சேமிப்பு தரவை அழிக்கவா?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"இது, எல்லா ஆப்ஸின் தற்காலிகச் சேமிப்பு தரவை அழிக்கும்."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"இந்தச் சாதனத்தை உங்கள் நிறுவனம் நிர்வகிக்கிறது."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"இந்தச் சாதனத்தை நிர்வகிப்பது: <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" U+0020"</string>
     <string name="learn_more" msgid="820336467414665686">"மேலும் அறிக"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{கேமரா ஆப்ஸ்}other{கேமரா ஆப்ஸ்}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"கேலெண்டர் ஆப்ஸ்"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"எனர்ஜியின் பயன்பாடு அதிகரிக்கக்கூடும் என்பதால் பார்த்துக்கொண்டிருக்கும்போது திரை முடக்கப்படுவதைத் தடுக்க வேண்டுமா என்பதை உறுதிசெய்யுங்கள்."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"செயல்பாட்டில் இல்லாதபோது"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"பார்க்கும்போது"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"தானாக ஆஃப் ஆகும்"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"செயலற்ற நிலையில் இருக்கும்போது தானாக ஆஃப் ஆகும்"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"பார்த்துக் கொண்டிருக்கும்போது தானாக ஆஃப் ஆகும்"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"டிவியைத் தானாக ஆஃப் செய்தல்"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"டிவி செயலில் இல்லாதபோது தானாகவே ஆஃப் செய்தல்"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"டிவி பார்க்கும்போது தானாகவே ஆஃப் செய்தல்"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"செயலில் இல்லை\" எனும் டைமர் \"பார்க்கும்போது\" எனும் டைமரை விட குறைவான நேரம் இருக்க வேண்டும்"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"பார்க்கும்போது\" எனும் டைமர் \"செயலில் இல்லை\" எனும் டைமரை விட நீண்ட நேரம் இருக்க வேண்டும்"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"காத்திருப்பில் நெட்வொர்க் இணைப்பு வரம்பு"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"பவர் ஆனில் இருக்கும்போது செயல்பாடு"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"மீட்டமைத்தல்"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"ஈதர்நெட் இணைத்தல் குறியீடு"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"மின்சாரப் பயன்முறைகள்"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"டிவி உபயோகத்தில் இல்லாதபோது மின்சாரச் சேமிப்பை அதிகரிக்கும்"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"இவற்றை இயக்கும்:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"இந்தப் பயன்முறை சாதனத்தின் மின்சார உபயோகத்தை அதிகரிக்கக்கூடும் என்பதை நினைவில் கொள்ளுங்கள்."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" பயன்முறையை இயக்குதல்"</string>
 </resources>
diff --git a/Settings/res/values-te/energy-modes.xml b/Settings/res/values-te/energy-modes.xml
deleted file mode 100644
index 494e7b2d3..000000000
--- a/Settings/res/values-te/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"అవసరమైన నెట్‌వర్క్ ఫీచర్స్"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"తగ్గిన ఎనర్జీ వినియోగం"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"టీవీ ఉపయోగంలో లేనప్పుడు నెట్‌వర్క్ కనెక్షన్‌ను ఆఫ్ చేయండి."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"క్లిష్టమైన అప్‌డేట్‌లు, ఫంక్షన్‌లు"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"సిఫార్సు చేసిన నెట్‌వర్క్ ఫీచర్‌లు"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ఆప్టిమైజ్ చేసిన శక్తి వినియోగం"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"నెట్‌వర్క్ (నెట్‌వర్క్ గల స్టాండ్‌బై)లో టీవీని మేల్కొలిపే ఫీచర్‌లను ఆన్ చేస్తుంది."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"అదనపు నెట్‌వర్క్ ఫీచర్స్"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"పెరిగిన ఎనర్జీ వినియోగం"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"సిఫార్సు చేసిన ఫీచర్‌లకు అదనంగా, టీవీ వినియోగంలో లేనప్పుడు ఈ ఆప్షన్ అదనపు ఫీచర్‌లను ఆన్ చేస్తుంది, అది శక్తి వినియోగాన్ని పెంచుతుంది."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-te/strings.xml b/Settings/res/values-te/strings.xml
index b38aaf156..ff9b00b85 100644
--- a/Settings/res/values-te/strings.xml
+++ b/Settings/res/values-te/strings.xml
@@ -108,12 +108,12 @@
     <string name="device_sound_effects" msgid="2000295001122684957">"సిస్టమ్ ధ్వనులు"</string>
     <string name="device_apps" msgid="2134756632245008919">"అప్లికేషన్‌లు"</string>
     <string name="device_storage" msgid="8540243547121791073">"స్టోరేజ్"</string>
-    <string name="device_reset" msgid="6115282675800077867">"ఫ్యాక్టరీ రీసెట్ చేయండి"</string>
+    <string name="device_reset" msgid="6115282675800077867">"ఫ్యాక్టరీ రీసెట్ చేయి"</string>
     <string name="device_backup_restore" msgid="3634531946308269398">"బ్యాకప్ &amp; రీస్టోర్"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"ఫ్యాక్టరీ డేటా రీసెట్"</string>
     <string name="device_calibration" msgid="2907914144048739705">"క్రమాంకనం"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"టైమర్‌ను ఆఫ్ చేయండి"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"టీవీని ఆఫ్ చేయడానికి, ఎనర్జీని ఆదా చేయడానికి టైమర్‌లను సెట్ చేయండి"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"పవర్ &amp; ఎనర్జీ"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"ఎకో సెట్టింగ్‌లు"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"పరికరాలు"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"ఫార్మాట్‌లను ఎంచుకోండి"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"అధునాతన సౌండ్ సెట్టింగ్‌లు"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"గేమ్ మోడ్‌ను అనుమతించండి"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"కంటెంట్ డైనమిక్ పరిధిని మ్యాచ్ చేయండి"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"ఈ ఆప్షన్‌ను ఎనేబుల్ చేసినప్పుడు, సిస్టమ్ కంటెంట్‌తో మ్యాచ్ అవడానికి వివిధ డైనమిక్ రేంజ్ ఫార్మాట్‌ల మధ్య స్విచ్ అవుతుంది. ఇది ఫార్మాట్ స్విచ్ సమయంలో నలుపు రంగు స్క్రీన్‌కు కారణం కావచ్చు.\n\nమరిన్ని డైనమిక్ పరిధి ఆప్షన్‌ల కోసం అధునాతన డిస్‌ప్లే సెట్టింగ్‌లను క్లిక్ చేయండి."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"ప్రాధాన్యమైన డైనమిక్ పరిధి"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"సిస్టమ్ ప్రాధాన్య మార్పిడి"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"ఫార్మాట్ మార్పిడిని సిస్టమ్ నిర్వహించేలా చేస్తుంది"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"ఈ ఆప్షన్‌ను ఎంచుకున్నప్పుడు, సిస్టమ్ మీ డిస్‌ప్లేకు పంపడానికి తగిన డైనమిక్ పరిధిని నిర్ణయిస్తుంది అలాగే అవసరమైన విధంగా కంటెంట్‌ను ఈ డైనమిక్ పరిధికి మారుస్తుంది."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"ఎల్లప్పుడూ కంటెంట్ ఫార్మాట్‌ను మ్యాచ్ చేస్తుంది"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"నిర్బంధ మార్పిడి"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"మార్పిడిని నిర్బంధంగా ప్రాధాన్య ఫార్మాట్‌కి చేస్తుంది"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"ప్రాధాన్య ఫార్మాట్‌కి నిర్బంధంగా మార్చండి. నిర్బంధ మార్పిడి చేయడం వలన డిస్‌ప్లే మోడ్ లేదా HDR ఫార్మాట్‌లోని ఇతర సెట్టింగ్‌లు ప్రభావితం కావచ్చు."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"ఎల్లవేళలా SDRకి"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"ఎల్లవేళలా <xliff:g id="HDR_TYPE">%s</xliff:g>కి"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"మీరు HDR అవుట్‌పుట్‌ను నిర్బంధంగా చేయాలనుకుంటున్నారా?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"ఆటోమేటిక్‌గా మార్పిడి నిర్బంధంగా <xliff:g id="HDR_TYPE">%s</xliff:g>కి అవుతుంది."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"మీ డిస్‌ప్లే 1080p 60Hz రిజల్యూషన్‌తో రన్ అవుతుంది.‌ 4k 60Hz రిజల్యూషన్‌లో రన్ అవుతున్నప్పుడు ఈ ఎంపిక మీ డిస్‌ప్లేకి అనుకూలంగా ఉండదు."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"ప్రస్తుత రిజల్యూషన్‌లో Dolby Visionకు సపోర్ట్ లేదు. మీరు Dolby Visionను మాన్యువల్‌గా ఎనేబుల్ చేస్తే, మీ డిస్‌ప్లే రిజల్యూషన్ 1080p 60Hzకు మార్చబడుతుంది"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"రిజల్యూషన్‌ను 1080p 60Hzకు మార్చాలా?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"ఎల్లప్పుడూ Dolby Visionకు నిర్బంధంగా మార్పిడి చేయండి"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"అధునాతన డిస్‌ప్లే సెట్టింగ్‌లలో HDR ఫార్మాట్‌లలోని Dolby Vision డిసేబుల్ చేయబడితే, దానిని Dolby Visionకు నిర్బంధ మార్పిడి చేయడం వలన అది మళ్లీ ఎనేబుల్ చేయబడుతుంది."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"ఎల్లప్పుడూ HDR10కు నిర్బంధంగా మార్పిడి చేయండి"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"అధునాతన డిస్‌ప్లే సెట్టింగ్‌లలో HDR ఫార్మాట్‌లలోని HDR10 డిసేబుల్ చేయబడితే, దానిని HDR10కు నిర్బంధ మార్పిడి చేయడం వలన అది మళ్లీ ఎనేబుల్ చేయబడుతుంది."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"ఎల్లప్పుడూ HDRకు నిర్బంధంగా మార్పిడి చేయండి"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"అధునాతన డిస్‌ప్లే సెట్టింగ్‌లలో HDR ఫార్మాట్‌లలోని HDR డిసేబుల్ చేయబడితే, దానిని HDR నిర్బంధ మార్పిడి చేయడం వలన అది మళ్లీ ఎనేబుల్ చేయబడుతుంది."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"ఎల్లప్పుడూ HDR10+కు నిర్బంధంగా మార్పిడి చేయండి"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"అధునాతన డిస్‌ప్లే సెట్టింగ్‌లలో HDR ఫార్మాట్‌లలోని HDR10+ డిసేబుల్ చేయబడితే, దానిని HDR10+కు నిర్బంధ మార్పిడి చేయడం వలన అది మళ్లీ ఎనేబుల్ చేయబడుతుంది."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"ఎల్లప్పుడూ SDRకు నిర్బంధంగా మార్పిడి చేయండి"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"SDRకి నిర్బంధ మార్పిడి చేయడం వలన అధునాతన డిస్‌ప్లే సెట్టింగ్‌లలో HDR ఫార్మాట్‌లలోని అన్ని ఫార్మాట్‌లు డిజేబుల్ చేయబడతాయి."</string>
-    <string name="match_content_frame_rate_title" msgid="153291168560947689">"కంటెంట్ ఫ్రేమ్ రేట్‌‌ను మ్యాచ్ చేయడం"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"అంతరాయం లేని ట్రాన్సిషన్ మాత్రమే"</string>
+    <string name="match_content_frame_rate_title" msgid="153291168560947689">"మ్యాచ్ కంటెంట్ ఫ్రేమ్ రేట్"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"సీమ్‌లెస్"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"యాప్ ఒకవేళ దాని కోసం రిక్వెస్ట్ చేసినా, మీ టీవీ సీమ్‌లెస్ ట్రాన్సిషన్‌ను అమలు చేయగలిగినప్పుడు మాత్రమే, మీరు చూస్తున్న కంటెంట్ యొక్క ఒరిజినల్ ఫ్రేమ్ రేట్‌తో మీ పరికరం దాని అవుట్‌పుట్‌ను మ్యాచ్ చేస్తుంది."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"కనెక్ట్ చేయబడిన మీ డిస్‌ప్లే ఆటంకాలు లేని రిఫ్రెష్ రేటు మార్పిడులను సపోర్ట్ చేయదు. దానిని సపోర్ట్ చేసే డిస్‌ప్లేకు మీరు మారితే మినహా ఈ ఆప్షన్ ఎటువంటి ప్రభావాన్ని చూపదు."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"ఎల్లప్పుడూ"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"నాన్-సీమ్‌లెస్"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"యాప్ దానిని రిక్వెస్ట్ చేస్తే, మీ పరికరం దాని అవుట్‌పుట్‌ను మీరు చూస్తున్న కంటెంట్‌కు సంబంధించిన ఒరిజినల్ ఫ్రేమ్ రేట్‌తో మ్యాచ్ చేస్తుంది. వీడియో ప్లేబ్యాక్ నుండి నిష్క్రమించేటప్పుడు లేదా ప్రవేశించేటప్పుడు మీ స్క్రీన్ ఒక సెకను బ్లాంక్ కావచ్చు."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"ఎప్పుడూ వద్దు"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"యాప్ దానిని రిక్వెస్ట్ చేసినప్పటికీ, మీ పరికరం దాని అవుట్‌పుట్‌ను మీరు చూస్తున్న కంటెంట్‌కు సంబంధించిన ఒరిజినల్ ఫ్రేమ్ రేట్‌తో మ్యాచ్ చేయడానికి ట్రై చేయదు."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"రిజల్యూషన్‌ను %1$s‌కు మార్చాలా?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"ఇప్పటి నుండి %1$s రిజల్యూషన్‌ను ఉపయోగించడానికి \'సరే\'ను ఎంచుకోండి."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s‌లో Dolby Vision సపోర్ట్ చేయదు, \"అధునాతన డిస్‌ప్లే సెట్టింగ్‌ల\"లో అది డిజేబుల్ చేయబడుతుంది"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"ఈ మోడ్ ఈ కింది వాటికి సపోర్ట్ చేస్తుంది: %1$s\nకొన్ని టీవీలలో, మరిన్ని HDR ఫార్మాట్‌లను ఎనేబుల్ చేయడానికి, మీరు మెరుగుపరిచిన HDMIని ఆన్ చేయవలసి రావచ్చు. ఇది సపోర్ట్ చేస్తుందో, లేదో చూడటానికి మీ టీవీ సెట్టింగ్‌లను చెక్ చేయండి."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"ఈ మోడ్ %1$s‌ను సపోర్ట్ చేస్తోంది. కొన్ని టీవీలలో, మరిన్ని HDR ఫార్మాట్‌లను ఎనేబుల్ చేయడానికి, మీరు మెరుగుపరిచిన HDMIని ఆన్ చేయవలసి రావచ్చు. ఇది సపోర్ట్ చేస్తుందో, లేదో చూడటానికి మీ టీవీ సెట్టింగ్‌లను చెక్ చేయండి."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"రద్దు చేయండి"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"సరే"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"కాష్ చేసిన డేటాను తీసివేయాలా?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"ఇది అన్ని అను. కాష్ చేసిన డేటాను తీసివేస్తుంది."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -265,13 +238,13 @@
     <string name="bluetooth_official_remote_entry_title" msgid="6699700335229570038">"రిమోట్ కంట్రోల్ సెట్టింగ్‌లు"</string>
     <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"రిమోట్ బటన్‌లను సెటప్ చేయండి"</string>
     <string name="bluetooth_ir_entry_subtitle" msgid="4606207128353416151">"వాల్యూమ్, పవర్, టీవీలలో ఇన్‌పుట్, రిసీవర్‌లు అలాగే సౌండ్‌బార్‌లను కంట్రోల్ చేయండి"</string>
-    <string name="bluetooth_connect_action_title" msgid="7715342395313781643">"కనెక్ట్ చేయండి"</string>
+    <string name="bluetooth_connect_action_title" msgid="7715342395313781643">"కనెక్ట్ చేయి"</string>
     <string name="bluetooth_connect_confirm" msgid="4769958536295137386">"%1$sకు కనెక్ట్ అవ్వండి"</string>
     <string name="bluetooth_disconnect_action_title" msgid="1135513009197728480">"డిస్‌కనెక్ట్ చేయి"</string>
     <string name="bluetooth_disconnect_confirm" msgid="1445977623973613581">"%1$s నుండి డిస్‌కనెక్ట్ చేయండి"</string>
-    <string name="bluetooth_rename_action_title" msgid="4200419902722729907">"పేరు మార్చండి"</string>
+    <string name="bluetooth_rename_action_title" msgid="4200419902722729907">"పేరు మార్చు"</string>
     <string name="bluetooth_rename" msgid="7791922876280337194">"కనెక్ట్ చేసిన మీ పరికరం పేరు మార్చండి"</string>
-    <string name="bluetooth_forget_action_title" msgid="2351140076684719196">"విస్మరించండి"</string>
+    <string name="bluetooth_forget_action_title" msgid="2351140076684719196">"విస్మరించు"</string>
     <string name="bluetooth_forget_confirm" msgid="5175414848391021666">"%1$sను విస్మరించండి"</string>
     <string name="bluetooth_serial_number_label" msgid="6639294603220209971">"బ్లూటూత్ అడ్రస్"</string>
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"కనెక్ట్ చేయబడింది"</string>
@@ -302,7 +275,7 @@
     <string name="disabled_by_administrator_summary" msgid="3420979957115426764">"అందుబాటులో లేదు"</string>
     <string name="manage_device_admin" msgid="5714217234035017983">"పరికర నిర్వాహకుల యాప్‌లు"</string>
     <string name="number_of_device_admins_none" msgid="2734299122299837459">"యాక్టివ్‌గా ఉన్న యాప్‌లు లేవు"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="108190334043671416">"నిర్వాహకులు, ఎన్‌క్రిప్షన్ విధానం లేదా ఆధారాల స్టోరేజ్‌ ద్వారా నిలిపివేయబడింది"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="108190334043671416">"నిర్వాహకులు, ఎన్‌క్రిప్షన్ విధానం లేదా ఆధారాల నిల్వ ద్వారా నిలిపివేయబడింది"</string>
     <string name="enterprise_privacy_settings" msgid="8226765895133003202">"నిర్వహించబడిన పరికర సమాచారం"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5719549523275019419">"మీ సంస్థ నిర్వహిస్తున్న మార్పులు &amp; సెట్టింగ్‌లు"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="2866704039759872293">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> నిర్వహిస్తున్న మార్పులు &amp; సెట్టింగ్‌లు"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"ఈ పరికరాన్ని మీ సంస్థ నిర్వహిస్తోంది."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"ఈ పరికరం <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ద్వారా నిర్వహించబడుతోంది."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"మరింత తెలుసుకోండి"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{కెమెరా యాప్}other{కెమెరా యాప్‌లు}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"క్యాలెండర్ యాప్"</string>
@@ -472,7 +446,7 @@
     <string name="wifi_action_view_available_networks" msgid="609561604257828342">"అందుబాటులో ఉన్న నెట్‌వర్క్‌లను చూడండి"</string>
     <string name="wifi_connecting" msgid="4234341255109283018">"<xliff:g id="SSID">%1$s</xliff:g>కి కనెక్ట్ చేస్తోంది"</string>
     <string name="wifi_saving" msgid="320653339670641708">"<xliff:g id="SSID">%1$s</xliff:g> కాన్ఫిగరేషన్‌ను సేవ్ చేస్తోంది"</string>
-    <string name="wifi_connect" msgid="2206086690065242121">"కనెక్ట్ చేయండి"</string>
+    <string name="wifi_connect" msgid="2206086690065242121">"కనెక్ట్ చేయి"</string>
     <string name="wifi_forget_network" msgid="4634016112624305571">"నెట్‌వర్క్‌ను విస్మరించు"</string>
     <string name="wifi_forget_network_description" msgid="4146715475962713899">"ఇది సేవ్ చేసిన పాస్‌వర్డ్‌తో సహా ఈ నెట్‌వర్క్‌కి కనెక్ట్ చేయడా. ఉపయో. సమాచారాన్ని క్లియర్ చేస్తుంది"</string>
     <string name="wifi_scan_qr_code_description" msgid="6620444691131671132">" మీ మొబైల్ ఫోన్‌లో QR కోడ్‌ను స్కాన్ చేయడం ద్వారా Wi-Fiకి కనెక్ట్ అవండి, సూచనను ఫాలో చేయండి.\n \n Android ఫోన్ "<b>"లో"</b>" సెట్టింగ్‌లు -&gt; నెట్‌వర్క్ &amp; ఇంటర్నెట్ -&gt; Wi-Fiకి వెళ్లండి -&gt; Wi-Fi -&gt; అధునాతనంను ఎంచుకోండి -&gt; పరికరాన్ని జోడించి, ఆపై QR కోడ్‌ను స్కాన్ చేయండి."</string>
@@ -536,13 +510,13 @@
     <string name="storage_format_as_public" msgid="6745112917895223463">"డేటాను తొలగించి, తీసివేయదగిన నిల్వగా ఫార్మాట్ చేయి"</string>
     <string name="storage_format_for_private" msgid="5380138334184923252">"పరికర నిల్వగా ఫార్మాట్ చేయి"</string>
     <string name="storage_not_connected" msgid="4327902652748552794">"కనెక్ట్ చేయబడలేదు"</string>
-    <string name="storage_migrate" msgid="9137556600192167701">"డేటాను ఈ స్టోరేజ్‌కు తరలించు"</string>
-    <string name="storage_migrate_away" msgid="7880100961434638430">"డేటాను వేరే స్టోరేజ్‌కు తరలించు"</string>
+    <string name="storage_migrate" msgid="9137556600192167701">"డేటాను ఈ నిల్వకు తరలించు"</string>
+    <string name="storage_migrate_away" msgid="7880100961434638430">"డేటాను వేరే నిల్వకు తరలించు"</string>
     <string name="storage_no_apps" msgid="95566375753627272">"బ్యాకప్ చేయడానికి యాప్‌లు ఏవీ లేవు"</string>
     <string name="storage_forget" msgid="4671975563260507003">"ఈ పరికర నిల్వను విస్మరించు"</string>
-    <string name="storage_forget_wall_of_text" msgid="230454348256179142">"ఈ డ్రైవ్ కలిగి ఉన్న యాప్‌లు లేదా డేటాను ఉపయోగించడానికి, దాన్ని మళ్లీ చొప్పించండి. డ్రైవ్ అందుబాటులో లేకపోతే ప్రత్యామ్నాయంగా మీరు ఈ స్టోరేజ్‌ను విస్మరించేలా ఎంచుకోవచ్చు.\n\nమీరు విస్మరించాలని ఎంచుకుంటే, డ్రైవ్‌లో ఉన్న మొత్తం డేటాను శాశ్వతంగా కోల్పోతారు.\n\nమీరు తర్వాత యాప్‌లను మళ్లీ ఇన్‌స్టాల్ చేయవచ్చు, కానీ ఈ డ్రైవ్‌లో స్టోరేజ్‌ చేసిన వాటి డేటాను కోల్పోతారు."</string>
-    <string name="storage_device_storage_section" msgid="22958375769694027">"పరికర స్టోరేజ్‌"</string>
-    <string name="storage_removable_storage_section" msgid="280332107650735088">"తీసివేయదగిన స్టోరేజ్‌"</string>
+    <string name="storage_forget_wall_of_text" msgid="230454348256179142">"ఈ డ్రైవ్ కలిగి ఉన్న యాప్‌లు లేదా డేటాను ఉపయోగించడానికి, దాన్ని మళ్లీ చొప్పించండి. డ్రైవ్ అందుబాటులో లేకపోతే ప్రత్యామ్నాయంగా మీరు ఈ నిల్వను విస్మరించేలా ఎంచుకోవచ్చు.\n\nమీరు విస్మరించాలని ఎంచుకుంటే, డ్రైవ్‌లో ఉన్న మొత్తం డేటాను శాశ్వతంగా కోల్పోతారు.\n\nమీరు తర్వాత యాప్‌లను మళ్లీ ఇన్‌స్టాల్ చేయవచ్చు, కానీ ఈ డ్రైవ్‌లో నిల్వ చేసిన వాటి డేటాను కోల్పోతారు."</string>
+    <string name="storage_device_storage_section" msgid="22958375769694027">"పరికర నిల్వ"</string>
+    <string name="storage_removable_storage_section" msgid="280332107650735088">"తీసివేయదగిన నిల్వ"</string>
     <string name="storage_reset_section" msgid="3896575204828589494">"రీసెట్ చేయండి"</string>
     <string name="storage_free_up" msgid="5719667150891467122">"స్టోరేజ్‌ను ఖాళీ చేయండి"</string>
     <string name="storage_free_up_clear_cached_data" msgid="858596875459698634">"కాష్ చేసిన డేటాను క్లియర్ చేయండి"</string>
@@ -560,9 +534,9 @@
     <string name="storage_format_success" msgid="5599914756144012286">"<xliff:g id="NAME">%1$s</xliff:g> ఫార్మాట్ చేయబడింది"</string>
     <string name="storage_format_failure" msgid="5619442934314277332">"<xliff:g id="NAME">%1$s</xliff:g>ని ఫార్మాట్ చేయలేకపోయింది"</string>
     <string name="storage_wizard_format_as_private_title" msgid="7985715762649933211">"పరికర నిల్వగా ఫార్మాట్ చేయి"</string>
-    <string name="storage_wizard_format_as_private_description" msgid="6143406934742456154">"ఇందుకోసం USB డ్రైవ్‌ని సురక్షితంగా ఉంచడానికి దాన్ని ఫార్మాట్ చేయడం అవసరం. సురక్షితంగా ఫార్మాట్ చేసిన తర్వాత, ఈ డ్రైవ్ ఈ పరికరంతో మాత్రమే పని చేస్తుంది. ఫార్మాట్ చేస్తే ప్రస్తుతం డ్రైవ్‌లో స్టోరేజ్‌ చేయబడిన మొత్తం డేటా తొలగించబడుతుంది. డేటాను కోల్పోకుండా నివారించడం కోసం దాన్ని బ్యాకప్ చేయడానికి చూడండి."</string>
+    <string name="storage_wizard_format_as_private_description" msgid="6143406934742456154">"ఇందుకోసం USB డ్రైవ్‌ని సురక్షితంగా ఉంచడానికి దాన్ని ఫార్మాట్ చేయడం అవసరం. సురక్షితంగా ఫార్మాట్ చేసిన తర్వాత, ఈ డ్రైవ్ ఈ పరికరంతో మాత్రమే పని చేస్తుంది. ఫార్మాట్ చేస్తే ప్రస్తుతం డ్రైవ్‌లో నిల్వ చేయబడిన మొత్తం డేటా తొలగించబడుతుంది. డేటాను కోల్పోకుండా నివారించడం కోసం దాన్ని బ్యాకప్ చేయడానికి చూడండి."</string>
     <string name="storage_wizard_format_as_public_title" msgid="3546915348149438389">"డేటా తొలగించి, ఫార్మాట్ చేయి"</string>
-    <string name="storage_wizard_format_as_public_description" msgid="5849129772499352597">"ఫార్మాట్ చేసిన తర్వాత, మీరు ఈ USB డ్రైవ్‌ను ఇతర పరికరాల్లో ఉపయోగించవచ్చు. మొత్తం డేటా తొలగించబడుతుంది. ముందుగా యాప్‌లను మరొక పరికర స్టోరేజ్‌కు తరలించడం ద్వారా బ్యాకప్ చేయండి."</string>
+    <string name="storage_wizard_format_as_public_description" msgid="5849129772499352597">"ఫార్మాట్ చేసిన తర్వాత, మీరు ఈ USB డ్రైవ్‌ను ఇతర పరికరాల్లో ఉపయోగించవచ్చు. మొత్తం డేటా తొలగించబడుతుంది. ముందుగా యాప్‌లను మరొక పరికర నిల్వకు తరలించడం ద్వారా బ్యాకప్ చేయండి."</string>
     <string name="storage_wizard_format_progress_title" msgid="3875906251546380271">"USB డ్రైవ్‌ను ఫార్మాట్ చేస్తోంది…"</string>
     <string name="storage_wizard_format_progress_description" msgid="292229747129805538">"దీనికి కొంత సమయం పట్టవచ్చు. దయచేసి డ్రైవ్‌ను తీసివేయవద్దు."</string>
     <string name="storage_wizard_migrate_choose_title" msgid="8743036821605231654">"డేటాను తరలించాల్సిన నిల్వను ఎంచుకోండి"</string>
@@ -578,8 +552,8 @@
     <string name="storage_wizard_format_slow_summary" msgid="3674023258060474037">"మీరు కొనసాగవచ్చు, కానీ ఈ లొకేషన్‌కు తరలించిన యాప్‌లు మధ్యమధ్యలో ఆటంకాలతో అంత బాగా పని చేయకపోవచ్చు, అలాగే డేటా బదిలీలకు ఎక్కువ సమయం పట్టవచ్చు. మెరుగైన పనితీరు కోసం మరింత వేగవంతమైన డ్రైవ్‌ని ఉపయోగించే అంశాన్ని పరిశీలించండి."</string>
     <string name="storage_wizard_format_action" msgid="3275676687226857170">"ఫార్మాట్ చేయి"</string>
     <string name="storage_wizard_backup_apps_action" msgid="1402199004931596519">"యాప్‌లను బ్యాకప్ చేయి"</string>
-    <string name="storage_wizard_back_up_apps_title" msgid="6225663573896846937">"<xliff:g id="NAME">%1$s</xliff:g>లో స్టోరేజ్‌ చేసిన యాప్‌లు"</string>
-    <string name="storage_wizard_back_up_apps_and_data_title" msgid="7763611380573099978">"<xliff:g id="NAME">%1$s</xliff:g>లో స్టోరేజ్‌ చేసిన యాప్‌లు మరియు డేటా"</string>
+    <string name="storage_wizard_back_up_apps_title" msgid="6225663573896846937">"<xliff:g id="NAME">%1$s</xliff:g>లో నిల్వ చేసిన యాప్‌లు"</string>
+    <string name="storage_wizard_back_up_apps_and_data_title" msgid="7763611380573099978">"<xliff:g id="NAME">%1$s</xliff:g>లో నిల్వ చేసిన యాప్‌లు మరియు డేటా"</string>
     <string name="storage_wizard_back_up_apps_space_available" msgid="5741521038349239359">"<xliff:g id="SIZE">%1$s</xliff:g> అందుబాటులో ఉంది"</string>
     <string name="storage_wizard_eject_private_title" msgid="1336088625197134497">"పరికర నిల్వను తొలగించండి"</string>
     <string name="storage_wizard_eject_private_description" msgid="4341905730016007385">"ఈ పరికర నిల్వను తొలగించినప్పుడు ఇందులోని యాప్‌లు పని చేయకుండా ఆగిపోతాయి. ఈ USB డ్రైవ్ ఈ పరికరంలో మాత్రమే పని చేసేలా ఫార్మాట్ చేయబడింది. ఇది ఇక వేటిలోనూ పని చేయదు."</string>
@@ -588,7 +562,7 @@
     <string name="storage_wizard_move_app_progress_title" msgid="7058465372227392453">"<xliff:g id="NAME">%1$s</xliff:g>ని తరలిస్తోంది…"</string>
     <string name="storage_wizard_move_app_progress_description" msgid="7673347796805764888">"తరలించే సమయంలో డ్రైవ్‌ని తీసివేయవద్దు.\nతరలించడం పూర్తయ్యే వరకు ఈ పరికరంలోని <xliff:g id="APPNAME">%1$s</xliff:g> యాప్‌ అందుబాటులో ఉండదు."</string>
     <string name="storage_wizard_forget_confirm_title" msgid="3709482471888830896">"పరికర నిల్వను విస్మరించాలా?"</string>
-    <string name="storage_wizard_forget_confirm_description" msgid="5896860042525566767">"\'విస్మరించు\' ఎంచుకుంటే ఈ డ్రైవ్‌లో స్టోరేజ్‌ చేసిన మీ మొత్తం డేటాను శాశ్వతంగా కోల్పోతారు. మీరు కొనసాగించాలనుకుంటున్నారా?"</string>
+    <string name="storage_wizard_forget_confirm_description" msgid="5896860042525566767">"\'విస్మరించు\' ఎంచుకుంటే ఈ డ్రైవ్‌లో నిల్వ చేసిన మీ మొత్తం డేటాను శాశ్వతంగా కోల్పోతారు. మీరు కొనసాగించాలనుకుంటున్నారా?"</string>
     <string name="storage_wizard_forget_action" msgid="5609631662522950596">"విస్మరించు"</string>
     <string name="storage_new_title" msgid="4768955281180255038">"USB డ్రైవ్ కనెక్ట్ చేయబడింది"</string>
     <string name="storage_new_action_browse" msgid="3355241742574072658">"బ్రౌజ్ చేయండి"</string>
@@ -597,7 +571,7 @@
     <string name="storage_new_action_eject" msgid="919249291814300000">"తొలగించండి"</string>
     <string name="storage_missing_title" msgid="9068915586235805818">"<xliff:g id="NAME">%1$s</xliff:g> తీసివేయబడింది"</string>
     <string name="storage_missing_description" msgid="6835620703133204249">"డ్రైవ్‌ను మళ్లీ కనెక్ట్ చేసే వరకు కొన్ని యాప్‌లు అందుబాటులో ఉండవు లేదా సరిగ్గా పని చేయవు."</string>
-    <string name="insufficient_storage" msgid="4175940286022466535">"తగినంత స్టోరేజ్‌ స్థలం లేదు."</string>
+    <string name="insufficient_storage" msgid="4175940286022466535">"తగినంత నిల్వ స్థలం లేదు."</string>
     <string name="does_not_exist" msgid="4071082040759146781">"యాప్‌ ఉనికిలో లేదు."</string>
     <string name="invalid_location" msgid="5571789982293787489">"ఇన్‌స్టాల్ లొకేషన్ చెల్లదు."</string>
     <string name="system_package" msgid="8276098460517049146">"సిస్టమ్ అప్‌డేట్‌లను బాహ్య మీడియాలో ఇన్‌స్టాల్ చేయడం సాధ్యపడదు."</string>
@@ -663,7 +637,7 @@
     <string name="third_party_location_services_title" msgid="2826218400381676508">"థర్డ్ పార్టీ లొకేషన్ సర్వీస్‌లు"</string>
     <string name="location_reporting" msgid="3552501333650895634">"లొకేషన్ రిపోర్టింగ్"</string>
     <string name="location_history" msgid="4055660203090513120">"లొకేషన్ హిస్టరీ"</string>
-    <string name="location_reporting_desc" msgid="1580018652781674608">"Google ఈ పీచర్‌ను Google Now మరియు Google Maps వంటి ప్రోడక్టులలో ఉపయోగిస్తుంది. లొకేషన్ నివేదనను ఆన్ చేయడం వలన ఈ ఫీచర్‌ను ఉపయోగించే ఏ Google ఉత్పత్తి అయినా మీ Google ఖాతాతో అనుబంధించిన మీ పరికరం యొక్క అత్యంత ఇటీవలి లొకేషన్ డేటాను స్టోరేజ్‌ చేస్తుంది మరియు ఉపయోగిస్తుంది."</string>
+    <string name="location_reporting_desc" msgid="1580018652781674608">"Google ఈ పీచర్‌ను Google Now మరియు Google Maps వంటి ప్రోడక్టులలో ఉపయోగిస్తుంది. లొకేషన్ నివేదనను ఆన్ చేయడం వలన ఈ ఫీచర్‌ను ఉపయోగించే ఏ Google ఉత్పత్తి అయినా మీ Google ఖాతాతో అనుబంధించిన మీ పరికరం యొక్క అత్యంత ఇటీవలి లొకేషన్ డేటాను నిల్వ చేస్తుంది మరియు ఉపయోగిస్తుంది."</string>
     <string name="location_history_desc" msgid="926674012916014270">"ఈ ఖాతాకు లొకేషన్ హిస్టరీని ఆన్ చేసినప్పుడు, మీ యాప్‌లు ఉపయోగించడం కోసం Google మీ పరికరం లొకేషన్ డేటాను స్టోర్ చేస్తుంది.\n\nఉదాహరణకు, Google Maps మీకు దిశలను అందించగలదు అలాగే Google Now రోజువారీ ప్రయాణ మార్గంలోని రద్దీ గురించి మీకు తెలియజేయగలదు.\n\nమీరు లొకేషన్ హిస్టరీని ఎప్పుడైనా ఆఫ్ చేయవచ్చు, అయితే అలా చేయడం వలన హిస్టరీ ఏదీ తొలగించబడదు. మీ లొకేషన్ హిస్టరీని చూడటానికి, మేనేజ్ చేయడానికి, maps.google.com/locationhistoryని సందర్శించండి."</string>
     <string name="delete_location_history_title" msgid="707559064715633152">"లొకేషన్ హిస్టరీని తొలగించండి"</string>
     <string name="delete_location_history_desc" msgid="4035229731487113147">"ఇది ఈ Google ఖాతా కోసం ఈ పరికరంలో స్టోర్ చేయబడిన మొత్తం లొకేషన్ హిస్టరీని తొలగిస్తుంది. మీరు ఈ తొలగింపును రద్దు చేయలేరు. Google Nowతో సహా కొన్ని యాప్‌లు పని చేయకుండా ఆపివేయబడతాయి."</string>
@@ -908,9 +882,9 @@
     <string name="pin_enter_new_pin" msgid="1930944619313642621">"కొత్త పిన్‌ని సెట్ చేయండి"</string>
     <string name="pin_enter_again" msgid="7615050143778858658">"కొత్త పిన్‌ని మళ్లీ నమోదు చేయండి"</string>
     <string name="pin_enter_old_pin" msgid="5665265735227617942">"పాత పిన్‌ని నమోదు చేయండి"</string>
-    <string name="pin_enter_wrong_seconds" msgid="3014013615537066237">"మీరు 5 సార్లు తప్పు PIN నమోదు చేశారు.\n<xliff:g id="RELATIVE_TIME_SPAN">%1$d</xliff:g> సెకన్లలో మళ్లీ ట్రై చేయండి."</string>
-    <string name="pin_toast_wrong" msgid="4297542365877164402">"తప్పు పిన్, మళ్లీ ట్రై చేయండి"</string>
-    <string name="pin_toast_not_match" msgid="2439298696342975155">"మళ్లీ ట్రై చేయండి, పిన్ సరిపోలలేదు"</string>
+    <string name="pin_enter_wrong_seconds" msgid="3014013615537066237">"మీరు 5 సార్లు తప్పు PIN నమోదు చేశారు.\n<xliff:g id="RELATIVE_TIME_SPAN">%1$d</xliff:g> సెకన్లలో మళ్లీ ప్రయత్నించండి."</string>
+    <string name="pin_toast_wrong" msgid="4297542365877164402">"తప్పు పిన్, మళ్లీ ప్రయత్నించండి"</string>
+    <string name="pin_toast_not_match" msgid="2439298696342975155">"మళ్లీ ప్రయత్నించండి, పిన్ సరిపోలలేదు"</string>
     <string name="wifi_setup_input_password" msgid="8510003548463241234">"<xliff:g id="SSID">%1$s</xliff:g> కోసం పాస్‌వర్డ్‌ను నమోదు చేయండి"</string>
     <string name="wifi_setup_description" msgid="6843574399437584520">"కొనసాగించడానికి, <xliff:g id="WIFI_SUBMIT_ICON">%1$s</xliff:g>ను ఎంచుకోండి."</string>
     <string name="label_done_key" msgid="8576286462300373440">"పూర్తయింది"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"దయచేసి డిస్‌ప్లేను చూస్తున్నప్పుడు డిస్‌ప్లే ఆఫ్ కాకుండా నిరోధించడానికి, ఎనర్జీ వినియోగం పెరిగే అవకాశం ఉంది అని నిర్ధారించండి."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"యాక్టివ్‌గా ఉన్నప్పుడు"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"చూస్తున్నప్పుడు"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"ఆటోమేటిక్‌గా ఆఫ్ చేయండి"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"ఇన్‌యాక్టివ్‌గా ఉన్నప్పుడు ఆటోమేటిక్‌గా ఆఫ్ చేయండి"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"చూస్తున్నప్పుడు ఆటోమేటిక్‌గా ఆఫ్ చేయండి"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"టీవీని ఆటోమేటిక్‌గా ఆఫ్ చేయండి"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"ఇన్‌యాక్టివ్‌గా ఉన్నప్పుడు టీవీని ఆటోమేటిక్‌గా ఆఫ్ చేయండి"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"చూస్తున్నప్పుడు టీవీని ఆటోమేటిక్‌గా ఆఫ్ చేయండి"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"ఇన్‌యాక్టివ్‌గా ఉన్నప్పుడు\" టైమర్ తప్పనిసరిగా \"చూస్తున్నప్పుడు\" టైమర్ కంటే తక్కువ నిడివి కలిగినదై ఉండాలి"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"చూస్తున్నప్పుడు\" టైమర్ తప్పనిసరిగా \"ఇన్‌యాక్టివ్‌గా ఉన్నప్పుడు\" టైమర్ కంటే ఎక్కువ నిడివి కలిగినదై ఉండాలి"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"స్టాండ్‌బై మోడ్‌లో నెట్‌వర్క్ కనెక్షన్‌ను పరిమితం చేయండి"</string>
@@ -970,13 +944,13 @@
     <string name="limit_network_in_standby_toggle_info" msgid="566947772381093991">"స్టాండ్‌బై మోడ్‌లో ఉన్నప్పుడు ఆటోమేటిక్ అప్‌డేట్‌లను అందుకోవడం మినహా, మీ టీవీ మీ నెట్‌వర్క్ నుండి డిస్‌కనెక్ట్ చేయబడుతుంది. ఇది మీ టీవీ ఎనర్జీ వినియోగాన్ని తగ్గించవచ్చు, అయితే స్టాండ్‌బై మోడ్‌లో ఉన్నప్పుడు మీరు ప్రసారం, Google Assistant వంటి ఫంక్షన్‌లను ఉపయోగించలేకపోవచ్చు."</string>
     <string name="limit_network_in_standby_confirm_title" msgid="789232987058850322">"నెట్‌వర్క్ కనెక్షన్‌ను స్టాండ్‌బై మోడ్‌లో అనుమతించండి"</string>
     <string name="limit_network_in_standby_confirm_message" msgid="7176699480768019689">"నెట్‌వర్క్ కనెక్షన్‌ను స్టాండ్‌బై మోడ్‌లో అనుమతించడం వలన స్టాండ్‌బై ఎనర్జీ వినియోగం పెరుగుతుంది."</string>
-    <string name="backup_configure_account_default_summary" msgid="2170733614341544296">"ప్రస్తుతం ఏ ఖాతా కూడా బ్యాకప్ చేసిన డేటాను స్టోరేజ్‌ చేయడం లేదు"</string>
+    <string name="backup_configure_account_default_summary" msgid="2170733614341544296">"ప్రస్తుతం ఏ ఖాతా కూడా బ్యాకప్ చేసిన డేటాను నిల్వ చేయడం లేదు"</string>
     <string name="backup_erase_dialog_title" msgid="6008454053276987100"></string>
     <string name="backup_erase_dialog_message" msgid="222169533402624861">"మీ Wi-Fi పాస్‌వర్డ్‌లు, బుక్‌మార్క్‌లు, ఇతర సెట్టింగ్‌లు మరియు యాప్‌ డేటాను బ్యాకప్ చేయడాన్ని ఆపివేసి, Google సర్వర్‌ల్లోని అన్ని కాపీలను తొలగించాలా?"</string>
     <string name="privacy_backup_data" msgid="3604057980102997914">"నా డేటాను బ్యాకప్ చేయి"</string>
     <string name="privacy_backup_account" msgid="4527813051841860610">"బ్యాకప్ చేయాల్సిన ఖాతా"</string>
     <string name="privacy_automatic_restore" msgid="7117805818589418118">"ఆటోమేటిక్ పున‌రుద్ధ‌ర‌ణ‌"</string>
-    <string name="factory_reset_device" msgid="6509900821515094361">"పరికరాన్ని రీసెట్ చేయండి"</string>
+    <string name="factory_reset_device" msgid="6509900821515094361">"పరికరాన్ని రీసెట్ చేయి"</string>
     <string name="factory_reset_description" msgid="6697396335158766785">"ఇది మీ పరికరాన్ని ఆటోమేటిక్‌గా సెట్ చేయబడి ఉండే సెట్టింగ్‌లకు రీస్టోర్ చేస్తుంది, అలాగే డేటా, ఖాతాలు, ఫైళ్లు, డౌన్‌లోడ్ చేయబడిన యాప్‌లు అన్నిటినీ తొలగిస్తుంది."</string>
     <string name="factory_reset_info_description" msgid="5098454670833183487">"ఇది మీ పరికరాన్ని ఆటోమేటిక్‌గా సెట్ చేయబడి ఉండే సెట్టింగ్‌లకు రీస్టోర్ చేస్తుంది, అలాగే డేటా, ఖాతాలు, ఫైళ్లు, డౌన్‌లోడ్ చేయబడిన యాప్‌లు అన్నిటినీ తొలగిస్తుంది."</string>
     <string name="factory_reset_content_description" msgid="1677022688420116803">"ఫ్యాక్టరీ రీసెట్, ఇది మీ పరికరాన్ని ఆటోమేటిక్‌గా సెట్ చేయబడి ఉండే సెట్టింగ్‌లకు రీస్టోర్ చేస్తుంది, అలాగే డేటా, ఖాతాలు, ఫైళ్లు, డౌన్‌లోడ్ చేయబడిన యాప్‌లు అన్నిటినీ తొలగిస్తుంది."</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"పవర్ ఆన్ అయినప్పుడు పని చేసే విధానం"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"రీసెట్ చేయండి"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"ఈథర్‌నెట్ పెయిరింగ్ కోడ్"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"ఎనర్జీ మోడ్స్"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"టీవీ ఉపయోగంలో లేనప్పుడు శక్తి సామర్థ్యాన్ని మెరుగుపరచండి"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"ఎనేబుల్ చేయబడినవి:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ఈ మోడ్ పరికరం తాలూకు విద్యుత్ వినియోగాన్ని పెంచుతుందని గమనించండి."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\"ను ఎనేబుల్ చేయండి"</string>
 </resources>
diff --git a/Settings/res/values-th/energy-modes.xml b/Settings/res/values-th/energy-modes.xml
deleted file mode 100644
index a8b5a4811..000000000
--- a/Settings/res/values-th/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"ฟีเจอร์ที่สำคัญของเครือข่าย"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ใช้พลังงานลดลง"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"ปิดการเชื่อมต่อเครือข่ายเมื่อไม่ได้ใช้งานทีวี"</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"การอัปเดตและฟังก์ชันที่สำคัญ"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"ฟีเจอร์ที่แนะนำของเครือข่าย"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ใช้พลังงานเหมาะสม"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"เปิดฟีเจอร์ที่ปลุกระบบทีวีผ่านเครือข่าย (โหมดสแตนด์บายที่เชื่อมต่อเครือข่าย)"</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[ใส่ฟีเจอร์ 1]"</item>
-    <item msgid="8724721267222341891">"[ใส่ฟีเจอร์ 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"ฟีเจอร์เพิ่มเติมของเครือข่าย"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"ใช้พลังงานมากขึ้น"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"นอกจากฟีเจอร์ที่แนะนำแล้ว ตัวเลือกนี้จะเปิดฟีเจอร์เพิ่มเติมเมื่อไม่ได้ใช้งานทีวีด้วย ซึ่งอาจทำให้ใช้พลังงานมากขึ้น"</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[ใส่ฟีเจอร์ 1]"</item>
-    <item msgid="170760143032597722">"[ใส่ฟีเจอร์ 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-th/strings.xml b/Settings/res/values-th/strings.xml
index d601e1eb6..a0f2e3e26 100644
--- a/Settings/res/values-th/strings.xml
+++ b/Settings/res/values-th/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"การสำรองและคืนค่าข้อมูล"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"รีเซ็ตข้อมูลเป็นค่าเริ่มต้น"</string>
     <string name="device_calibration" msgid="2907914144048739705">"การเทียบมาตรฐาน"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"ตัวจับเวลาปิด"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"ตั้งตัวจับเวลาเพื่อปิดทีวีและประหยัดพลังงาน"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"กำลังไฟฟ้าและพลังงาน"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"การตั้งค่าอีโค"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"อุปกรณ์"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"เลือกรูปแบบ"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"การตั้งค่าเสียงขั้นสูง"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"อนุญาตโหมดเกม"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"จับคู่ช่วงไดนามิกของเนื้อหา"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"เมื่อเปิดใช้ตัวเลือกนี้ ระบบจะสลับเปลี่ยนระหว่างรูปแบบช่วงไดนามิกเพื่อให้ตรงตามเนื้อหา ซึ่งอาจจะทำให้จอดำได้ในระหว่างที่เปลี่ยน\n\nคลิกที่การตั้งค่า \"การแสดงผลขั้นสูง\" เพื่อดูช่วงไดนามิกอื่นๆ เพิ่ม"</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"ช่วงไดนามิกที่ต้องการ"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"การแปลงตามที่ระบบต้องการ"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"ให้ระบบจัดการการแปลงรูปแบบ"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"เมื่อเลือกตัวเลือกนี้ ระบบจะกำหนดช่วงไดนามิกที่เหมาะสมเพื่อส่งไปยังจอแสดงผลของคุณและแปลงเนื้อหาเป็นช่วงไดนามิกนี้ตามต้องการ"</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"ตรงกับรูปแบบของเนื้อหาเสมอ"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"การบังคับให้แปลง"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"บังคับให้แปลงเป็นรูปแบบที่ต้องการ"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"บังคับให้แปลงเป็นรูปแบบที่ต้องการ การบังคับให้แปลงอาจส่งผลต่อการตั้งค่าอื่นๆ ในโหมดการแสดงผลหรือรูปแบบ HDR"</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"เป็นแบบ SDR เสมอ"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"เป็นแบบ <xliff:g id="HDR_TYPE">%s</xliff:g> เสมอ"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"คุณต้องการบังคับเอาต์พุต HDR ไหม"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"ระบบจะบังคับการแปลงเป็น <xliff:g id="HDR_TYPE">%s</xliff:g> โดยค่าเริ่มต้น"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"จอแสดงผลจะแสดงที่ความละเอียด 1080p 60Hz ตัวเลือกนี้ใช้ไม่ได้กับจอแสดงผลของคุณเมื่อแสดงที่ความละเอียด 4K 60Hz"</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"ไม่รองรับ Dolby Vision ที่ความละเอียดปัจจุบัน หากคุณเปิดใช้ Dolby Vision ด้วยตนเอง ความละเอียดของจอแสดงผลจะเปลี่ยนเป็น 1080p 60Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"เปลี่ยนความละเอียดเป็น 1080p 60Hz ไหม"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"บังคับให้แปลงเป็น Dolby Vision เสมอ"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"หากปิดใช้ Dolby Vision สำหรับรูปแบบ HDR ในการตั้งค่าการแสดงผลขั้นสูง การบังคับให้แปลงเป็น Dolby Vision จะเปิดใช้รูปแบบนี้ขึ้นมาอีกครั้ง"</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"บังคับให้แปลงเป็น HDR10 เสมอ"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"หากปิดใช้ HDR10 สำหรับรูปแบบ HDR ในการตั้งค่าการแสดงผลขั้นสูง การบังคับให้แปลงเป็น HDR10 จะเปิดใช้รูปแบบนี้ขึ้นมาอีกครั้ง"</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"บังคับให้แปลงเป็น HLG เสมอ"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"หากปิดใช้ HLG สำหรับรูปแบบ HDR ในการตั้งค่าการแสดงผลขั้นสูง การบังคับให้แปลงเป็น HLG จะเปิดใช้รูปแบบนี้ขึ้นมาอีกครั้ง"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"บังคับให้แปลงเป็น HDR10+ เสมอ"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"หากปิดใช้ HDR10+ สำหรับรูปแบบ HDR ในการตั้งค่าการแสดงผลขั้นสูง การบังคับให้แปลงเป็น HDR10+ จะเปิดใช้รูปแบบนี้ขึ้นมาอีกครั้ง"</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"บังคับให้แปลงเป็น SDR เสมอ"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"การบังคับให้แปลงเป็น SDR จะปิดใช้รูปแบบทั้งหมดสำหรับ HDR ในการตั้งค่าการแสดงผลขั้นสูง"</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"จับคู่อัตราเฟรมของเนื้อหา"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"ราบรื่นเท่านั้น"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"ราบรื่น"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"อุปกรณ์จะจับคู่เอาต์พุตของตัวเองกับอัตราเฟรมดั้งเดิมของเนื้อหาที่คุณรับชมอยู่หากแอปส่งคำขอ ในกรณีที่ทีวีทำการส่งผ่านได้อย่างราบรื่นเท่านั้น"</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"อุปกรณ์แสดงผลที่เชื่อมต่อไม่รองรับการเปลี่ยนอัตราการรีเฟรชที่ราบรื่น ตัวเลือกนี้จะไม่มีผลจนกว่าคุณจะเปลี่ยนเป็นอุปกรณ์แสดงผลที่รองรับ"</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"เสมอ"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"ไม่ราบรื่น"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"อุปกรณ์จะจับคู่เอาต์พุตของตัวเองกับอัตราเฟรมดั้งเดิมของเนื้อหาที่คุณรับชมอยู่หากแอปส่งคำขอ ซึ่งอาจทำให้หน้าจอไม่แสดงผลชั่วครู่เมื่อกำลังออกจากหรือเข้าสู่การเล่นวิดีโอ"</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"ไม่เลย"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"อุปกรณ์จะไม่พยายามจับคู่เอาต์พุตของตัวเองกับอัตราเฟรมดั้งเดิมของเนื้อหาที่คุณรับชมอยู่แม้ว่าแอปจะส่งคำขอก็ตาม"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"เปลี่ยนความละเอียดเป็น %1$s ไหม"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"เลือก \"ตกลง\" เพื่อเริ่มใช้ %1$s"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision ไม่รองรับ %1$s และจะถูกปิดใน \"การตั้งค่าจอแสดงผลขั้นสูง\""</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"โหมดนี้รองรับ %1$s\nในทีวีบางเครื่อง คุณอาจต้องเปิด HDMI ที่ได้รับการปรับปรุงเพื่อเปิดใช้งานรูปแบบ HDR เพิ่มเติม ไปที่การตั้งค่าของทีวีเพื่อดูว่ารับรองฟีเจอร์นี้ไหม"</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"โหมดนี้รองรับ %1$s ในทีวีบางเครื่อง คุณอาจต้องเปิด HDMI ที่ได้รับการปรับปรุงเพื่อเปิดใช้งานรูปแบบ HDR เพิ่มเติม ไปที่การตั้งค่าของทีวีเพื่อดูว่ารับรองฟีเจอร์นี้ไหม"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"ยกเลิก"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ตกลง"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"ล้างข้อมูลในแคชไหม"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"การทำงานนี้จะล้างข้อมูลในแคชของแอปทั้งหมด"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"อุปกรณ์นี้จัดการโดยองค์กรของคุณ"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"อุปกรณ์เครื่องนี้จัดการโดย <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"ดูข้อมูลเพิ่มเติม"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{แอปกล้อง}other{แอปกล้อง}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"แอปปฏิทิน"</string>
@@ -699,7 +673,7 @@
     <string name="accessibility_shortcut_enable" msgid="6603542432267329986">"เปิดใช้ทางลัดการเข้าถึง"</string>
     <string name="accessibility_shortcut_service" msgid="2053250146891420311">"บริการทางลัด"</string>
     <string name="accessibility_shortcut_description" msgid="2050424178481510046">"เมื่อทางลัดเปิดอยู่ ให้กดปุ่มกลับและปุ่มลงค้างไว้ 3 วินาทีเพื่อเริ่มฟีเจอร์การเข้าถึง"</string>
-    <string name="accessibility_captions" msgid="3411554568812306549">"คำบรรยายแทนเสียง"</string>
+    <string name="accessibility_captions" msgid="3411554568812306549">"คำบรรยาย"</string>
     <string name="accessibility_captions_description" msgid="3827820027578548160">"การตั้งค่าการวางซ้อนข้อความคำบรรยายในวิดีโอ"</string>
     <string name="captions_display" msgid="2598662495450633375">"จอแสดงผล"</string>
     <string name="captions_display_on" msgid="480438033345455728">"เปิด"</string>
@@ -718,7 +692,7 @@
     <string name="captions_backgroundshow" msgid="1080183686470477645">"แสดงพื้นหลัง"</string>
     <string name="captions_backgroundcolor" msgid="2056944109914399253">"สีพื้นหลัง"</string>
     <string name="captions_backgroundopacity" msgid="1850126438162000027">"ความทึบแสงของพื้นหลัง"</string>
-    <string name="captioning_preview_text" msgid="3034147586392743237">"คำบรรยายแทนเสียงจะมีลักษณะดังนี้"</string>
+    <string name="captioning_preview_text" msgid="3034147586392743237">"คำบรรยายจะมีลักษณะดังนี้"</string>
     <string name="captions_textopacity" msgid="6055602491649526307">"ความทึบแสงของข้อความ"</string>
     <string name="captions_windowshow" msgid="6002072054703167886">"แสดงหน้าต่าง"</string>
     <string name="captions_windowcolor" msgid="7460430328878876648">"สีของหน้าต่าง"</string>
@@ -798,7 +772,7 @@
     <string name="system_desc_bt_hci_log" msgid="2592649923221658103">"เปิดใช้งานการบันทึกสอดแนมบลูทูธ HCI"</string>
     <string name="system_desc_usb_debugging" msgid="5672275208185222785">"โหมดแก้ปัญหาเมื่อเชื่อมต่อ USB"</string>
     <string name="system_desc_wait_for_debugger" msgid="7213496668606417691">"แอปที่ถูกแก้จะรอให้เครื่องซ่อมแซมเพิ่มก่อนทำงาน"</string>
-    <string name="system_desc_show_layout_bounds" msgid="5275008598296135852">"แสดงขอบคลิป ระยะขอบ ฯลฯ"</string>
+    <string name="system_desc_show_layout_bounds" msgid="5275008598296135852">"แสดงหน้าปกคลิป ขอบ ฯลฯ"</string>
     <string name="system_desc_show_gpu_view_updates" msgid="9088343415389734854">"แสดงมุมมองภายในหน้าต่างเมื่อวาดด้วย GPU"</string>
     <string name="system_desc_show_hardware_layer" msgid="3483713991865249527">"แสดงเลเยอร์ฮาร์ดแวร์เป็นสีเขียวเมื่อมีการอัปเดต"</string>
     <string name="system_desc_show_gpu_overdraw" msgid="74019834911598588">"จากดีที่สุดไปหาแย่ที่สุด: ฟ้า เขียว แดงอ่อน แดง"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"โปรดยืนยันเพื่อป้องกันไม่ให้จอแสดงผลปิดขณะรับชม ซึ่งอาจทำให้มีการใช้พลังงานเพิ่มขึ้น"</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"เมื่อไม่ได้ใช้งาน"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"เมื่อรับชม"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"ปิดโดยอัตโนมัติ"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"ปิดโดยอัตโนมัติเมื่อไม่ได้ใช้งาน"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"ปิดโดยอัตโนมัติเมื่อรับชม"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"ปิดทีวีโดยอัตโนมัติ"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"ปิดทีวีโดยอัตโนมัติเมื่อไม่ได้ใช้งาน"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"ปิดทีวีโดยอัตโนมัติเมื่อรับชม"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"ตัวจับเวลา \"เมื่อไม่ได้ใช้งาน\" จะต้องสั้นกว่าตัวจับเวลา \"เมื่อรับชม\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"ตัวจับเวลา \"เมื่อรับชม\" ต้องนานกว่าตัวจับเวลา \"เมื่อไม่ได้ใช้งาน\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"จำกัดการเชื่อมต่อเครือข่ายในโหมดสแตนด์บาย"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"ลักษณะการทำงานเมื่อเปิดเครื่อง"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"รีเซ็ต"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"รหัสการจับคู่อีเทอร์เน็ต"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"โหมดพลังงาน"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"ปรับปรุงประสิทธิภาพการใช้พลังงานเมื่อไม่ได้ใช้งานทีวี"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"ฟีเจอร์ที่เปิดใช้"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"โปรดทราบว่าโหมดนี้อาจทำให้อุปกรณ์ใช้พลังงานมากขึ้น"</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"เปิดใช้ \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/Settings/res/values-tl/energy-modes.xml b/Settings/res/values-tl/energy-modes.xml
deleted file mode 100644
index 2b6cfd876..000000000
--- a/Settings/res/values-tl/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Mahahalagang feature ng network"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Mababang paggamit ng kuryente"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"I-off ang koneksyon sa network kapag hindi ginagamit ang TV."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Mga kritikal na update at function"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Mga inirerekomendang feature ng network"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Naka-optimize na paggamit ng kuryente"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Ino-on ang mga feature na wine-wake ang TV sa pamamagitan ng network (naka-network na standby)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Mga karagdagang feature ng network"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Mas mataas ng paggamit ng kuryente"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Bukod pa sa mga inirerekomendang feature, io-on ng opsyong ito ang mga karagdagang feature kapag hindi ginagamit ang TV na posibleng makapagpataas sa paggamit ng kuryente."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-tl/strings.xml b/Settings/res/values-tl/strings.xml
index 9ad3df677..f581e9265 100644
--- a/Settings/res/values-tl/strings.xml
+++ b/Settings/res/values-tl/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Pag-backup at Pag-restore"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Pag-reset ng factory data"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Pag-calibrate"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Orasan sa Pag-Off"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Itakda ang mga orasan para i-off ang TV at makatipid ng kuryente"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Power at Kuryente"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Mga eco setting"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Mga Device"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Pumili ng mga format"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Advanced na mga setting ng tunog"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Payagan ang game mode"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Tumugma sa dynamic range ng content"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Kapag na-enable ang opsyong ito, lilipat ang system sa pagitan ng iba\'t ibang format ng dynamic range para tumugma sa content. Posibleng magdulot ito ng black screen habang lumilipat ng format.\n\nI-click ang mga setting sa Advanced na Display para sa higit pang opsyon sa dynamic range."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Gustong dynamic range"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Conversion na mas gusto ng system"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Hinahayaan ang system na pamahalaan ang conversion ng format"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Kapag pinili ang opsyong ito, tutukoy ang system ng naaangkop na dynamic na saklaw na ipapadala sa iyong display at iko-convert nito ang content sa dynamic na saklaw na ito gaya ng kinakailangan."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Palaging itugma sa format ng content"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Ipilit ang conversion"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Pinipilit ang conversion sa mas gustong format"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Ipilit ang conversion sa mas gustong format. Kapag pinilit ang conversion, posibleng maapektuhan ang iba pang setting sa Display Mode o HDR Format."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Palaging sa SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Palaging sa <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Gusto mong bang ipilit ang HDR output?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Bilang default, ipipilit sa <xliff:g id="HDR_TYPE">%s</xliff:g> ang conversion."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Gagana ang iyong display sa 1080p 60Hz resolution. Hindi compatible ang opsyong ito sa iyong display kapag gumagana sa 4k 60Hz resolution."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Hindi sinusuportahan ang Dolby Vision sa kasalukuyang resolution. Kung manual mong ie-enable ang Dolby Vision, magiging 1080p 60Hz ang resolution ng iyong display"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Gawing 1080p 60Hz ang resolution?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Palaging ipilit ang conversion sa Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Kung naka-disable sa Mga HDR Format sa Advanced na Mga Setting ng Display ang Dolby Vision, mae-enable ulit ito ng pagpilit ng conversion sa Dolby Vision."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Palaging ipilit ang conversion sa HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Kung naka-disable sa Mga HDR Format sa Advanced na Mga Setting ng Display ang HDR10, mae-enable ulit ito ng pagpilit ng conversion sa HDR10."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Palaging ipilit ang conversion sa HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Kung naka-disable sa Mga HDR Format sa Advanced na Mga Setting ng Display ang HLG, mae-enable ulit ito ng pagpilit ng conversion sa HLG."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Palaging ipilit ang conversion sa HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Kung naka-disable sa Mga HDR Format sa Advanced na Mga Setting ng Display ang HDR10+, mae-enable ulit ito ng pagpilit ng conversion sa HDR10+."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Palaging ipilit ang conversion sa SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Madi-disable ng pagpilit ng conversion sa SDR ang lahat ng format sa Mga HDR Format sa Advanced na Mga Setting ng Display."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Itugma ang frame rate ng content"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Seamless lang"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Seamless"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Kung hihingin ito ng app, itutugma ng iyong device ang output nito sa orihinal na frame rate ng content na pinapanood mo, pero sa kaso LANG na makakagawa ng seamless na transition ang iyong TV."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Hindi sinusuportahan ng naikonekta mong display ang mga transition na may seamless na refresh rate. Walang magiging epekto ang opsyong ito maliban kung lilipat ka sa display na sinusuportahan ito."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Palagi"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Hindi seamless"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Kung hihingin ito ng app, itutugma ng iyong device ang output nito sa orihinal na frame rate ng content na pinapanood mo. Posibleng maging sanhi nito ng pagblangko ng iyong screen nang isang segundo kapag lumalabas o pumapasok sa video na playback."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Hindi Kailanman"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Kahit na hingin ito ng app, hindi kailanman susubukan ng iyong device na itugma ang output nito sa orihinal na frame rate ng content na pinapanood mo."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Gawing %1$s ang resolution?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Piliin ang OK para gamitin ang %1$s mula ngayon."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Hindi sinusuportahan ang Dolby Vision sa %1$s at idi-disable ito sa \"Mga Advanced na Setting ng Display\""</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Sinusuportahan ng mode na ito ang: %1$s\nSa ilang TV, posibleng kailanganin mong i-on ang Pinahusay na HDMI para mag-enable ng higit pang HDR format. Tingnan ang mga setting ng iyong TV para alamin kung sinusuportahan ito."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Sinusuportahan ng mode na ito ang %1$s. Sa ilang TV, posibleng kailanganin mong i-on ang Pinahusay na HDMI para mag-enable ng higit pang HDR format. Tingnan ang mga setting ng iyong TV para alamin kung sinusuportahan ito."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Kanselahin"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"I-clear ang naka-cache na data?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"I-clear nito ang naka-cache na data para sa app."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Ang device na ito ay pinamamahalaan ng iyong organisasyon."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Pinamamahalaan ng <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ang device na ito."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Matuto pa"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Camera app}one{Mga Camera app}other{Mga Camera app}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"App na Kalendaryo"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Pakikumpirma para mapigilan ang pag-off ng display habang nanonood, na posibleng makapagpataas ng paggamit ng kuryente."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Kapag hindi aktibo"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Kapag nanonood"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Awtomatikong i-off"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Awtomatikong i-off kapag hindi aktibo"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Awtomatikong i-off kapag nanonood"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Awtomatikong i-off ang TV"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Awtomatikong i-off ang TV kapag hindi aktibo"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Awtomatikong i-off ang TV kapag nanonood"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Mas maikli dapat ang timer ng \"Kapag hindi aktibo\" kaysa sa timer ng \"Kapag nanonood\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Mas matagal dapat sa timer ng \"Kapag hindi aktibo\" ang timer ng \"Kapag nanonood\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Limitahan ang koneksyon ng network sa standby"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Gawi sa pag-on"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"I-reset"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Code ng pagpapares ng Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Mga Energy Mode"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Pahusayin ang efficiency ng kuryente kapag hindi ginagamit ang TV"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Ine-enable ang:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Tandaang posibleng mapataas ng mode na ito ang paggamit ng kuryente ng device."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"I-enable ang \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/Settings/res/values-tr/energy-modes.xml b/Settings/res/values-tr/energy-modes.xml
deleted file mode 100644
index 5462fecd7..000000000
--- a/Settings/res/values-tr/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Gerekli ağ özellikleri"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Az enerji kullanımı"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"TV kullanımda değilken ağ bağlantısını kapatın."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Kritik güncellemeler ve işlevler"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Önerilen ağ özellikleri"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimize edilmiş enerji kullanımı"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"TV\'yi ağ üzerinden uyandıran (ağa bağlı bekleme modu) özellikleri açar."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Ek ağ özellikleri"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Daha fazla enerji kullanımı"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Bu seçenek, önerilen özelliklerin yanı sıra TV kullanımda değilken enerji kullanımını artırabilecek ek özellikleri açar."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-tr/strings.xml b/Settings/res/values-tr/strings.xml
index 854294b3f..1ac3ec594 100644
--- a/Settings/res/values-tr/strings.xml
+++ b/Settings/res/values-tr/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Yedekleme ve Geri Yükleme"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Fabrika verilerine sıfırla"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibrasyon"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Kapatma Zamanlayıcısı"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"TV\'yi kapatıp enerji tasarrufu yapmak için zamanlayıcılar ayarlayın"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Güç ve Enerji"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Eko ayarları"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Cihazlar"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Biçimleri seçin"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Gelişmiş ses ayarları"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Oyun moduna izin verin"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"İçerik dinamik aralığını eşleştir"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Bu seçenek etkinleştirildiğinde sistem içeriği eşleştirmek için farklı dinamik aralık biçimleri arasında geçiş yapar. Biçim değiştirme sırasında siyah ekran görünmesine neden olabilir.\n\nDiğer dinamik aralık seçenekleri için Gelişmiş Ekran ayarlarını tıklayın."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Tercih edilen dinamik aralık"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Sistem tarafından tercih edilen dönüştürme"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Biçim dönüştürme işlemini sisteme bırakır"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Bu seçenek belirlenirse sistem, ekranınıza gönderilecek uygun bir dinamik aralık belirler ve gerektiğinde içeriği bu dinamik aralığa dönüştürür."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Her zaman içeriğin biçimiyle uyumludur"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Zorunlu dönüştürme"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Tercih edilen biçime dönüştürmeyi zorunlu kılar"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Tercih edilen biçime dönüştürmeyi zorunlu kılar. Dönüştürmenin zorunlu kılınması, görüntü modundaki veya HDR biçimindeki diğer ayarları etkileyebilir."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Her zaman SDR\'ye"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Her zaman <xliff:g id="HDR_TYPE">%s</xliff:g> biçimine"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"HDR çıkışını zorunlu kılmak istiyor musunuz?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Varsayılan olarak, <xliff:g id="HDR_TYPE">%s</xliff:g> biçimine dönüştürme zorunlu kılınır."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Ekranınız, 1080p 60 Hz çözünürlükte çalışır. Bu seçenek, 4K 60 Hz çözünürlükte çalışırken ekranınızla uyumlu değildir."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision mevcut çözünürlükte desteklenmez. Dolby Vision\'ı manuel olarak etkinleştirirseniz ekranınızın çözünürlüğü 1080p 60 Hz olarak değiştirilir."</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Çözünürlük 1080p 60 Hz olarak değiştirilsin mi?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Dolby Vision\'a dönüştürmeyi her zaman zorunlu kılar"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Dolby Vision, Gelişmiş Ekran Ayarları\'ndaki HDR Biçimleri bölümünde devre dışı bırakılmışsa Dolby Vision\'a dönüştürmeyi zorunlu kıldığınızda yeniden etkinleştirilir."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"HDR10\'a dönüştürmeyi her zaman zorunlu kılar"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"HDR10, Gelişmiş Ekran Ayarları\'ndaki HDR Biçimleri bölümünde devre dışı bırakılmışsa HDR10\'a dönüştürmeyi zorunlu kıldığınızda yeniden etkinleştirilir."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"HLG\'ye dönüştürmeyi her zaman zorunlu kılar"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"HLG, Gelişmiş Ekran Ayarları\'ndaki HDR Biçimleri bölümünde devre dışı bırakılmışsa HLG\'ye dönüştürmeyi zorunlu kıldığınızda yeniden etkinleştirilir."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"HDR10+\'a dönüştürmeyi her zaman zorunlu kılar"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"HDR10+, Gelişmiş Ekran Ayarları\'ndaki HDR Biçimleri bölümünde devre dışı bırakılmışsa HDR10+\'a dönüştürmeyi zorunlu kıldığınızda yeniden etkinleştirilir."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"SDR\'ye dönüştürmeyi her zaman zorunlu kılar"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"SDR\'ye dönüştürmeyi zorunlu kıldığınızda Gelişmiş Ekran Ayarları\'ndaki HDR Biçimleri bölümünde yer alan tüm biçimler devre dışı bırakılır."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"İçerik kare hızıyla eşleştir"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Yalnızca kesintisiz"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Kesintisiz"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Uygulama isterse cihazınız, çıkışını, YALNIZCA TV\'niz kusursuz geçiş gerçekleştirebiliyorsa izlediğiniz içeriğin orijinal kare hızıyla eşleştirir."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Bağlı ekranınız, kesintisiz yenileme hızı geçişlerini desteklemiyor. Destekleyen bir ekrana geçmediğiniz sürece bu seçeneğin hiçbir etkisi yoktur."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Her zaman"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Kesintisiz değil"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Uygulama isterse cihazınız, çıkışını, izlediğiniz içeriğin orijinal kare hızıyla eşleştirir. Bu, video oynatma işleminden çıkarken veya girerken kısa bir an boş ekran görüntülenmesine yol açabilir."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Hiçbir zaman"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Uygulama istese bile cihazınız, çıkışını, hiçbir zaman izlediğiniz içeriğin orijinal kare hızıyla eşleştirmeye çalışmaz."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Çözünürlük %1$s olarak değiştirilsin mi?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Bundan sonra %1$s çözünürlüğü kullanmak için Tamam\'ı seçin."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision, %1$s çözünürlükte desteklenmez ve \"Gelişmiş Ekran Ayarları\"nda devre dışı bırakılır"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Bu modda %1$s desteklenir\nBazı TV\'lerde daha fazla HDR biçimini etkinleştirmek için Gelişmiş HDMI\'yı açmanız gerekebilir. Bunun desteklenip desteklenmediğini görmek için televizyon ayarlarınızı kontrol edin."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Bu modda %1$s desteklenir. Bazı televizyonlarda daha fazla HDR biçimini etkinleştirmek için gelişmiş HDMI\'yı açmanız gerekebilir. Bunun desteklenip desteklenmediğini görmek için televizyon ayarlarınızı kontrol edin."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"İptal"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Tamam"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Önbelleğe alınan veriler silinsin mi?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Bu, tüm uygulamaların önbellek verilerini siler."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Bu cihaz kuruluşunuz tarafından yönetiliyor."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Bu cihaz <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tarafından yönetiliyor."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Daha fazla bilgi"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kamera uygulaması}other{Kamera uygulamaları}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Takvim uygulaması"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Enerji kullanımını artırma ihtimali olduğu için lütfen izleme sırasında ekranın kapatılmasını devre dışı bıraktığınızı onaylayın."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Etkin değilken"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"İzlerken"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Otomatik olarak kapat"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Devre dışıyken otomatik olarak kapat"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"İzlerken otomatik olarak kapat"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"TV\'yi otomatik olarak kapat"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"TV\'yi etkin olmadığında otomatik olarak kapat"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"TV\'yi izlerken otomatik olarak kapat"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"Etkin değilken\" zamanlayıcısı, \"İzlerken\" zamanlayıcısından kısa olmalıdır"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"İzlerken\" zamanlayıcısı, \"Etkin değilken\" zamanlayıcısından uzun olmalıdır"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Beklemedeyken ağ bağlantısını sınırlama"</string>
@@ -1043,7 +1017,7 @@
     <string name="picture_in_picture_empty_text" msgid="4370198922852736600">"Yüklü uygulamalardan hiçbiri pencere içinde pencere özelliğini desteklemiyor"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="3296649114939705896">"Uygulamaların, uygulama açıkken veya uygulamadan çıktıktan sonra (örneğin, video izlemeye devam etmek için) pencere içinde pencere oluşturmasına izin verir. Bu pencere, kullandığınız diğer uygulamaların üzerinde gösterilir."</string>
     <string name="alarms_and_reminders_description" msgid="4063972350154624500">"Uygulamaların alarmlar kurup zamana bağlı işlemler programlamasına izin verir. Bu izin, uygulamaların arka planda çalışmasına olanak sağlayarak daha fazla pil harcanmasına neden olabilir.\n\nBu izin verilmezse bu uygulama tarafından programlanmış mevcut alarmlar ve zamana bağlı etkinlikler çalışmaz."</string>
-    <string name="turn_screen_on_title" msgid="5293798529284629011">"Ekranı açma"</string>
+    <string name="turn_screen_on_title" msgid="5293798529284629011">"Ekranı aç"</string>
     <string name="allow_turn_screen_on" msgid="4903401106871656521">"Ekranı açmaya izin ver"</string>
     <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Bir uygulamanın ekranı açmasına izin verin. İzin verildiğinde, uygulama sizin belirgin niyetiniz olmadan istediği zaman ekranı açabilir."</string>
     <string name="special_access" msgid="21806055758289916">"Özel uygulama erişimi"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Açılış davranışı"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Sıfırla"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Ethernet eşleme kodu"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Enerji Modları"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"TV kullanılmazken enerji verimliliğini artırın"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Şunları etkinleştirir:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Bu modun, cihazın güç tüketimini artırabileceğini unutmayın."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" modunu etkinleştir"</string>
 </resources>
diff --git a/Settings/res/values-uk/energy-modes.xml b/Settings/res/values-uk/energy-modes.xml
deleted file mode 100644
index c6bd8fcfd..000000000
--- a/Settings/res/values-uk/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Основні мережеві функції"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Зменшене енергоспоживання"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"З’єднання з мережею вимикається, коли телевізор не використовується."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Важливі оновлення та функції"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Рекомендовані мережеві функції"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Оптимізоване енергоспоживання"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Вмикаються функції, які виводять телевізор із режиму сну через мережу (мережевий режим очікування)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Додаткові мережеві функції"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Збільшене енергоспоживання"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Коли телевізор не використовується, ця опція вмикає, окрім рекомендованих, додаткові функції, через що може збільшитися енергоспоживання."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-uk/strings.xml b/Settings/res/values-uk/strings.xml
index c3cfd59e9..87ef615cf 100644
--- a/Settings/res/values-uk/strings.xml
+++ b/Settings/res/values-uk/strings.xml
@@ -53,7 +53,7 @@
     <string name="sound_category_title" msgid="7899816751041939518">"Звук"</string>
     <string name="applications_category_title" msgid="7112019490898586223">"Додатки"</string>
     <string name="device_pref_category_title" msgid="8292572846154873762">"Параметри пристрою"</string>
-    <string name="accessibility_category_title" msgid="1552664829936369592">"Доступність"</string>
+    <string name="accessibility_category_title" msgid="1552664829936369592">"Спеціальні можливості"</string>
     <string name="remotes_and_accessories_category_title" msgid="4795119810430255047">"Пульти дистанційного керування й аксесуари"</string>
     <string name="display_and_sound_category_title" msgid="9203309625380755860">"Зображення та звук"</string>
     <string name="help_and_feedback_category_title" msgid="7036505833991003031">"Довідка й відгуки"</string>
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Резервне копіювання й відновлення"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Відновлення заводських налаштувань"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Калібрування"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Таймер вимкнення"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Встановлюйте таймери вимкнення телевізора, щоб заощаджувати електроенергію"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Живлення й енергія"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Налаштування режиму \"Еко\""</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Пристрої"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Вибрати формати"</string>
@@ -151,41 +151,14 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Додаткові налаштування звуку"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Дозволити режим гри"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Враховувати динамічний діапазон контенту"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Якщо цю опцію ввімкнено, система перемикатиметься між різними форматами динамічного діапазону з урахуванням контенту. Під час перемикання формату екран може ставати чорним.\n\nЩоб переглянути інші опції динамічного діапазону, натисніть \"Додаткові налаштування екрана\"."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Бажаний динамічний діапазон"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Системна конвертація"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Дозвольте системі керувати конвертацією формату"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Якщо ви виберете цю опцію, система визначатиме відповідний динамічний діапазон, який передаватиметься на ваш екран, і за потреби конвертуватиме контент у цей динамічний діапазон."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Завжди відповідає формату контенту"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Примусова конвертація"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Відео примусово конвертуватиметься в потрібний формат"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Відео примусово конвертуватиметься в потрібний формат. Примусова конвертація може впливати на інші параметри режиму відображення або формату HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Завжди в SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Завжди в <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Здійснювати примусову конвертацію у формат форматі HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"За умовчанням контент конвертуватиметься у формат <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Ваш екран працюватиме з роздільною здатністю 1080p 60 Гц. Ця опція не підтримується, якщо екран працює з роздільною здатністю 4K 60 Гц."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Формат Dolby Vision не підтримується в поточній роздільній здатності. Якщо ввімкнути Dolby Vision вручну, роздільну здатність вашого дисплея буде змінено на 1080p 60 Гц."</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Змінити роздільну здатність на 1080p 60 Гц?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Завжди автоматично конвертувати відео у формат Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Якщо формат Dolby Vision вимкнено в списку форматів HDR в додаткових налаштуваннях екрана, за допомогою автоматичної конвертації в Dolby Vision можна ввімкнути його знову."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Завжди автоматично конвертувати відео у формат HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Якщо формат HDR10 вимкнено в списку форматів HDR в додаткових налаштуваннях екрана, за допомогою автоматичної конвертації в HDR10 можна ввімкнути його знову."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Завжди автоматично конвертувати відео у формат HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Якщо формат HLG вимкнено в списку форматів HDR в додаткових налаштуваннях екрана, за допомогою автоматичної конвертації в HLG можна ввімкнути його знову."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Завжди автоматично конвертувати відео у формат HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Якщо формат HDR10+ вимкнено в списку форматів HDR в додаткових налаштуваннях екрана, за допомогою автоматичної конвертації в HDR10+ можна ввімкнути його знову."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Завжди автоматично конвертувати відео у формат SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Якщо ввімкнути автоматичну конвертацію в SDR, усі формати в списку форматів HDR в додаткових налаштуваннях екрана буде вимкнено."</string>
-    <string name="match_content_frame_rate_title" msgid="153291168560947689">"Допасування до частоти кадрів контенту"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Лише плавний перехід"</string>
+    <string name="match_content_frame_rate_title" msgid="153291168560947689">"Відповідно до частоти кадрів контенту"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Плавний перехід"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Якщо цього вимагає додаток, пристрій відтворюватиме зображення без зміни частоти кадрів, ЛИШЕ якщо телевізор може виконати плавний перехід."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Підключений екран не підтримує плавну зміну частоти оновлення. Вибір цієї опції не дасть результату, якщо ви не використовуватимете екран, який підтримує цю функцію."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Завжди"</string>
-    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Якщо цього вимагає додаток, пристрій відтворюватиме зображення із допасуванням до частоти кадрів контенту, який ви переглядаєте. Через це зображення на екрані може на секунду зникати, коли ви вмикаєте або вимикаєте відтворення відео."</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Без плавного переходу"</string>
+    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Якщо цього вимагає додаток, пристрій відтворюватиме зображення без зміни частоти кадрів. Через це зображення на екрані може на секунду зникати, коли ви вмикаєте або вимикаєте відтворення відео."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Ніколи"</string>
-    <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Навіть якщо цього вимагає додаток, пристрій ніколи не намагатиметься допасувати частоту кадрів контенту, який ви переглядаєте."</string>
+    <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Навіть якщо цього вимагає додаток, пристрій ніколи не намагатиметься відтворювати зображення без зміни частоти кадрів."</string>
     <string name="font_scale_settings_title" msgid="4114019544800225980">"Масштаб тексту"</string>
     <string name="font_scale_item_detail" msgid="1558315053348778805">"Масштаб: <xliff:g id="SCALE">%1$d</xliff:g>%%"</string>
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Зразок тексту"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Змінити роздільну здатність на %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Натисніть OK, щоб надалі використовувати роздільну здатність %1$s."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Формат Dolby Vision не підтримується в режимі %1$s. Його буде вимкнено в меню \"Додаткові налаштування екрана\"."</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Цей режим підтримує: %1$s\nНа деяких телевізорах може знадобитися ввімкнути розширені параметри HDMI, щоб використовувати більше форматів HDR. Це можна перевірити в налаштуваннях телевізора."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Цей режим підтримує %1$s. Можливо, на деяких телевізорах потрібно ввімкнути розширені параметри HDMI, щоб використовувати інші формати HDR. Це можна перевірити в налаштуваннях телевізора."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Скасувати"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Гц"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Гц)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Гц)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Видалити кешовані дані?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Кешовані дані всіх додатків буде видалено."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -263,7 +236,7 @@
     <string name="bluetooth_known_devices_category" msgid="6895470515631452961">"Аксесуари"</string>
     <string name="bluetooth_official_remote_category" msgid="5817814488268307170">"Пульт ДК"</string>
     <string name="bluetooth_official_remote_entry_title" msgid="6699700335229570038">"Налаштування пульта ДК"</string>
-    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"Налаштування кнопок дистанційного керування"</string>
+    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"Налаштуйте кнопки дистанційного керування"</string>
     <string name="bluetooth_ir_entry_subtitle" msgid="4606207128353416151">"Керуйте гучністю, живленням і джерелами вхідного сигналу телевізора, приймача та звукової панелі"</string>
     <string name="bluetooth_connect_action_title" msgid="7715342395313781643">"Підключити"</string>
     <string name="bluetooth_connect_confirm" msgid="4769958536295137386">"Підключитися до пристрою %1$s"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Цим пристроєм керує адміністратор вашої організації."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Цим пристроєм керує <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Докладніше"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Додаток для камери}one{Додатки для камери}few{Додатки для камери}many{Додатки для камери}other{Додатки для камери}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Додаток для календарів"</string>
@@ -495,9 +469,9 @@
     <string name="wifi_ip_settings_invalid_dns" msgid="5111100342560120360">"Введіть дійсну DNS-адресу"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="2726889303835927777">"Введіть довжину префікса мережі від 0 до 32"</string>
     <string name="wifi_ip_address_description" msgid="7109677764979198618">"Введіть дійсну IP-адресу.\nПриклад: <xliff:g id="ID_1">192.168.1.128</xliff:g>"</string>
-    <string name="wifi_dns1_description" msgid="2287252520192279195">"Введіть дійсну IP-адресу або залиште поле порожнім.\nПриклад: <xliff:g id="ID_1">8.8.8.8</xliff:g>"</string>
-    <string name="wifi_dns2_description" msgid="6495565714252833784">"Введіть дійсну IP-адресу або залиште поле порожнім.\nПриклад: <xliff:g id="ID_1">8.8.4.4</xliff:g>"</string>
-    <string name="wifi_gateway_description" msgid="8902481147103929271">"Введіть дійсну IP-адресу або залиште поле порожнім.\nПриклад: <xliff:g id="ID_1">192.168.1.1</xliff:g>"</string>
+    <string name="wifi_dns1_description" msgid="2287252520192279195">"Введіть дійсну IP-адресу або залишіть поле порожнім.\nПриклад: <xliff:g id="ID_1">8.8.8.8</xliff:g>"</string>
+    <string name="wifi_dns2_description" msgid="6495565714252833784">"Введіть дійсну IP-адресу або залишіть поле порожнім.\nПриклад: <xliff:g id="ID_1">8.8.4.4</xliff:g>"</string>
+    <string name="wifi_gateway_description" msgid="8902481147103929271">"Введіть дійсну IP-адресу або залишіть поле порожнім.\nПриклад: <xliff:g id="ID_1">192.168.1.1</xliff:g>"</string>
     <string name="wifi_network_prefix_length_description" msgid="2670994968279018896">"Введіть префікс мережі дійсної довжини.\nПриклад: <xliff:g id="ID_1">24</xliff:g>"</string>
     <string name="proxy_error_invalid_host" msgid="5629893736174170157">"Ім’я хосту недійсне"</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="1762079966901078116">"Список виключень недійсний. Введіть список виключених доменів через кому."</string>
@@ -506,7 +480,7 @@
     <string name="proxy_error_invalid_port" msgid="5307010810664745294">"Порт недійсний"</string>
     <string name="proxy_warning_limited_support" msgid="4220553563487968684">"Проксі-сервер HTTP використовується веб-переглядачем, але недоступний для інших додатків"</string>
     <string name="proxy_port_description" msgid="6486205863098427787">"Введіть дійсний номер порту.\nПриклад: <xliff:g id="ID_1">8080</xliff:g>"</string>
-    <string name="proxy_exclusionlist_description" msgid="5105504899364188296">"Введіть виключені домени через кому або залиште поле порожнім.\nПриклад: <xliff:g id="ID_1">example.com,mycomp.test.com,localhost</xliff:g>"</string>
+    <string name="proxy_exclusionlist_description" msgid="5105504899364188296">"Введіть виключені домени через кому або залишіть поле порожнім.\nПриклад: <xliff:g id="ID_1">example.com,mycomp.test.com,localhost</xliff:g>"</string>
     <string name="proxy_hostname_description" msgid="5520200112290557199">"Введіть дійсне ім’я хосту.\nПриклад: <xliff:g id="ID_1">proxy.example.com</xliff:g>"</string>
     <string name="title_wifi_eap_method" msgid="4351752615786996226">"Виберіть метод EAP для мережі <xliff:g id="SSID">%1$s</xliff:g>"</string>
     <string name="title_wifi_phase2_authentication" msgid="1167205033305931574">"Виберіть другий етап автентифікації для мережі <xliff:g id="SSID">%1$s</xliff:g>"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Підтвердьте, що дисплей не має вимикатися під час перегляду (це може збільшити споживання енергії)."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Якщо немає взаємодії"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Під час перегляду"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Автоматично вимикати"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Автоматично вимикати, коли пристрій неактивний"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Автоматично вимикати під час перегляду"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Автоматично вимикати телевізор"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Автоматично вимикати телевізор, коли він неактивний"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Автоматично вимикати телевізор під час перегляду"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Період на таймері \"Якщо немає взаємодії\" має бути коротшим, ніж на таймері \"Під час перегляду\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Період на таймері \"Під час перегляду\" має бути довшим, ніж на таймері \"Якщо немає взаємодії\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Очікування: обмежити з’єднання з мережею"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Поведінка під час увімкнення"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Скидання"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Код підключення Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Режими енергоспоживання"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Покращуйте енергоефективність у періоди, коли телевізор не використовується"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Функції, що вмикаються"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Зверніть увагу, що в цьому режимі може збільшитися енергоспоживання пристрою."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Увімкнути режим \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/Settings/res/values-ur/energy-modes.xml b/Settings/res/values-ur/energy-modes.xml
deleted file mode 100644
index f9bb00384..000000000
--- a/Settings/res/values-ur/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"نیٹ ورک کی ضروری خصوصیات"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"کم توانائی کا استعمال"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"TV کے استعمال میں نہ ہونے پر نیٹ ورک کنکشن آف کریں۔"</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"اہم اپ ڈیٹس اور فنکشنز"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"تجویز کردہ نیٹ ورک کی خصوصیات"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"آپٹمائز کردہ توانائی کا استعمال"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"نیٹ ورک پر TV کو بحال کرنے والی خصوصیات کو آن کرتا ہے (اسٹینڈ بائی وضع میں نیٹ ورک)۔"</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"نیٹ ورک کی اضافی خصوصیات"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"توانائی کے استعمال میں اضافہ"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"تجویز کردہ خصوصیات کے علاوہ، یہ اختیار اضافی خصوصیات کو آن کرتا ہے جب TV استعمال میں نہ ہو جو توانائی کے استعمال میں اضافہ کا باعث بن سکتا ہے۔"</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-ur/strings.xml b/Settings/res/values-ur/strings.xml
index 4bc3789f4..7824fce7c 100644
--- a/Settings/res/values-ur/strings.xml
+++ b/Settings/res/values-ur/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"بیک اپ لیں اور بحال کریں"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"فیکٹری ڈیٹا ری سیٹ"</string>
     <string name="device_calibration" msgid="2907914144048739705">"کیلیبریشن"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"ٹائمر بند کریں"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"TV بند کرنے اور توانائی بچانے کے لیے ٹائمرز سیٹ کریں"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"پاور اور توانائی"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"ایکو کی ترتیبات"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"آلات"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"فارمیٹس منتخب کریں"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"جدید ترین صوتی ترتیبات"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"گیم وضع کی اجازت"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"مماثل مواد کا ڈائنیمک رینج"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"اس اختیار کو فعال کرنے پر، یہ سسٹم مواد سے مماثل کرنے کے لیے مختلف ڈائنیمک رینج فارمیٹس کے مابین سوئچ ہو جائے گا۔ فارمیٹ سوئچ کے دوران اس سے اسکرین سیاہ ہو سکتی ہے۔\n\nمزید ڈائنیمک رینج اختیارات کے لیے جدید ترین ڈسپلے کی ترتیبات پر کلک کریں۔"</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"ترجیحی ڈائنیمک رینج"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"سسٹم کی ترجیحی تبدیلی"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"آئیے سسٹم فارمیٹ کی تبدیلی کا نظم کریں"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"جب یہ اختیار منتخب کیا جائے گا تو سسٹم آپ کے ڈسپلے پر بھیجے جانے کے لیے ایک مناسب ڈائنیمک رینج کا تعین کرے گا اور ضرورت کے مطابق مواد کو اس ڈائنیمک رینج میں تبدیل کر دے گا۔"</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"ہمیشہ مواد کے فارمیٹ سے مماثل ہوتا ہے"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"زبردستی تبدیلی"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"ترجیحی فارمیٹ میں زبردستی تبدیلی کرتا ہے"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"ترجیحی فارمیٹ میں زبردستی تبدیلی۔ زبردستی تبدیلی کا اثر ڈسپلے وضع یا HDR فارمیٹ میں دیگر ترتیبات پر پڑ سکتا ہے۔"</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"ہمیشہ SDR میں"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"ہمیشہ <xliff:g id="HDR_TYPE">%s</xliff:g> میں"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"کیا آپ زبردستی HDR آؤٹ پٹ کرنا چاہتے ہیں؟"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"بطور ڈیفالٹ <xliff:g id="HDR_TYPE">%s</xliff:g> میں زبردستی تبدیلی کی جائے گی۔"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"آپ کا ڈسپلے 1080p 60Hz ریزولیوشن پر چلے گا۔ 4k 60Hz ریزولیوشن پر چلنے پر یہ اختیار آپ کے ڈسپلے کے ساتھ موافقت نہیں رکھتا ہے۔"</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision موجودہ ریزولوشن میں تعاون یافتہ نہیں ہے۔ اگر آپ Dolby Vision کو دستی طور پر فعال کرتے ہیں تو آپ کے ڈسپلے کی ریزولوشن 1080p 60Hz میں تبدیل ہو جائے گی"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"ریزولوشن کو 1080p 60Hz میں تبدیل کریں؟"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Dolby Vision میں ہمیشہ زبردستی تبدیلی کریں"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"اگر اعلی درجے کی ڈسپلے کی ترتیبات میں HDR فارمیٹس میں Dolby Vision کو غیر فعال کر دیا جاتا ہے تو Dolby Vision میں زبردستی تبدیلی اسے دوبارہ فعال کر دے گی۔"</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"HDR10 میں ہمیشہ زبردستی تبدیلی کریں"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"اگر HDR10 کو HDR فارمیٹس میں اعلیٰ ڈسپلے کی ترتیبات میں غیر فعال کر دیا گیا ہے تو HDR10 میں زبردستی تبدیلی اسے دوبارہ فعال کر دے گی۔"</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"HLG میں ہمیشہ زبردستی تبدیلی کریں"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"اگر HLG کو HDR فارمیٹس میں اعلیٰ ڈسپلے کی ترتیبات میں غیر فعال کر دیا گیا ہے تو HLG میں زبردستی تبدیلی اسے دوبارہ فعال کر دے گی۔"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"+HDR10 میں ہمیشہ زبردستی تبدیلی کریں"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"اگر HDR10+‎ کو HDR فارمیٹس میں اعلیٰ ڈسپلے کی ترتیبات میں غیر فعال کر دیا گیا ہے تو HDR10+‎ میں زبردستی تبدیلی اسے دوبارہ فعال کر دے گی۔"</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"ہمیشہ SDR میں زبردستی تبدیلی کریں"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"SDR میں زبردستی تبدیلی اعلیٰ ڈسپلے کی ترتیبات میں HDR فارمیٹس میں تمام فارمیٹس کو غیر فعال کر دے گی۔"</string>
-    <string name="match_content_frame_rate_title" msgid="153291168560947689">"مواد کا فریم ریٹ مماثل بنائیں"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"ہموار صرف"</string>
+    <string name="match_content_frame_rate_title" msgid="153291168560947689">"مماثل مواد کا فریم ریٹ"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"مناسب"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"اگر ایپ اس کی درخواست کرتی ہے تو آپ کا آلہ اس کے آؤٹ پٹ کو اس مواد کے اصل فریم ریٹ سے مماثل کرے گا جس کو آپ دیکھ رہے ہیں، صرف اس صورت میں جب آپ کا TV ایک مناسب منتقلی کو انجام دے سکتا ہے۔"</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"آپ کا منسلک کردہ ڈسپلے ہموار ریفریش ریٹ ٹرانزیشنز کو سپورٹ نہیں کرتا ہے۔ اس اختیار کا کوئی اثر نہیں ہوگا جب تک کہ آپ کسی ایسے ڈسپلے میں تبدیل نہیں کرتے جو اسے سپورٹ کرتا ہو۔"</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"ہمیشہ"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"غیر مناسب"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"اگر ایپ اس کی درخواست کرتی ہے تو آپ کا آلہ اس کے آؤٹ پٹ کو اس مواد کے اصل فریم ریٹ سے مماثل کرے گا جس کو آپ دیکھ رہے ہیں۔ ویڈیو پلے بیک سے باہر نکلنے یا داخل ہونے کے دوران ہو سکتا ہے ایک سیکنڈ کے لیے آپ کی اسکرین خالی ہو جائے۔"</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"کبھی نہیں"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"اگر ایپ اس کی درخواست کرتی ہے تو بھی آپ کا آلہ کبھی اس کے آؤٹ پٹ کو اس مواد کے اصل فریم ریٹ سے مماثل کرنے کی کوشش نہیں کرے گا جس کو آپ دیکھ رہے ہیں۔"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"ریزولیوشن کو ‎%1$s میں تبدیل کریں؟"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"اب سے ‏%1$s کا استعمال کرنے کے لیے \'ٹھیک ہے\' کو منتخب کریں۔"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby ویژن ‎%1$s پر تعاون یافتہ نہیں ہے اور \"جدید ترین ڈسپلے کی ترتیبات\" میں غیر فعال ہو جائے گا"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"یہ موڈ اس کو سپورٹ کرتا ہے: %1$s\nکچھ TVs پر، HDR کے مزید فارمیٹس کو فعال کرنے کے لیے آپ کو بہتر کردہ HDMI کو آن کرنا پڑ سکتا ہے۔ یہ دیکھنے کے لیے اپنے TV کی ترتیبات چیک کریں کہ آیا یہ تعاون یافتہ ہے یا نہیں۔"</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"یہ وضع ‎%1$s کو سپورٹ کرتی ہے۔ کچھ TVs پر، HDR کے مزید فارمیٹس کو فعال کرنے کے لیے آپ کو بہتر کردہ HDMI کو آن کرنا پڑ سکتا ہے۔ یہ دیکھنے کے لیے اپنے TV کی ترتیبات چیک کریں کہ آیا یہ تعاون یافتہ ہے یا نہیں۔"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"منسوخ کریں"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ٹھیک ہے"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"کیش کیا ہوا ڈیٹا صاف کریں؟"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"یہ سبھی ایپس کیلئے کیش کیے ہوئے ڈیٹا کو صاف کر دے گا۔"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"یہ آلہ آپ کی تنظیم کے زیر انتظام ہے۔"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"یہ آلہ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> کے زیر انتظام ہے۔"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"مزید جانیں"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{کیمرا ایپ}other{کیمرا ایپس}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"کیلنڈر ایپ"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"براہ کرم توثیق کریں کہ دیکھتے ہوئے ڈسپلے کو بند ہونے سے روکیں، جس میں توانائی کے استعمال میں اضافے کا امکان ہے۔"</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"غیر فعال ہرنے پر"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"دیکھنے پر"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"خودکار طور پر آف کریں"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"غیر فعال ہونے پر خودکار طور پر آف کریں"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"دیکھتے وقت خودکار طور پر آف کریں"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"خودکار طور پر TV بند کریں"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"غیر فعال ہونے پر خودکار طور پر TV بند کریں"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"دیکھتے وقت خودکار طور پر TV بند کریں"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"غیر فعال ہونے کے وقت\" کا ٹائمر \"دیکھنے کے وقت\" کے ٹائمر سے کم ہونا چاہیے"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"دیکھنے کے وقت\" کا ٹائمر \"غیر فعال ہونے کے وقت\" کے ٹائمر سے زیادہ ہونا چاہیے"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"اسٹینڈ بائی میں نیٹ ورک کنکشن محدود کریں"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"برتاؤ پر پاور"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"ری سیٹ کریں"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"ایتھرنیٹ سے جوڑا بنانے کا کوڈ"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"توانائی کی وضعیں"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"TV کے استعمال میں نہ ہونے پر توانائی کی کارکردگی کو بہتر بنائیں"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"فعال کرتا ہے:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"نوٹ کریں کہ یہ وضع آلہ کی بجلی کی کھپت کو بڑھا سکتی ہے۔"</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" کو فعال کریں"</string>
 </resources>
diff --git a/Settings/res/values-uz/energy-modes.xml b/Settings/res/values-uz/energy-modes.xml
deleted file mode 100644
index ede773f59..000000000
--- a/Settings/res/values-uz/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Asosiy tarmoq funksiyalari"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Kam quvvatli"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Televizor ishlatilmaganda tarmoq aloqasini faolsizlantirish."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Muhim yangilanishlar va funksiyalar"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Tavsiya etilgan tarmoq funksiyalari"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Moslashtirilgan quvvatli"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Televizorni tarmoqdan uygʻotish funksiyalarini yoqadi (tarmoq orqali kutish rejimida)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Qoʻshimcha tarmoq funksiyalari"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Yuqori quvvatli"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Tavsiya etilgan funksiyalardan tashqari bu parametr yoqilsa, televizorda qoʻshimcha funksiyalar yoqiladi, lekin ular quvvat sarfini oshirishi mumkin."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-uz/strings.xml b/Settings/res/values-uz/strings.xml
index 916f3e6ca..6034332e3 100644
--- a/Settings/res/values-uz/strings.xml
+++ b/Settings/res/values-uz/strings.xml
@@ -23,13 +23,13 @@
     <string name="general_action_yes" msgid="1303080504548165355">"Ha"</string>
     <string name="general_action_no" msgid="674735073031386948">"Yoʻq"</string>
     <string name="action_on_title" msgid="1074972820237738324">"YONIQ"</string>
-    <string name="action_off_title" msgid="3598665702863436597">"Oʻchiq"</string>
+    <string name="action_off_title" msgid="3598665702863436597">"Yoqilmagan"</string>
     <string name="action_on_description" msgid="9146557891514835767">"YONIQ"</string>
-    <string name="action_off_description" msgid="1368039592272701910">"Oʻchiq"</string>
+    <string name="action_off_description" msgid="1368039592272701910">"Yoqilmagan"</string>
     <string name="agree" msgid="8155497436593889753">"Roziman"</string>
     <string name="disagree" msgid="7402998517682194430">"Rozi emasman"</string>
     <string name="enabled" msgid="5127188665060746381">"Yoniq"</string>
-    <string name="disabled" msgid="4589065923272201387">"Oʻchiq"</string>
+    <string name="disabled" msgid="4589065923272201387">"Yoqilmagan"</string>
     <string name="unavailable" msgid="1610732303812180196">"Ishlamaydi"</string>
     <string name="allow" msgid="6982558814345894019">"Ruxsat"</string>
     <string name="deny" msgid="8291577308813053917">"Rad etish"</string>
@@ -53,7 +53,7 @@
     <string name="sound_category_title" msgid="7899816751041939518">"Tovush"</string>
     <string name="applications_category_title" msgid="7112019490898586223">"Ilovalar"</string>
     <string name="device_pref_category_title" msgid="8292572846154873762">"Qurilma parametrlari"</string>
-    <string name="accessibility_category_title" msgid="1552664829936369592">"Qulayliklar"</string>
+    <string name="accessibility_category_title" msgid="1552664829936369592">"Maxsus imkoniyatlar"</string>
     <string name="remotes_and_accessories_category_title" msgid="4795119810430255047">"Pultlar va aksessuarlar"</string>
     <string name="display_and_sound_category_title" msgid="9203309625380755860">"Displey va tovush"</string>
     <string name="help_and_feedback_category_title" msgid="7036505833991003031">"Yordam/fikr-mulohaza"</string>
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Zaxiralash va qayta tiklash"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Zavod sozlamalarini tiklash"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibrlash"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Oʻchirish taymeri"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Televizorni oʻchirish va quvvatni tejash uchun taymerni sozlang"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Quvvat va energiya"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Eco sozlamalari"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Qurilmalar"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Formatlarni tanlang"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Kengaytirilgan tovush sozlamalari"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Oʻyin rejimiga ruxsat berish"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Mos kontent dinamik diapazoni"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Bu parametr yoqilsa, tizim tasvir formatini kontentga moslab almashtiradi. Mos kelmagan formatda qora ekran chiqishi mumkin.\n\nYanada mos formatlarni koʻrish uchun Kengaytirilgan ekran sozlamalari ustiga bosing."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Afzal dinamik diapazon"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Tizim asosli oʻgirish"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Formatga oʻgirishni tizim boshqaradi"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Bu parametr tanlanganda, tizim displeyingizga yuboriladigan mos dinamik diapazonni aniqlaydi va zarur vaqtda kontentni ushbu dinamik diapazonga oʻgiradi."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Doim kontent formatiga mos keladi"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Majburiy oʻgirish"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Mos formatga oʻgirishga majbur qiladi"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Majburan mos formatga oʻgiriladi. Majburiy oʻgirish Displey rejimi yoki HDR formatidagi boshqa sozlamalarga taʼsir qilishi mumkin."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Doim SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Doim <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"HDR chiqish bilan ochilsinmi?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Standart holatda <xliff:g id="HDR_TYPE">%s</xliff:g> sifatida oʻgiriladi."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Displeyingiz 1080p 60Hz aniqlik darajasida ishlaydi. Bu parametr 4K 60Hz aniqlik darajasida ishlayotganda displeyingizga mos kelmaydi."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision joriy aniqlik darajasida ishlamaydi. Dolby Vision funksiyasini qoʻlda yoqsangiz, displeyingiz aniqlik darajasi 1080p 60Hz ga oʻzgaradi."</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Aniqlik darajasi 1080p 60Hz ga oʻzgartirilsinmi?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Doimiy Dolby Vision rejimi"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Kengaytirilgan ekran sozlamalaridagi HDR formatlarda Dolby Vision yoqilmagan boʻlsa, doimiy Dolby Vision rejimida u qayta yoqiladi."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Doimiy HDR10 rejimi"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Kengaytirilgan ekran sozlamalaridagi HDR formatlarda HDR10 yoqilmagan boʻlsa, doimiy HDR10 rejimida u qayta yoqiladi."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Doimiy HGL rejimi"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Kengaytirilgan ekran sozlamalaridagi HDR formatlarda HGL yoqilmagan boʻlsa, doimiy HGL rejimida u qayta yoqiladi."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Doimiy HDR10+ rejimi"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Kengaytirilgan ekran sozlamalaridagi HDR formatlarda HDR10+ yoqilmagan boʻlsa, doimiy HDR10+ rejimida u qayta yoqiladi."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Doimiy SDR rejimi"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Kengaytirilgan ekran sozlamalaridagi HDR formatlarda SDR yoqilmagan boʻlsa, doimiy SDR rejimida u qayta yoqiladi."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Kontent kadr almashish tezligini moslash"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Faqat uzluksiz"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Kadr almashish tezligiga rozilik bildirish"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Ilova talab qilsa, ijrodagi kontent kadr almashish tezligi formatini qurilmaning oʻzi avtomatik sozlaydi. Faqat televizoringiz ravon oʻtishni taʼminlay olsa."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Ulangan displeyda uzluksiz yangilanish chastotasidagi oʻtish effektlari ishlamaydi. Mos displey ulanmaguncha bu parametr hech qanday oʻzgarish bermaydi."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Har doim"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Kadr almashish tezligiga rozi emasman"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Ilova talab qilsa, ijrodagi kontent kadr almashish tezligi formatini qurilmaning oʻzi avtomatik sozlaydi. Bunday holda video ijrosi boshida yoki tomoshadan keyin ekran qisqa vaqt oʻchishi mumkin."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Hech qachon"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Ilova talab qilsa ham, ijrodagi kontent kadr almashish tezligi formatini qurilmaning oʻzi avtomatik sozlaydi."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Tiniqlik %1$s sifatiga almashsinmi?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Hozirdan %1$s ishlatish uchun OK tugmasini bosing."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision %1$s rejimida ishlamaydi va “Kengaytirilgan ekran sozlamalari” bandida faolsizlantiriladi"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Bu rejimida ishlaydi: %1$s\nAyrim televizorlarda boshqa HDR formatlarini Kengaytirilgan HDMI yoniqligida tanlash mumkin. Buning ishlashini televizor sozlamalari orqali tekshirish mumkin."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Bu rejim %1$s tiniqlikda ishlaydi. Ayrim televizorlarda boshqa HDR formatlarini Kengaytirilgan HDMI yoniqligida tanlash mumkin. Buning ishlashini televizor sozlamalari orqali tekshirish mumkin."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Bekor qilish"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Kesh tozalansinmi?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Barcha ilovalarning keshi o‘chirib tashlanadi."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Bu – tashkilotingiz tomonidan boshqariladigan qurilma."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Bu – <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tomonidan boshqariladigan qurilma."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Batafsil"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kamera uchun ilova}other{Kamera uchun ilovalar}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Taqvim ilovasi"</string>
@@ -678,7 +652,7 @@
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="9200419191468995574">"Yuqori kontrastli matn"</string>
     <string name="accessibility_toggle_bold_text_preference_title" msgid="3328992531170432669">"Qalin matn"</string>
     <string name="accessibility_color_correction" msgid="6765093204922184119">"Ranglarni tuzatish"</string>
-    <string name="color_correction_usage" msgid="4160611639548748657">"Ranglarni tuzatish"</string>
+    <string name="color_correction_usage" msgid="4160611639548748657">"Rangni tuzatishdan foydalanish"</string>
     <string name="color_correction_color_mode" msgid="5081377780734779169">"Rangli rejim"</string>
     <string name="color_correction_mode_deuteranomaly" msgid="1513793544554228224">"Deyteranomaliya"</string>
     <string name="color_correction_mode_deuteranomaly_summary" msgid="5991561481464520986">"Qizil/yashil"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Ekran tomosha qilish vaqtida oʻchmasligini tasdiqlang, bunda energiya koʻproq sarflanishi mumkin."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Nofaol holatda"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Tomosha vaqtida"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Avtomatik oʻchirish"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Nofaolligida avtomatik oʻchirish"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Tomosha qilayotganda avtomatik oʻchirish"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"TV avtomatik oʻchirilsin"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Nofaolligida TV avtomatik oʻchirilsin"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Tomosha qilinayotganda TV avtomatik oʻchirilsin"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"“Nofaolligida” taymeri “Tomosha qilayotganda” taymeridan qisqaroq boʻlishi kerak"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"“Tomosha qilayotganda” taymeri “Nofaolligida” taymeridan uzunroq boʻlishi kerak"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Kutish rejimida tarmoqqa ulanishni cheklash"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Birlamchi ekran"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Tiklash"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Ethernet ulanish kodi"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Quvvat sarfi rejimlari"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Televizor ishlatilmaganda quvvat tejalishini oshirish"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Ishga tushadi:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Eslatma: bu rejim qurilmada quvvat sarfini oshirishi mumkin."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"“<xliff:g id="ENERGYMODENAME">%s</xliff:g>” rejimini yoqish"</string>
 </resources>
diff --git a/Settings/res/values-vi/energy-modes.xml b/Settings/res/values-vi/energy-modes.xml
deleted file mode 100644
index 9a6b9d121..000000000
--- a/Settings/res/values-vi/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Tính năng mạng thiết yếu"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Mức sử dụng năng lượng thấp"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Tắt kết nối mạng khi bạn không dùng TV."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Chức năng và bản cập nhật quan trọng"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Tính năng mạng đề xuất"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Mức sử dụng năng lượng tối ưu"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Bật các tính năng đánh thức TV qua mạng (chế độ chờ có kết nối mạng)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Chèn tính năng 1]"</item>
-    <item msgid="8724721267222341891">"[Chèn tính năng 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Tính năng mạng bổ sung"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Mức sử dụng năng lượng cao hơn"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Ngoài tính năng đề xuất, tuỳ chọn này còn bật các tính năng bổ sung khi bạn không dùng TV và do đó có thể làm tăng mức sử dụng năng lượng."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Chèn tính năng 1]"</item>
-    <item msgid="170760143032597722">"[Chèn tính năng 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-vi/strings.xml b/Settings/res/values-vi/strings.xml
index 53e175f4b..1d0c747cf 100644
--- a/Settings/res/values-vi/strings.xml
+++ b/Settings/res/values-vi/strings.xml
@@ -69,7 +69,7 @@
     <string name="account_sync" msgid="4315295293211313989">"Chọn ứng dụng được đồng bộ hóa"</string>
     <string name="sync_now" msgid="4335217984374620551">"Đồng bộ hóa ngay bây giờ"</string>
     <string name="sync_in_progress" msgid="8081367667406185785">"Đang đồng bộ hóa…"</string>
-    <string name="last_synced" msgid="8371967816955123864">"Đồng bộ hoá lần gần đây nhất: <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="last_synced" msgid="8371967816955123864">"Đồng bộ lần cuối <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="sync_disabled" msgid="6652778349371079140">"Đã tắt"</string>
     <string name="account_remove" msgid="8456848988853890155">"Xóa tài khoản"</string>
     <string name="account_remove_failed" msgid="5654411101098531690">"Không thể xóa tài khoản"</string>
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Sao lưu và khôi phục"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Đặt lại dữ liệu về trạng thái ban đầu"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Hiệu chỉnh"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Hẹn giờ tắt"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Hẹn giờ tắt TV để tiết kiệm năng lượng"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Điện và năng lượng"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Chế độ cài đặt Tiết kiệm năng lượng"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Thiết bị"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Chọn các định dạng"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Cài đặt âm thanh nâng cao"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Cho phép chế độ trò chơi"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"So khớp dải động của nội dung"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Khi bạn bật tuỳ chọn này, hệ thống sẽ chuyển giữa các định dạng dải động khác nhau sao cho phù hợp với nội dung. Màn hình có thể chuyển sang màu đen trong quá trình chuyển định dạng.\n\nNhấp vào chế độ cài đặt Hiển thị nâng cao để có thêm lựa chọn về dải động."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Dải động ưa thích"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Chuyển đổi sang định dạng hệ thống ưu tiên"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Hãy để hệ thống quản lý việc chuyển đổi định dạng"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Khi bạn chọn tuỳ chọn này, hệ thống sẽ xác định dải động phù hợp để gửi đến màn hình của bạn và chuyển đổi nội dung sang dải động này nếu cần."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Luôn phù hợp với định dạng của nội dung"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Buộc chuyển đổi"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Buộc chuyển đổi sang định dạng ưu tiên"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Buộc chuyển đổi sang định dạng ưu tiên. Việc buộc chuyển đổi có thể ảnh hưởng đến các cài đặt khác trong Chế độ hiển thị hay Định dạng HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Luôn chuyển sang SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Luôn chuyển sang <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Bạn có muốn buộc chuyển đổi đầu ra HDR không?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Theo mặc định, cần phải chuyển đổi thành <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Màn hình sẽ chạy ở độ phân giải 1080p 60Hz. Tuỳ chọn này không tương thích với màn hình khi chạy ở độ phân giải 4k 60Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision không được hỗ trợ ở độ phân giải hiện tại. Nếu bạn bật Dolby Vision theo cách thủ công, độ phân giải của màn hình sẽ thay đổi thành 1080p 60 Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Thay đổi độ phân giải thành 1080p 60 Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Luôn buộc chuyển đổi sang Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Nếu Dolby Vision bị tắt trong mục Định dạng HDR của phần Cài đặt hiển thị nâng cao, việc buộc chuyển đổi sang Dolby Vision sẽ bật lại Dolby Vision."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Luôn buộc chuyển đổi sang HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Nếu HDR10 bị tắt trong mục Định dạng HDR của phần Cài đặt hiển thị nâng cao, việc buộc chuyển đổi sang HDR10 sẽ bật lại HDR10."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Luôn buộc chuyển đổi sang HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Nếu HLG bị tắt trong mục Định dạng HDR của phần Cài đặt hiển thị nâng cao, việc buộc chuyển đổi sang HLG sẽ bật lại HLG."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Luôn buộc chuyển đổi sang HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Nếu HDR10+ bị tắt trong mục Định dạng HDR của phần Cài đặt hiển thị nâng cao, việc buộc chuyển đổi sang HDR10+ sẽ bật lại HDR10+."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Luôn buộc chuyển đổi sang SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Việc buộc chuyển đổi sang SDR sẽ tắt tất cả định dạng trong mục Định dạng HDR của phần Cài đặt hiển thị nâng cao."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"So khớp tốc độ khung hình của nội dung"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Chỉ chuyển đổi liền mạch"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Liền mạch"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Nếu ứng dụng yêu cầu, thiết bị của bạn sẽ khớp đầu ra của màn hình với tốc độ khung hình gốc của nội dung bạn đang xem, CHỈ khi TV có thể thực hiện một lần chuyển đổi liền mạch."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Màn hình bạn đã kết nối không hỗ trợ chuyển đổi tốc độ làm mới liền mạch. Chế độ này sẽ không có hiệu lực nếu bạn không chuyển sang màn hình có hỗ trợ chuyển đổi."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Luôn luôn"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Không liền mạch"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Nếu ứng dụng yêu cầu, thiết bị của bạn sẽ khớp đầu ra của màn hình với tốc độ khung hình gốc của nội dung bạn đang xem. Việc này có thể khiến màn hình không hiển thị nội dung trong giây lát khi bạn thoát hoặc vào chế độ phát video."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Không bao giờ"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Ngay cả khi ứng dụng yêu cầu, thiết bị của bạn sẽ không bao giờ tìm cách khớp đầu ra của màn hình với tốc độ khung hình gốc của nội dung bạn đang xem."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Thay đổi độ phân giải thành %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Chọn OK để dùng %1$s từ giờ trở đi."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision không được hỗ trợ tại %1$s và sẽ bị tắt trong \"Cài đặt hiển thị nâng cao\""</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Chế độ này hỗ trợ: %1$s\nTrên một số TV, bạn có thể cần bật HDMI nâng cao để hỗ trợ nhiều định dạng HDR hơn. Kiểm tra chế độ cài đặt TV để xem định dạng này có được hỗ trợ hay không."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Chế độ này hỗ trợ %1$s. Trên một số TV, bạn có thể cần bật HDMI nâng cao để hỗ trợ nhiều định dạng HDR hơn. Kiểm tra chế độ cài đặt TV để xem định dạng này có được hỗ trợ hay không."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Hủy"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Xóa dữ liệu đã lưu trong bộ nhớ đệm?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Xóa dữ liệu lưu trong cache cho tất cả ứng dụng."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Thiết bị này do tổ chức của bạn quản lý."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Thiết bị này được <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> quản lý."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"Tìm hiểu thêm"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Ứng dụng máy ảnh}other{Ứng dụng máy ảnh}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Ứng dụng Lịch"</string>
@@ -786,7 +760,7 @@
     <string name="system_window_animation_scale" msgid="685477540250939659">"Tỷ lệ hình động của cửa sổ"</string>
     <string name="system_transition_animation_scale" msgid="7266380208347453619">"Tỷ lệ hình động chuyển đổi"</string>
     <string name="system_animator_duration_scale" msgid="3829445237130423625">"Tỷ lệ thời lượng trình tạo hình động"</string>
-    <string name="system_strict_mode_enabled" msgid="7392183793064579588">"Luôn bật chế độ nghiêm ngặt"</string>
+    <string name="system_strict_mode_enabled" msgid="7392183793064579588">"Đã bật chế độ nghiêm ngặt"</string>
     <string name="system_profile_gpu_rendering" msgid="1113416260742329348">"Kết xuất GPU cấu hình"</string>
     <string name="system_enable_traces" msgid="108745519968154528">"Bật theo dõi"</string>
     <string name="system_dont_keep_activities" msgid="4641165963339846161">"Không tiếp tục các hoạt động"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Vui lòng xác nhận rằng bạn không muốn màn hình tắt trong lúc xem (lựa chọn này có thể làm tăng mức sử dụng năng lượng)."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Khi không hoạt động"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Khi xem"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Tự động tắt"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Tự động tắt khi không hoạt động"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Tự động tắt khi xem"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Tự động tắt TV"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Tự động tắt TV khi không hoạt động"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Tự động tắt TV khi đang xem"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"Thời gian hẹn giờ \"Khi không hoạt động\" phải ngắn hơn thời gian hẹn giờ \"Khi xem\""</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"Thời gian hẹn giờ \"Khi xem\" phải dài hơn thời gian hẹn giờ \"Khi không hoạt động\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Hạn chế kết nối mạng khi ở chế độ chờ"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Chế độ khi bật TV"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Đặt lại"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Mã ghép nối Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Chế độ năng lượng"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Nâng cao hiệu suất sử dụng năng lượng khi bạn không dùng TV"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Các tính năng sẽ bật:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Lưu ý: Chế độ này có thể làm tăng mức tiêu thụ điện năng của thiết bị."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Bật \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/Settings/res/values-zh-rCN/energy-modes.xml b/Settings/res/values-zh-rCN/energy-modes.xml
deleted file mode 100644
index 3156ca1f5..000000000
--- a/Settings/res/values-zh-rCN/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"基本网络功能"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"低能耗"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"在您未使用电视时关闭网络连接。"</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"重要更新和功能"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"推荐的网络功能"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"优化能耗"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"开启可通过网络唤醒电视的功能（联网待机）。"</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"其他网络功能"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"高能耗"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"除了推荐的功能外，此选项还会在您未使用电视时开启可能会增加能耗的其他功能。"</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-zh-rCN/strings.xml b/Settings/res/values-zh-rCN/strings.xml
index 26e1b1c68..a43660815 100644
--- a/Settings/res/values-zh-rCN/strings.xml
+++ b/Settings/res/values-zh-rCN/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"备份和恢复"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"恢复出厂设置"</string>
     <string name="device_calibration" msgid="2907914144048739705">"校准"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"关机定时器"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"设置定时器，让系统助您将电视关机并节能"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"开关和电源"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"节能设置"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"设备"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"选择格式"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"高级声音设置"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"允许游戏模式"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"匹配内容的动态范围"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"启用这个选项后，系统会在各种动态范围格式之间切换以匹配内容。这可能会导致在格式切换期间出现黑屏。\n\n您可点击“高级显示设置”以查看更多动态范围选项。"</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"偏好的动态范围"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"系统自动转换"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"让系统管理格式转换"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"如果选择这个选项，系统会决定要发送至您显示屏的合适动态范围，并根据需要将内容转换至此动态范围。"</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"一律采用内容本身的格式"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"强制转换"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"强制转换至您偏好的格式"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"强制转换至您偏好的格式。如果强制进行转换，显示模式或 HDR 格式的其他设置可能会受到影响。"</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"一律转换至 SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"一律转换至<xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"要强制进行 HDR 输出操作吗？"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"默认情况下，系统会强制转换至<xliff:g id="HDR_TYPE">%s</xliff:g>。"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"您的显示屏将采用 1080p 60Hz 分辨率。这个选项不支持采用 4K 60Hz 分辨率的显示屏。"</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"当前分辨率不支持杜比视界。如果您手动启用杜比视界，您显示屏的分辨率将更改为 1080p 60Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"将分辨率更改为 1080p 60Hz？"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"始终强制转换成“杜比视界”"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"如果“高级显示设置”的“HDR 格式”中“杜比视界”处于停用状态，强制转换成“杜比视界”将重新启用此格式。"</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"始终强制转换成“HDR10”"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"如果“高级显示设置”的“HDR 格式”中“HDR10”处于停用状态，强制转换成“HDR10”将重新启用此格式。"</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"始终强制转换成“HLG”"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"如果“高级显示设置”的“HDR 格式”中“HLG”处于停用状态，强制转换成“HLG”将重新启用此格式。"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"始终强制转换成“HDR10+”"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"如果“高级显示设置”的“HDR 格式”中“HDR10+”处于停用状态，强制转换成“HDR10+”将重新启用此格式。"</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"始终强制转换成“SDR”"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"如果强制转换成“SDR”，“高级显示设置”的“HDR 格式”中的所有格式都将被停用。"</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"匹配内容的帧速率"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"仅限“流畅”"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"流畅"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"如果应用要求，您的设备会将输出的帧速率调整为您所观看内容的原始帧速率，前提是您的电视可以执行流畅转换。"</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"您连接的显示屏不支持流畅切换刷新率。您需要换用支持该功能的显示屏，此选项才能发挥作用。"</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"始终"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"非流畅"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"如果应用要求，您的设备会将输出的帧速率调整为您所观看内容的原始帧速率。这样一来，当视频开始播放或结束播放时，屏幕可能会短暂出现空白画面。"</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"永不"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"即使应用要求，您的设备也绝不会尝试将输出的帧速率调整为您所观看内容的原始帧速率。"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"将分辨率更改为 %1$s？"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"选择“确定”，即可立即开始使用%1$s。"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s不支持杜比视界，“高级显示设置”中将停用此模式"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"此模式支持：%1$s\n在某些电视上，您可能需要开启 HDMI 增强模式才能启用更多 HDR 格式。请查看电视设置以了解是否支持此模式。"</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"此模式支持%1$s。在某些电视上，您可能需要开启 HDMI 增强模式才能启用更多 HDR 格式。请查看电视设置以了解是否支持此模式。"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"取消"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"确定"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"要清除缓存的数据吗？"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"此操作会清除所有应用的缓存数据。"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"此设备由贵单位管理。"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"此设备由“<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>”管理。"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">"、"</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"了解详情"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{相机应用}other{相机应用}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"日历应用"</string>
@@ -671,7 +645,7 @@
     <string name="accessibility_display_category_title" msgid="593444602101558017">"显示"</string>
     <string name="accessibility_interaction_controls_category_title" msgid="5290687835178852745">"互动控制"</string>
     <string name="accessibility_audio_and_onscreen_text_category_title" msgid="113841605896486212">"音频和屏幕上的文字"</string>
-    <string name="accessibility_experimental_category_title" msgid="3401773834179170206">"实验性功能"</string>
+    <string name="accessibility_experimental_category_title" msgid="3401773834179170206">"实验性"</string>
     <string name="accessibility_services_category_title" msgid="8813843874978910442">"服务"</string>
     <string name="accessibility_service_settings" msgid="3251334786870932423">"服务设置"</string>
     <string name="accessibility_screen_reader_flattened_component_name" msgid="6834614827111101213">"com.google.android.marvin.talkback/com.google.android.marvin.talkback.TalkBackService"</string>
@@ -737,7 +711,7 @@
     <string name="color_yellow" msgid="3519470952904560404">"黄色"</string>
     <string name="color_magenta" msgid="2377854703399624607">"紫红色"</string>
     <string name="accessibility_toggle_audio_description_preference_title" msgid="933923296129403548">"语音描述"</string>
-    <string name="accessibility_audio_description_summary" msgid="2027813223650517036">"以语音的形式描述当前画面呈现的内容（仅限支持该设置的电影或电视节目）"</string>
+    <string name="accessibility_audio_description_summary" msgid="2027813223650517036">"听取有关当前屏幕画面内容的语音说明（仅限支持该设置的电影或电视节目）"</string>
     <string name="system_accessibility_status" msgid="8504842254080682515">"启用"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"配置"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"要使用<xliff:g id="SERVICE">%1$s</xliff:g>吗？"</string>
@@ -789,7 +763,7 @@
     <string name="system_strict_mode_enabled" msgid="7392183793064579588">"启用严格模式"</string>
     <string name="system_profile_gpu_rendering" msgid="1113416260742329348">"GPU 渲染模式分析"</string>
     <string name="system_enable_traces" msgid="108745519968154528">"启用跟踪"</string>
-    <string name="system_dont_keep_activities" msgid="4641165963339846161">"不保留 activity"</string>
+    <string name="system_dont_keep_activities" msgid="4641165963339846161">"不保留活动"</string>
     <string name="system_background_process_limit" msgid="1985373407150771045">"后台进程限制"</string>
     <string name="system_show_all_anrs" msgid="5353216640638263217">"显示所有ANR"</string>
     <string name="system_desc_stay_awake" msgid="8485868071929937500">"停用休眠功能"</string>
@@ -939,7 +913,7 @@
     <string name="device_apps_app_management_licenses" msgid="4809737266551899869">"第三方源代码"</string>
     <string name="device_apps_app_management_permissions" msgid="4951820230491375037">"权限"</string>
     <string name="device_apps_app_management_not_available" msgid="4198634078194500518">"无法使用应用"</string>
-    <string name="unused_apps" msgid="5539166745483454543">"闲置应用"</string>
+    <string name="unused_apps" msgid="5539166745483454543">"未使用的应用"</string>
     <string name="settings_ok" msgid="5950888975075541964">"确定"</string>
     <string name="settings_confirm" msgid="4489126458677153411">"确认"</string>
     <string name="settings_cancel" msgid="576094334743686152">"取消"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"请确认是否要停用在播放媒体时关闭显示屏的设置，停用此设置可能会使耗电量增加。"</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"在闲置时"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"在观看时"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"自动关闭"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"设备闲置时自动关闭"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"观看影视内容时自动关闭"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"自动将电视关机"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"在电视处于闲置状态时自动将其关机"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"在电视播放节目期间自动将其关机"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"“在闲置时”计时器设定的时间必须比“在观看时”计时器短"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"“在观看时”计时器设定的时间必须比“在闲置时”计时器长"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"在待机模式下限制网络连接"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"开机行为"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"重置"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"以太网配对码"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"耗能模式"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"在您未使用电视时改善能效"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"启用："</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"请注意，此模式可能会增加设备的耗电量。"</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"启用“<xliff:g id="ENERGYMODENAME">%s</xliff:g>”"</string>
 </resources>
diff --git a/Settings/res/values-zh-rHK/energy-modes.xml b/Settings/res/values-zh-rHK/energy-modes.xml
deleted file mode 100644
index e8eeea002..000000000
--- a/Settings/res/values-zh-rHK/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"必要網絡功能"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"低耗電量"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"在電視閒置時關閉網絡連線"</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"重要更新和功能"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"建議的網絡功能"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"優化耗電量"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"開啟可透過網絡喚醒電視的功能 (網絡待機)。"</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"額外網絡功能"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"耗電量增加"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"開啟這個選項後，即使電視閒置，系統仍會啟用建議及其他功能，並可能會增加耗電量。"</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-zh-rHK/strings.xml b/Settings/res/values-zh-rHK/strings.xml
index 7708fc627..907a1e0b7 100644
--- a/Settings/res/values-zh-rHK/strings.xml
+++ b/Settings/res/values-zh-rHK/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"備份和還原"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"回復原廠設定"</string>
     <string name="device_calibration" msgid="2907914144048739705">"校正"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"關機計時器"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"設定計時器，以定時關閉電視並節省能源"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"電源和能源"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"節能設定"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"裝置"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"選取格式"</string>
@@ -127,14 +127,14 @@
     <string name="surround_sound_format_dolby_truehd" msgid="5113046743572967088">"Dolby TrueHD"</string>
     <string name="surround_sound_format_e_ac3_joc" msgid="3360344066462262996">"配備 Dolby Atmos 技術的 Dolby Digital Plus"</string>
     <string name="surround_sound_format_dra" msgid="6102878163986662443">"DRA"</string>
-    <string name="surround_sound_auto_info" msgid="4829346839183591680">"請注意：如果你的裝置無法正確報告支援的格式，自動選項未必可以運作。"</string>
+    <string name="surround_sound_auto_info" msgid="4829346839183591680">"請注意：如果您的裝置無法正確報告支援的格式，自動選項未必可以運作。"</string>
     <string name="surround_sound_auto_title" msgid="4892922385727913277">"自動：只啟用音訊輸出裝置支援的格式 "</string>
     <string name="surround_sound_auto_summary" msgid="7073023654150720285">"選取後，系統將允許應用程式選擇裝置系統支援的任何音效格式。應用程式未必會選擇最高音質的格式。"</string>
     <string name="surround_sound_none_title" msgid="1600095173519889326">"無：一律不使用環迴立體聲"</string>
     <string name="surround_sound_manual_title" msgid="4935447605070985537">"手動：不論音訊輸出裝置支援哪些格式，只啟用或停用此裝置已選的支援格式。"</string>
-    <string name="surround_sound_manual_summary" msgid="5155535847461070572">"選取後，你可以手動停用裝置系統支援但播放時出現問題的音效格式，同時可以啟用裝置系統不支援的音效格式。在個別情況下，應用程式未必會選擇最高音質的格式。"</string>
+    <string name="surround_sound_manual_summary" msgid="5155535847461070572">"選取後，您可以手動停用裝置系統支援但播放時出現問題的音效格式，同時可以啟用裝置系統不支援的音效格式。在個別情況下，應用程式未必會選擇最高音質的格式。"</string>
     <string name="surround_sound_enable_unsupported_dialog_title" msgid="9155579373370356463">"要啟用不支援的音效格式嗎？"</string>
-    <string name="surround_sound_enable_unsupported_dialog_desc" msgid="1901648758103522741">"你已連接的音響裝置並不支援此格式。這可能會導致裝置出現非預期的行為，如發出大聲的噪音或劈啪聲。"</string>
+    <string name="surround_sound_enable_unsupported_dialog_desc" msgid="1901648758103522741">"您已連接的音響裝置並不支援此格式。這可能會導致裝置出現非預期的行為，如發出大聲的噪音或劈啪聲。"</string>
     <string name="surround_sound_enable_unsupported_dialog_cancel" msgid="3499147437078761105">"取消"</string>
     <string name="surround_sound_enable_unsupported_dialog_ok" msgid="7466983147896640444">"仍要變更"</string>
     <string name="surround_sound_supported_title" msgid="4873195851187547020">"支援的格式"</string>
@@ -151,41 +151,14 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"進階音效設定"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"允許啟用遊戲模式"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"配合內容的動態範圍"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"啟用這個選項後，系統會因應內容切換匹配的動態範圍格式。切換格式時螢幕可能會全黑。\n\n點擊「進階顯示」設定查看更多動態範圍選項。"</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"偏好的動態範圍"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"系統自動轉換"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"由系統管理格式轉換"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"選取這個選項，系統就會向螢幕傳送合適的動態範圍，並按需要將內容轉換至該動態範圍。"</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"一律採用內容的格式"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"強制轉換"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"強制轉換至偏好格式"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"強制轉換至你偏好的格式。強制轉換可能會影響「顯示模式」或「HDR 格式」內的其他設定。"</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"一律轉換至 SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"一律轉換至 <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"要強制輸出 HDR 格式嗎？"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"根據預設，格式會強制轉換至 <xliff:g id="HDR_TYPE">%s</xliff:g>。"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"你的螢幕將採用 1080p 60Hz 解像度。此選項不支援採用 4K 60Hz 解像度的螢幕。"</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"目前的解像度並不支援 Dolby Vision。若你手動啟用 Dolby Vision，螢幕解像度度將會變更為 1080p 60Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"要將解像度變更為 1080p 60Hz？"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"一律強制轉換至 Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"如「進階顯示設定」中的「HDR 格式」已停用 Dolby Vision，強制轉換至 Dolby Vision 便可重新啟用此格式。"</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"一律強制轉換至 HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"如「進階顯示設定」中的「HDR 格式」已停用 HDR10，強制轉換至 HDR10 便可重新啟用此格式。"</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"一律強制轉換至 HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"如「進階顯示設定」中的「HDR 格式」已停用 HLG，強制轉換至 HLG 便可重新啟用此格式。"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"一律強制轉換至 HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"如「進階顯示設定」中的「HDR 格式」已停用 HDR10+，強制轉換至 HDR10+ 便可重新啟用此格式。"</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"一律強制轉換至 SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"強制轉換至 SDR 將停用「進階顯示設定」中的所有「HDR 格式」選項。"</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"配合內容的影格速率"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"只限流暢轉換"</string>
-    <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"如果應用程式要求，你的裝置會根據你正觀看內容的原來影格速率輸出內容 (只限電視可流暢轉換時)。"</string>
-    <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"你連接的顯示屏不支援更新率無縫轉換功能。除非你轉用支援的顯示屏，否則這個選項不會產生任何作用。"</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"一律啟用"</string>
-    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"如果應用程式要求，你的裝置會根據你正觀看內容的原來影格速率輸出內容。這可能會令螢幕在退出或開始影片播放時暫時空白一秒。"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"流暢"</string>
+    <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"如果應用程式要求，您的裝置會根據您正觀看內容的原來影格速率輸出內容 (只限電視可流暢轉換時)。"</string>
+    <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"您連接的顯示屏不支援更新率無縫轉換功能。除非您轉用支援的顯示屏，否則這個選項不會產生任何作用。"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"非流暢"</string>
+    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"如果應用程式要求，您的裝置會根據您正觀看內容的原來影格速率輸出內容。這可能會令螢幕在退出或開始影片播放時暫時空白一秒。"</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"永不"</string>
-    <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"即使應用程式要求，你的裝置也永不會嘗試根據你正觀看內容的原來影格速率輸出內容。"</string>
+    <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"即使應用程式要求，您的裝置也永不會嘗試根據您正觀看內容的原來影格速率輸出內容。"</string>
     <string name="font_scale_settings_title" msgid="4114019544800225980">"文字縮放比例"</string>
     <string name="font_scale_item_detail" msgid="1558315053348778805">"縮放至 <xliff:g id="SCALE">%1$d</xliff:g>%%"</string>
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"範例文字"</string>
@@ -205,7 +178,7 @@
     <string name="hdr_format_hdr10plus" msgid="4371652089162162876">"HDR10+"</string>
     <string name="hdr_format_dolby_vision" msgid="7367264615042999587">"Dolby Vision"</string>
     <string name="hdr_format_selection_auto_summary" msgid="7384637194191436727">"選取後，系統將允許應用程式選擇裝置系統支援的任何 HDR 格式。應用程式未必會選擇最高畫質的格式。"</string>
-    <string name="hdr_format_selection_manual_summary" msgid="7886959642083639353">"選取後，你可以手動停用裝置系統支援但播放時出現問題的 HDR 格式，但你無法強行啟用裝置系統不支援的 HDR 格式。應用程式未必會選擇最高畫質的格式。"</string>
+    <string name="hdr_format_selection_manual_summary" msgid="7886959642083639353">"選取後，您可以手動停用裝置系統支援但播放時出現問題的 HDR 格式，但您無法強行啟用裝置系統不支援的 HDR 格式。應用程式未必會選擇最高畫質的格式。"</string>
     <string name="hdr_format_info" msgid="5652559220799426076">"格式資料"</string>
     <string name="hdr_show_formats" msgid="171065892975445851">"顯示格式"</string>
     <string name="hdr_hide_formats" msgid="8561568998525727230">"隱藏格式"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"要將解像度變更為 %1$s 嗎？"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"選擇 [確定] 即可從現在開始使用 %1$s。"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"「%1$s」並不支援 Dolby Vision，因此 Dolby Vision 會在「進階顯示設定」中停用"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"此模式支援：%1$s\n在部分電視上，你可能要開啟 HDMI 增強格式，方可啟用更多 HDR 格式。請檢查電視設定以確認支援狀況。"</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"此模式支援 %1$s。在部分電視上，您可能要開啟 HDMI 增強格式，方可啟用更多 HDR 格式。請檢查電視設定以確認支援狀況。"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"取消"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"確定"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"清除快取資料？"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"這會清除所有應用程式的快取資料。"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -258,7 +231,7 @@
     <string name="connected_devices_slice_pref_title" msgid="6761921505544005991">"遙控器和配件"</string>
     <string name="bluetooth_toggle_title" msgid="3808904783456336104">"藍牙"</string>
     <string name="bluetooth_toggle_confirmation_dialog_title" msgid="3906746631391295717">"關閉藍牙"</string>
-    <string name="bluetooth_toggle_confirmation_dialog_summary" msgid="9017044450625172698">"關閉藍牙後，你將無法透過遙控器使用「Google 助理」。"</string>
+    <string name="bluetooth_toggle_confirmation_dialog_summary" msgid="9017044450625172698">"關閉藍牙後，您將無法透過遙控器使用「Google 助理」。"</string>
     <string name="bluetooth_pair_accessory" msgid="5508750142754420984">"配對配件"</string>
     <string name="bluetooth_known_devices_category" msgid="6895470515631452961">"配件"</string>
     <string name="bluetooth_official_remote_category" msgid="5817814488268307170">"遙控器"</string>
@@ -276,13 +249,13 @@
     <string name="bluetooth_serial_number_label" msgid="6639294603220209971">"藍牙位址"</string>
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"已連接"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"已中斷連接"</string>
-    <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"你沒有變更藍牙設定的權限。"</string>
+    <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"您沒有變更藍牙設定的權限。"</string>
     <string name="send_feedback" msgid="936698637869795473">"傳送意見"</string>
     <string name="launch_help" msgid="2607478763131952469">"說明中心"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
     <string name="system_date_time" msgid="5922833592234018667">"日期和時間"</string>
     <string name="system_language" msgid="5516099388471974346">"語言"</string>
-    <string name="language_empty_list_user_restricted" msgid="5430199913998605436">"你沒有變更裝置語言的權限。"</string>
+    <string name="language_empty_list_user_restricted" msgid="5430199913998605436">"您沒有變更裝置語言的權限。"</string>
     <string name="system_keyboard" msgid="1514460705385401872">"鍵盤"</string>
     <string name="system_keyboard_autofill" msgid="8530944165814838255">"鍵盤和自動填入"</string>
     <string name="system_autofill" msgid="6983989261108020046">"自動填入"</string>
@@ -304,14 +277,14 @@
     <string name="number_of_device_admins_none" msgid="2734299122299837459">"沒有使用中的應用程式"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="108190334043671416">"已由管理員、加密政策或認證儲存空間停用"</string>
     <string name="enterprise_privacy_settings" msgid="8226765895133003202">"受管理的裝置資料"</string>
-    <string name="enterprise_privacy_settings_summary_generic" msgid="5719549523275019419">"由你的機構管理的變更和設定"</string>
+    <string name="enterprise_privacy_settings_summary_generic" msgid="5719549523275019419">"由您的機構管理的變更和設定"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="2866704039759872293">"由「<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>」管理的變更和設定"</string>
-    <string name="enterprise_privacy_header" msgid="9221881402582661521">"為讓你存取工作資料，你的機構可能會在裝置上變更設定和安裝軟件。\n\n如要瞭解詳情，請與你機構的管理員聯絡。"</string>
-    <string name="enterprise_privacy_exposure_category" msgid="1555735251238636669">"你機構可查看的資訊類型"</string>
-    <string name="enterprise_privacy_exposure_changes_category" msgid="7750498604032318318">"你機構管理員作出的變更"</string>
-    <string name="enterprise_privacy_device_access_category" msgid="7397106369136259850">"你對此裝置的存取權"</string>
-    <string name="enterprise_privacy_enterprise_data" msgid="8135491104894522008">"與你公司帳戶關聯的資料 (例如電郵和日曆)"</string>
-    <string name="enterprise_privacy_installed_packages" msgid="5012554762299490994">"你裝置上的應用程式清單"</string>
+    <string name="enterprise_privacy_header" msgid="9221881402582661521">"為讓您存取工作資料，您的機構可能會在裝置上變更設定和安裝軟件。\n\n如要瞭解詳情，請與您機構的管理員聯絡。"</string>
+    <string name="enterprise_privacy_exposure_category" msgid="1555735251238636669">"您機構可查看的資訊類型"</string>
+    <string name="enterprise_privacy_exposure_changes_category" msgid="7750498604032318318">"您機構管理員作出的變更"</string>
+    <string name="enterprise_privacy_device_access_category" msgid="7397106369136259850">"您對此裝置的存取權"</string>
+    <string name="enterprise_privacy_enterprise_data" msgid="8135491104894522008">"與您公司帳戶關聯的資料 (例如電郵和日曆)"</string>
+    <string name="enterprise_privacy_installed_packages" msgid="5012554762299490994">"您裝置上的應用程式清單"</string>
     <string name="enterprise_privacy_usage_stats" msgid="7062422823174345793">"每個應用程式的使用時間和數據用量"</string>
     <string name="enterprise_privacy_network_logs" msgid="305782312671493780">"最近的網絡流量記錄"</string>
     <string name="enterprise_privacy_bug_reports" msgid="2393617117911211486">"最新的錯誤報告"</string>
@@ -328,22 +301,23 @@
     <string name="enterprise_privacy_input_method" msgid="5814752394251833058">"預設鍵盤"</string>
     <string name="enterprise_privacy_input_method_name" msgid="1088874503312671318">"已設定為「<xliff:g id="APP_LABEL">%s</xliff:g>」"</string>
     <string name="enterprise_privacy_always_on_vpn_device" msgid="8845550514448914237">"已開啟「永久連線的 VPN」"</string>
-    <string name="enterprise_privacy_always_on_vpn_personal" msgid="6996782365866442280">"已開啟你個人設定檔中的「永久連線的 VPN」"</string>
-    <string name="enterprise_privacy_always_on_vpn_work" msgid="3674119583050531071">"已開啟你工作設定檔中的「永久連線的 VPN」"</string>
+    <string name="enterprise_privacy_always_on_vpn_personal" msgid="6996782365866442280">"已開啟您個人設定檔中的「永久連線的 VPN」"</string>
+    <string name="enterprise_privacy_always_on_vpn_work" msgid="3674119583050531071">"已開啟您工作設定檔中的「永久連線的 VPN」"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="2818848848337527780">"已設定全域 HTTP Proxy"</string>
     <string name="enterprise_privacy_ca_certs_device" msgid="975646846291012452">"信任的憑證"</string>
-    <string name="enterprise_privacy_ca_certs_personal" msgid="7641368559306519707">"你個人設定檔中信任的憑證"</string>
-    <string name="enterprise_privacy_ca_certs_work" msgid="2905939250974399645">"你工作設定檔中信任的憑證"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="7641368559306519707">"您個人設定檔中信任的憑證"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="2905939250974399645">"您工作設定檔中信任的憑證"</string>
     <string name="enterprise_privacy_number_ca_certs" msgid="5918439861975410142">"{count,plural, =1{# 個 CA 憑證}other{# 個 CA 憑證}}"</string>
     <string name="enterprise_privacy_lock_device" msgid="3140624232334033641">"管理員可以將裝置上鎖和重設密碼"</string>
     <string name="enterprise_privacy_wipe_device" msgid="1714271125636510031">"管理員可以刪除所有裝置資料"</string>
     <string name="enterprise_privacy_failed_password_wipe_device" msgid="8272298134556250600">"輸入錯誤密碼的次數上限；如果超出此上限，系統將刪除所有裝置資料"</string>
     <string name="enterprise_privacy_failed_password_wipe_work" msgid="1184137458404844014">"輸入錯誤密碼的次數上限；如果超出此上限，系統將刪除工作設定檔資料"</string>
     <string name="enterprise_privacy_number_failed_password_wipe" msgid="277415009661470768">"{count,plural, =1{# 次嘗試}other{# 次嘗試}}"</string>
-    <string name="do_disclosure_generic" msgid="8390478119591845948">"此裝置由你的機構管理。"</string>
+    <string name="do_disclosure_generic" msgid="8390478119591845948">"此裝置由您的機構管理。"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"此裝置由 <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> 管理。"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">"，"</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"瞭解詳情"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{相機應用程式}other{相機應用程式}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"日曆應用程式"</string>
@@ -356,7 +330,7 @@
     <string name="app_names_concatenation_template_3" msgid="4932774380339466733">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>、<xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>、<xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="tutorials" msgid="7880770425872110455">"教學課程"</string>
     <string name="about_system_update" msgid="7421264399111367755">"系統更新"</string>
-    <string name="system_update_description" msgid="998883510488461766">"此操作會將你的系統軟件更新至最新版本。你的裝置將會重新啟動。"</string>
+    <string name="system_update_description" msgid="998883510488461766">"此操作會將您的系統軟件更新至最新版本。您的裝置將會重新啟動。"</string>
     <string name="system_update_content_description" msgid="5702888187682876466">"系統更新，呢項操作會將你嘅系統軟件更新做最新版本。你部裝置將會重新啟動。"</string>
     <string name="about_preference" msgid="9112690446998150670">"關於"</string>
     <string name="device_name" msgid="566626587332817733">"裝置名稱"</string>
@@ -369,12 +343,12 @@
     <string name="about_version" msgid="6223547403835399861">"Android TV OS 版本"</string>
     <string name="about_serial" msgid="3432319328808745459">"序號"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV OS 版本"</string>
-    <string name="show_dev_countdown" msgid="4064986225625409361">"{count,plural, =1{你只需完成剩餘的 # 個步驟，便可成為開發人員}other{你只需完成剩餘的 # 個步驟，便可成為開發人員}}"</string>
+    <string name="show_dev_countdown" msgid="4064986225625409361">"{count,plural, =1{您只需完成剩餘的 # 個步驟，便可成為開發人員}other{您只需完成剩餘的 # 個步驟，便可成為開發人員}}"</string>
     <string name="about_ads" msgid="7662896442040086522">"廣告"</string>
-    <string name="ads_description" msgid="8081069475265061074">"管理你的廣告設定，例如重設廣告 ID。"</string>
+    <string name="ads_description" msgid="8081069475265061074">"管理您的廣告設定，例如重設廣告 ID。"</string>
     <string name="ads_content_description" msgid="1006489792324920289">"廣告，管理你嘅廣告設定，例如重設廣告 ID。"</string>
-    <string name="show_dev_on" msgid="612741433124106067">"你現已成為開發人員！"</string>
-    <string name="show_dev_already" msgid="1522591284776449818">"不用了，你已經是開發人員"</string>
+    <string name="show_dev_on" msgid="612741433124106067">"您現已成為開發人員！"</string>
+    <string name="show_dev_already" msgid="1522591284776449818">"不用了，您已經是開發人員"</string>
     <string name="device_info_default" msgid="2374506935205518448">"不明"</string>
     <string name="selinux_status" msgid="1146662734953021410">"SELinux 狀態"</string>
     <string name="selinux_status_disabled" msgid="4027105362332795142">"已停用"</string>
@@ -388,10 +362,10 @@
     <string name="device_status_summary" msgid="3270932829412434985">"網絡、序列號和其他資料"</string>
     <string name="manual" msgid="5683935624321864999">"手動"</string>
     <string name="regulatory_information" msgid="9107675969694713391">"監管資訊"</string>
-    <string name="device_feedback" msgid="4871903271442960465">"傳送你對這部裝置的意見"</string>
+    <string name="device_feedback" msgid="4871903271442960465">"傳送您對這部裝置的意見"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4641790432171693921">"啟動程式已解鎖"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="2979556699380115576">"請先連線至互聯網"</string>
-    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="1946089732305102622">"連線至互聯網或聯絡你的流動網絡供應商"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="1946089732305102622">"連線至互聯網或聯絡您的流動網絡供應商"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="5634005787486307657">"無法在已遭流動網絡供應商鎖定的裝置上啟用"</string>
     <string name="oem_lock_info_message" msgid="2165887409937351689">"請重新啟動裝置以啟用裝置保護功能。"</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="1654574152815129396">"已釋放共 <xliff:g id="SIZE">%1$s</xliff:g>\n\n上次執行時間：<xliff:g id="DATE">%2$s</xliff:g>"</string>
@@ -410,7 +384,7 @@
     <string name="terms_title" msgid="192888187310800678">"條款及細則"</string>
     <string name="webview_license_title" msgid="5370270485188947540">"WebView 系統授權"</string>
     <string name="consumer_information_title" msgid="7729729568416672733">"消費者資料"</string>
-    <string name="consumer_information_message" msgid="205236637689468764">"你可以在 Android TV 上找到來自應用程式開發人員和電影公司等第三方合作夥伴以及 Google 的內容。詳情請參閱 "<a href="g.co/tv/androidtvinfo">"g.co/tv/androidtvinfo"</a></string>
+    <string name="consumer_information_message" msgid="205236637689468764">"您可以在 Android TV 上找到來自應用程式開發人員和電影公司等第三方合作夥伴以及 Google 的內容。詳情請參閱 "<a href="g.co/tv/androidtvinfo">"g.co/tv/androidtvinfo"</a></string>
     <string name="consumer_information_button_ok" msgid="6979480064600038080">"確定"</string>
   <string-array name="wifi_signal_strength">
     <item msgid="4475363344103354364">"差"</item>
@@ -439,7 +413,7 @@
     <string name="wifi_setting_available_networks" msgid="2096957819727319750">"可用的網絡"</string>
     <string name="wifi_setting_other_options_add_network" msgid="6490215784178866978">"新增網絡"</string>
     <string name="wifi_setting_other_options_add_network_via_easyconnect" msgid="2869989555950644533">"快速連接"</string>
-    <string name="wifi_setting_other_options_add_network_via_easyconnect_info_summary" msgid="4564538591168691865">"「快速連接」可助你使用手機掃瞄 QR 碼，以快速連接 Wi-Fi。"</string>
+    <string name="wifi_setting_other_options_add_network_via_easyconnect_info_summary" msgid="4564538591168691865">"「快速連接」可助您使用手機掃瞄 QR 碼，以快速連接 Wi-Fi。"</string>
     <string name="security_type" msgid="2297615092250075696">"安全性類型"</string>
     <string name="other_network" msgid="5299289104661858596">"其他網絡…"</string>
     <string name="skip_network" msgid="3095529090560000692">"略過"</string>
@@ -512,12 +486,12 @@
     <string name="title_wifi_phase2_authentication" msgid="1167205033305931574">"選擇 <xliff:g id="SSID">%1$s</xliff:g> 的 phase2 驗證"</string>
     <string name="title_wifi_identity" msgid="6273917200971028259">"輸入 <xliff:g id="SSID">%1$s</xliff:g> 的身分"</string>
     <string name="title_wifi_anonymous_identity" msgid="5965175781722004334">"輸入 <xliff:g id="SSID">%1$s</xliff:g> 的匿名身分"</string>
-    <string name="wifi_setup_summary_title_connected" msgid="2725439590655448489">"你已連線至 <xliff:g id="SSID">%1$s</xliff:g>"</string>
+    <string name="wifi_setup_summary_title_connected" msgid="2725439590655448489">"您已連線至 <xliff:g id="SSID">%1$s</xliff:g>"</string>
     <string name="wifi_summary_title_connected" msgid="201105022065577659">"已連接網絡"</string>
     <string name="wifi_summary_title_not_connected" msgid="7991004795297065201">"未連接網絡"</string>
     <string name="wifi_summary_description_connected_to_wifi_network" msgid="8796747274977762311">"已連接 <xliff:g id="SSID">%1$s</xliff:g>。要連接至其他網絡嗎？"</string>
     <string name="wifi_summary_unknown_network" msgid="8044143986439139664">"未知的網絡"</string>
-    <string name="wifi_empty_list_user_restricted" msgid="7326314737931342236">"你無權更改 Wi-Fi 網絡。"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="7326314737931342236">"您無權更改 Wi-Fi 網絡。"</string>
     <string name="title_ok" msgid="6500452958848127145">"確定"</string>
     <string name="title_cancel" msgid="2337143367016419016">"取消"</string>
     <string name="storage_title" msgid="6637715914885228193">"儲存空間"</string>
@@ -540,14 +514,14 @@
     <string name="storage_migrate_away" msgid="7880100961434638430">"將資料轉移至其他儲存空間"</string>
     <string name="storage_no_apps" msgid="95566375753627272">"沒有任何應用程式可供備份"</string>
     <string name="storage_forget" msgid="4671975563260507003">"移除此裝置儲存空間"</string>
-    <string name="storage_forget_wall_of_text" msgid="230454348256179142">"如需使用儲存在此硬碟內的應用程式或資料，請重新插入。如果無法使用硬碟，可選擇忘記此儲存空間。\n\n如果你選擇忘記儲存空間，硬碟上的所有資料將被永久刪除。\n\n你可以稍後重新安裝應用程式，但儲存在此硬碟的相關資料將被刪除。"</string>
+    <string name="storage_forget_wall_of_text" msgid="230454348256179142">"如需使用儲存在此硬碟內的應用程式或資料，請重新插入。如果無法使用硬碟，可選擇忘記此儲存空間。\n\n如果您選擇忘記儲存空間，硬碟上的所有資料將被永久刪除。\n\n您可以稍後重新安裝應用程式，但儲存在此硬碟的相關資料將被刪除。"</string>
     <string name="storage_device_storage_section" msgid="22958375769694027">"儲存裝置"</string>
     <string name="storage_removable_storage_section" msgid="280332107650735088">"可攜式儲存裝置"</string>
     <string name="storage_reset_section" msgid="3896575204828589494">"重設"</string>
     <string name="storage_free_up" msgid="5719667150891467122">"騰出儲存空間"</string>
     <string name="storage_free_up_clear_cached_data" msgid="858596875459698634">"清除快取資料"</string>
     <string name="storage_free_up_clear_cached_data_summary" msgid="3111860361699185304">"騰出 <xliff:g id="SPACE">%1$s</xliff:g>"</string>
-    <string name="storage_free_up_clear_cached_data_info" msgid="719348815620748812">"清除佔用空間的臨時檔案。這不會影響應用程式偏好設定或離線影片等已儲存的資料，而你亦無需再次登入應用程式。"</string>
+    <string name="storage_free_up_clear_cached_data_info" msgid="719348815620748812">"清除佔用空間的臨時檔案。這不會影響應用程式偏好設定或離線影片等已儲存的資料，而您亦無需再次登入應用程式。"</string>
     <string name="storage_free_up_clear_cached_data_confirm_title" msgid="5047418718048910850">"要清除快取資料嗎？"</string>
     <string name="storage_free_up_clear_cached_data_confirm_description" msgid="4840728913914074729">"這會清除所有應用程式的快取資料。"</string>
     <string name="storage_free_up_uninstall_apps" msgid="7755671754934975908">"解除安裝應用程式"</string>
@@ -562,7 +536,7 @@
     <string name="storage_wizard_format_as_private_title" msgid="7985715762649933211">"格式化為裝置儲存空間"</string>
     <string name="storage_wizard_format_as_private_description" msgid="6143406934742456154">"USB 驅動器需要格式化，以策安全。格式化後，該驅動器只能用於此裝置。格式化將清除目前驅動器上的所有資料。要避免資料遺失，請先備份資料。"</string>
     <string name="storage_wizard_format_as_public_title" msgid="3546915348149438389">"清除和格式化"</string>
-    <string name="storage_wizard_format_as_public_description" msgid="5849129772499352597">"格式化後，你可在其他裝置使用此 USB 硬碟。USB 硬碟的所有資料將被刪除，請先將應用程式備份至其他裝置儲存空間。"</string>
+    <string name="storage_wizard_format_as_public_description" msgid="5849129772499352597">"格式化後，您可在其他裝置使用此 USB 硬碟。USB 硬碟的所有資料將被刪除，請先將應用程式備份至其他裝置儲存空間。"</string>
     <string name="storage_wizard_format_progress_title" msgid="3875906251546380271">"正在格式化 USB 驅動器…"</string>
     <string name="storage_wizard_format_progress_description" msgid="292229747129805538">"這個過程可能需時，請勿移除驅動器。"</string>
     <string name="storage_wizard_migrate_choose_title" msgid="8743036821605231654">"選擇接收轉移資料的儲存空間"</string>
@@ -575,7 +549,7 @@
     <string name="storage_wizard_migrate_progress_title" msgid="2623480667090826800">"正在將資料移至<xliff:g id="NAME">%1$s</xliff:g>…"</string>
     <string name="storage_wizard_migrate_progress_description" msgid="4023358325977284145">"此操作需時，請勿移除外置硬碟。\n某些應用程式在此期間將無法正常運作。"</string>
     <string name="storage_wizard_format_slow_title" msgid="7640229918512394316">"這驅動器好像有點緩慢。"</string>
-    <string name="storage_wizard_format_slow_summary" msgid="3674023258060474037">"你可以繼續，但轉移至此位置的應用程式可能會間斷，而資料傳輸亦可能需要較長時間。請考慮使用較高速的驅動器以提升效能。"</string>
+    <string name="storage_wizard_format_slow_summary" msgid="3674023258060474037">"您可以繼續，但轉移至此位置的應用程式可能會間斷，而資料傳輸亦可能需要較長時間。請考慮使用較高速的驅動器以提升效能。"</string>
     <string name="storage_wizard_format_action" msgid="3275676687226857170">"格式化"</string>
     <string name="storage_wizard_backup_apps_action" msgid="1402199004931596519">"備份應用程式"</string>
     <string name="storage_wizard_back_up_apps_title" msgid="6225663573896846937">"存儲在<xliff:g id="NAME">%1$s</xliff:g>的應用程式"</string>
@@ -588,7 +562,7 @@
     <string name="storage_wizard_move_app_progress_title" msgid="7058465372227392453">"正在轉移<xliff:g id="NAME">%1$s</xliff:g>…"</string>
     <string name="storage_wizard_move_app_progress_description" msgid="7673347796805764888">"請勿在轉移時移除驅動器。\n在完成轉移前，此裝置上的<xliff:g id="APPNAME">%1$s</xliff:g>應用程式將不能使用。"</string>
     <string name="storage_wizard_forget_confirm_title" msgid="3709482471888830896">"要移除裝置儲存空間嗎？"</string>
-    <string name="storage_wizard_forget_confirm_description" msgid="5896860042525566767">"執行「忘記」後，此硬碟內的所有資料將被永久刪除。你要繼續嗎？"</string>
+    <string name="storage_wizard_forget_confirm_description" msgid="5896860042525566767">"執行「忘記」後，此硬碟內的所有資料將被永久刪除。您要繼續嗎？"</string>
     <string name="storage_wizard_forget_action" msgid="5609631662522950596">"忘記"</string>
     <string name="storage_new_title" msgid="4768955281180255038">"已連接 USB 驅動器"</string>
     <string name="storage_new_action_browse" msgid="3355241742574072658">"瀏覽"</string>
@@ -637,17 +611,17 @@
     <string name="camera_physical_privacy_enabled_title" msgid="1944155695921165511">"已封鎖相機存取權"</string>
     <string name="camera_physical_privacy_enabled_text" msgid="6692088634676282779">"如要解除封鎖，請將裝置上的私隱開關移至相機開啟位置以允許相機存取權。"</string>
     <string name="mic_toggle_info_title" msgid="1086545614315873599">"麥克風存取權：<xliff:g id="SENSOR_STATE">%s</xliff:g>"</string>
-    <string name="mic_toggle_info_content" msgid="3187791167208947239">"啟用後，所有允許使用麥克風的應用程式和服務均可存取麥克風。\n\n停用後，任何應用程式或服務均無法存取麥克風。但你仍然可以透過按下遙控器上的「Google 助理」按鈕來與「Google 助理」對話。\n\n使用自訂通訊協定來與電視通訊的音響裝置可能不受此設定影響。"</string>
+    <string name="mic_toggle_info_content" msgid="3187791167208947239">"啟用後，所有允許使用麥克風的應用程式和服務均可存取麥克風。\n\n停用後，任何應用程式或服務均無法存取麥克風。但您仍然可以透過按下遙控器上的「Google 助理」按鈕來與「Google 助理」對話。\n\n使用自訂通訊協定來與電視通訊的音響裝置可能不受此設定影響。"</string>
     <string name="mic_remote_toggle_on_info_title" msgid="8503441878870972046">"遙控器上的麥克風已啟用"</string>
-    <string name="mic_remote_toggle_on_info_content" msgid="2715872916376493679">"「Google 助理」可存取你遙控器上的麥克風。你可透過按下遙控器上的「Google 助理」按鈕來與「Google 助理」對話。"</string>
+    <string name="mic_remote_toggle_on_info_content" msgid="2715872916376493679">"「Google 助理」可存取您遙控器上的麥克風。您可透過按下遙控器上的「Google 助理」按鈕來與「Google 助理」對話。"</string>
     <string name="mic_remote_toggle_off_info_title" msgid="4902909833546393713">"遙控器上的麥克風已停用"</string>
-    <string name="mic_remote_toggle_off_info_content" msgid="8062526350553191004">"你將無法再利用遙控器與「Google 助理」對話。請啟用麥克風存取權以使用「Google 助理」按鈕。"</string>
+    <string name="mic_remote_toggle_off_info_content" msgid="8062526350553191004">"您將無法再利用遙控器與「Google 助理」對話。請啟用麥克風存取權以使用「Google 助理」按鈕。"</string>
     <string name="camera_toggle_info_title" msgid="3871317082313736088">"相機存取權：<xliff:g id="SENSOR_STATE">%s</xliff:g>"</string>
     <string name="camera_toggle_info_content" msgid="2999965953853204003">"啟用後，所有獲授權的應用程式和服務均可存取此裝置的任何相機。\n\n設有自訂通訊協定的周邊相機將不受此設定影響。"</string>
     <string name="sensor_toggle_info_on" msgid="4568111889147132257">"已開啟"</string>
     <string name="sensor_toggle_info_off" msgid="7546772458177469821">"已關閉"</string>
     <string name="system_location" msgid="4057295363709016511">"位置"</string>
-    <string name="system_desc_location" msgid="1680134126100535031">"允許經你許可的應用程式使用你的位置資料"</string>
+    <string name="system_desc_location" msgid="1680134126100535031">"允許經您許可的應用程式使用您的位置資料"</string>
     <string name="system_network_location_confirm" msgid="7128162421781085332">"同意記錄位置資料"</string>
     <string name="location_mode_title" msgid="728244518174115443">"模式"</string>
     <string name="location_category_recent_location_requests" msgid="4541924383164183490">"最近的定位要求"</string>
@@ -664,9 +638,9 @@
     <string name="location_reporting" msgid="3552501333650895634">"位置報告"</string>
     <string name="location_history" msgid="4055660203090513120">"位置記錄"</string>
     <string name="location_reporting_desc" msgid="1580018652781674608">"Google 將在「Google 即時資訊」和「Google 地圖」等產品使用這項功能。啟用「位置報告」功能後，任何使用這項功能的 Google 產品，均可透過連結的 Google 帳戶儲存及使用裝置最近的位置資料。"</string>
-    <string name="location_history_desc" msgid="926674012916014270">"啟用此帳戶的位置記錄後，Google 就能儲存裝置的位置資料，以供你的應用程式使用。\n\n例如，「Google 地圖」能為你規劃路線，而「Google 即時資訊」能為你提供交通資訊。\n\n你隨時可以關閉位置記錄，但系統不會因此刪除記錄內容。如要查看及管理你的位置記錄，請瀏覽 maps.google.com/locationhistory。"</string>
+    <string name="location_history_desc" msgid="926674012916014270">"啟用此帳戶的位置記錄後，Google 就能儲存裝置的位置資料，以供您的應用程式使用。\n\n例如，「Google 地圖」能為您規劃路線，而「Google 即時資訊」能為您提供交通資訊。\n\n您隨時可以關閉位置記錄，但系統不會因此刪除記錄內容。如要查看及管理您的位置記錄，請瀏覽 maps.google.com/locationhistory。"</string>
     <string name="delete_location_history_title" msgid="707559064715633152">"刪除位置記錄"</string>
-    <string name="delete_location_history_desc" msgid="4035229731487113147">"這會刪除你透過這部裝置儲存在這個 Google 帳戶中的所有位置記錄，一旦刪除即無法復原。部分應用程式會因此停止運作，包括「Google 即時資訊」在內。"</string>
+    <string name="delete_location_history_desc" msgid="4035229731487113147">"這會刪除您透過這部裝置儲存在這個 Google 帳戶中的所有位置記錄，一旦刪除即無法復原。部分應用程式會因此停止運作，包括「Google 即時資訊」在內。"</string>
     <string name="accessibility_screen_readers_category_title" msgid="7742526514873922018">"螢幕閱讀器"</string>
     <string name="accessibility_display_category_title" msgid="593444602101558017">"顯示"</string>
     <string name="accessibility_interaction_controls_category_title" msgid="5290687835178852745">"互動控制功能"</string>
@@ -696,7 +670,7 @@
     <string name="palette_color_purple" msgid="2123828754639683555">"紫色"</string>
     <string name="palette_color_gray" msgid="4014534773994261194">"灰色"</string>
     <string name="accessibility_shortcut" msgid="5856158637840030531">"無障礙功能快速鍵"</string>
-    <string name="accessibility_shortcut_enable" msgid="6603542432267329986">"啟用無障礙功能捷徑"</string>
+    <string name="accessibility_shortcut_enable" msgid="6603542432267329986">"啟用無障礙功能快速鍵"</string>
     <string name="accessibility_shortcut_service" msgid="2053250146891420311">"快速鍵服務"</string>
     <string name="accessibility_shortcut_description" msgid="2050424178481510046">"啟用快速鍵後，同時按下返回和向下按鈕 3 秒即可啟動無障礙功能。"</string>
     <string name="accessibility_captions" msgid="3411554568812306549">"字幕"</string>
@@ -741,7 +715,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"啟用"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"設定"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"使用「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"除了密碼之外，「<xliff:g id="SERVICE">%1$s</xliff:g>」可收集你輸入的所有文字，包括信用卡號碼等個人資料。"</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"除了密碼之外，「<xliff:g id="SERVICE">%1$s</xliff:g>」可收集您輸入的所有文字，包括信用卡號碼等個人資料。"</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"關閉「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"若選取 [確定]，「<xliff:g id="SERVICE">%1$s</xliff:g>」就會關閉。"</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"文字轉語音"</string>
@@ -808,7 +782,7 @@
     <string name="security_unknown_sources_title" msgid="2012801664240314305">"不明來源"</string>
     <string name="security_unknown_sources_desc" msgid="7196715598352173267">"允許安裝「Play 商店」以外的應用程式"</string>
     <string name="security_unknown_sources_confirm_title" msgid="4600896691987804985">"允許安裝不明來源的應用程式"</string>
-    <string name="security_unknown_sources_confirm_desc" msgid="7883820068140189584">"你的裝置和個人資料較易受到來歷不明的應用程式入侵。如因使用這些應用程式而導致裝置受損或資料遺失，你同意負上全責。"</string>
+    <string name="security_unknown_sources_confirm_desc" msgid="7883820068140189584">"您的裝置和個人資料較易受到來歷不明的應用程式入侵。如因使用這些應用程式而導致裝置受損或資料遺失，您同意負上全責。"</string>
     <string name="system_hdcp_checking_never" msgid="3251512398865365135">"永不"</string>
     <string name="system_hdcp_checking_drm" msgid="2159124883496899278">"針對 DRM 內容"</string>
     <string name="system_hdcp_checking_always" msgid="5868177105455148262">"一律檢查"</string>
@@ -848,7 +822,7 @@
     <string name="title_current_autofill_service" msgid="9029001041887283153">"目前的自動填入服務"</string>
     <string name="title_select_autofill_service" msgid="696559582725756848">"選取自動填入服務"</string>
     <string name="autofill_none" msgid="1615056985649424207">"不用了"</string>
-    <string name="autofill_confirmation_message" msgid="3840267789160192558">"&lt;b&gt;請確定你信任此應用程式&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=「密碼服務」&gt;%1$s&lt;/xliff:g&gt;應用程式會根據你畫面上的內容判斷可自動填入的資料。"</string>
+    <string name="autofill_confirmation_message" msgid="3840267789160192558">"&lt;b&gt;請確定您信任此應用程式&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=「密碼服務」&gt;%1$s&lt;/xliff:g&gt;應用程式會根據您畫面上的內容判斷可自動填入的資料。"</string>
     <string name="computing_size" msgid="8623916230485437579">"正在計算..."</string>
     <string name="title_select_wifi_network" msgid="935820896444071617">"選取 Wi-Fi 網絡"</string>
     <string name="accessories_wifi_display_rename_device" msgid="8803397194143132061">"重新命名"</string>
@@ -882,13 +856,13 @@
     <string name="inputs_header_connected_input" msgid="4323324944548164849">"{count,plural, =1{已連接的訊號源}other{已連接的訊號源}}"</string>
     <string name="inputs_header_standby_input" msgid="600117963181008144">"{count,plural, =1{待機訊號源}other{待機訊號源}}"</string>
     <string name="inputs_header_disconnected_input" msgid="3852361100151289264">"{count,plural, =1{未連接的訊號源}other{未連接的訊號源}}"</string>
-    <string name="user_add_profile_item_summary" msgid="3211866291940617804">"限制透過你的帳戶存取應用程式和其他內容"</string>
+    <string name="user_add_profile_item_summary" msgid="3211866291940617804">"限制透過您的帳戶存取應用程式和其他內容"</string>
     <string name="user_new_profile_name" msgid="6637593067318708353">"限制存取的個人檔案"</string>
     <string name="user_restrictions_controlled_by" msgid="8124926446168030445">"由 <xliff:g id="APP">%1$s</xliff:g> 控制"</string>
     <string name="app_not_supported_in_limited" msgid="4046604594925826955">"這個應用程式不支援限制存取的個人檔案"</string>
-    <string name="app_sees_restricted_accounts" msgid="174038126799649152">"這個應用程式可以存取你的帳戶"</string>
+    <string name="app_sees_restricted_accounts" msgid="174038126799649152">"這個應用程式可以存取您的帳戶"</string>
     <string name="restriction_location_enable_title" msgid="2552780806199464266">"地點"</string>
-    <string name="restriction_location_enable_summary" msgid="3719330231217994482">"允許應用程式使用你的位置資訊"</string>
+    <string name="restriction_location_enable_summary" msgid="3719330231217994482">"允許應用程式使用您的位置資訊"</string>
     <string name="restricted_profile_switch_to" msgid="6193201935877168764">"進入受限制的個人檔案"</string>
     <string name="restricted_profile_switch_out" msgid="3589381233390753413">"離開受限制的個人檔案"</string>
     <string name="restricted_profile_delete_title" msgid="7153982195273379506">"刪除受限制的個人檔案"</string>
@@ -901,14 +875,14 @@
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"請稍候…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"變更 PIN 碼"</string>
     <string name="restriction_description" msgid="2053112392083722259">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>\n<xliff:g id="VALUE">%2$s</xliff:g>"</string>
-    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="1261056180558324892">"這個應用程式可以存取你的帳戶 (受到「<xliff:g id="APP">%1$s</xliff:g>」控制)。"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="1261056180558324892">"這個應用程式可以存取您的帳戶 (受到「<xliff:g id="APP">%1$s</xliff:g>」控制)。"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"輸入 PIN 即可觀看這個頻道"</string>
     <string name="pin_enter_unlock_program" msgid="275489015420025531">"輸入 PIN 即可觀看這個節目"</string>
     <string name="pin_enter_pin" msgid="5020029261153234751">"輸入 PIN"</string>
     <string name="pin_enter_new_pin" msgid="1930944619313642621">"設定新 PIN"</string>
     <string name="pin_enter_again" msgid="7615050143778858658">"重新輸入新 PIN"</string>
     <string name="pin_enter_old_pin" msgid="5665265735227617942">"輸入舊 PIN"</string>
-    <string name="pin_enter_wrong_seconds" msgid="3014013615537066237">"你已輸入 5 次錯誤的 PIN。\n請於 <xliff:g id="RELATIVE_TIME_SPAN">%1$d</xliff:g> 秒後再試一次。"</string>
+    <string name="pin_enter_wrong_seconds" msgid="3014013615537066237">"您已輸入 5 次錯誤的 PIN。\n請於 <xliff:g id="RELATIVE_TIME_SPAN">%1$d</xliff:g> 秒後再試一次。"</string>
     <string name="pin_toast_wrong" msgid="4297542365877164402">"PIN 錯誤，請再試一次"</string>
     <string name="pin_toast_not_match" msgid="2439298696342975155">"PIN 不符，請再試一次"</string>
     <string name="wifi_setup_input_password" msgid="8510003548463241234">"請輸入 <xliff:g id="SSID">%1$s</xliff:g> 的密碼"</string>
@@ -919,14 +893,14 @@
     <string name="device_apps_app_management_version" msgid="2119174719194899740">"版本 <xliff:g id="APP_VERSION">%1$s</xliff:g>"</string>
     <string name="device_apps_app_management_open" msgid="4249743535677261897">"開啟"</string>
     <string name="device_apps_app_management_force_stop" msgid="4454221309989640309">"強制停止"</string>
-    <string name="device_apps_app_management_force_stop_desc" msgid="1980972142863114899">"如果你強制停止應用程式，應用程式或許不能正常操作。"</string>
+    <string name="device_apps_app_management_force_stop_desc" msgid="1980972142863114899">"如果您強制停止應用程式，應用程式或許不能正常操作。"</string>
     <string name="device_apps_app_management_uninstall" msgid="4171103696233332967">"解除安裝"</string>
     <string name="device_apps_app_management_uninstall_updates" msgid="5647988075828648951">"解除安裝更新"</string>
     <string name="device_apps_app_management_uninstall_updates_desc" msgid="4508586498292236706">"即將解除安裝這個 Android 系統應用程式的所有更新。"</string>
     <string name="device_apps_app_management_disable" msgid="819003297535493633">"停用"</string>
-    <string name="device_apps_app_management_disable_desc" msgid="9143166267511427607">"你要停用這個應用程式嗎？"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="9143166267511427607">"您要停用這個應用程式嗎？"</string>
     <string name="device_apps_app_management_enable" msgid="9173340340253029114">"啟用"</string>
-    <string name="device_apps_app_management_enable_desc" msgid="8686291003061136476">"你要啟用這個應用程式嗎？"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="8686291003061136476">"您要啟用這個應用程式嗎？"</string>
     <string name="device_apps_app_management_storage_used" msgid="6725789557993296433">"已使用的儲存空間"</string>
     <string name="device_apps_app_management_storage_used_desc" msgid="8928632612101487179">"<xliff:g id="VOLUME">%2$s</xliff:g>的已使用空間：<xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="device_apps_app_management_clear_data" msgid="7305471678286735600">"清除資料"</string>
@@ -956,23 +930,23 @@
     <skip />
     <string name="device_energy_saver_confirmation_title" msgid="7614859812773584773">"確認電源和能源設定"</string>
     <string name="device_energy_saver_confirmation_message" msgid="7789453187001013951">"長時間開啟電視可能會增加耗電量"</string>
-    <string name="device_energy_saver_disable_allow_turning_screen_off_title" msgid="1468097048101593731">"停用慳電模式設定"</string>
+    <string name="device_energy_saver_disable_allow_turning_screen_off_title" msgid="1468097048101593731">"停用省電模式設定"</string>
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"請確認是否停用「在觀看時關閉螢幕」的設定，這項操作可能會增加耗電量。"</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"無活動時"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"觀看時"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"自動關閉"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"閒置時自動關閉"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"在觀看時自動關閉"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"自動關閉電視"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"閒置時自動關閉電視"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"在觀看時自動關閉電視"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"「無活動時」計時器設定的時間必須短於「觀看時」計時器"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"「觀看時」計時器設定的時間必須長於「無活動時」計時器"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"在待機模式下限制網絡連線"</string>
     <string name="limit_network_in_standby_toggle_summary" msgid="9127792748675581174">"在待機模式下降低耗電量"</string>
-    <string name="limit_network_in_standby_toggle_info" msgid="566947772381093991">"你的電視處於待機模式時會中斷網絡連線 (接收自動更新除外)。此操作可降低電視的耗電量，但你可能無法在電視處於待機模式時使用 Google Cast 和「Google 助理」等功能。"</string>
+    <string name="limit_network_in_standby_toggle_info" msgid="566947772381093991">"您的電視處於待機模式時會中斷網絡連線 (接收自動更新除外)。此操作可降低電視的耗電量，但您可能無法在電視處於待機模式時使用 Google Cast 和「Google 助理」等功能。"</string>
     <string name="limit_network_in_standby_confirm_title" msgid="789232987058850322">"允許在待機模式下連接網絡"</string>
     <string name="limit_network_in_standby_confirm_message" msgid="7176699480768019689">"允許在待機模式下連接網絡，會增加待機期間的耗電量。"</string>
     <string name="backup_configure_account_default_summary" msgid="2170733614341544296">"目前沒有任何帳戶儲存備份資料"</string>
     <string name="backup_erase_dialog_title" msgid="6008454053276987100"></string>
-    <string name="backup_erase_dialog_message" msgid="222169533402624861">"你要停止備份 Wi-Fi 密碼、書籤、其他設定和應用程式資料，並清除在 Google 伺服器上的所有備份資料嗎？"</string>
+    <string name="backup_erase_dialog_message" msgid="222169533402624861">"您要停止備份 Wi-Fi 密碼、書籤、其他設定和應用程式資料，並清除在 Google 伺服器上的所有備份資料嗎？"</string>
     <string name="privacy_backup_data" msgid="3604057980102997914">"備份我的資料"</string>
     <string name="privacy_backup_account" msgid="4527813051841860610">"備份帳戶"</string>
     <string name="privacy_automatic_restore" msgid="7117805818589418118">"自動還原"</string>
@@ -1005,8 +979,8 @@
     <string name="choose_application" msgid="2375936782103669988">"選擇應用程式"</string>
     <string name="experimental_preference" msgid="3982593252210557436">"(實驗性)"</string>
     <string name="reboot_safemode_action" msgid="2862127510492131128">"重新開機進入安全模式"</string>
-    <string name="reboot_safemode_confirm" msgid="5745977150299953603">"你要重新開機進入安全模式嗎？"</string>
-    <string name="reboot_safemode_desc" msgid="2919933461408942799">"這會停用所有已安裝的第三方應用程式。你必須再次重新開機才能復原這些應用程式。"</string>
+    <string name="reboot_safemode_confirm" msgid="5745977150299953603">"您要重新開機進入安全模式嗎？"</string>
+    <string name="reboot_safemode_desc" msgid="2919933461408942799">"這會停用所有已安裝的第三方應用程式。您必須再次重新開機才能復原這些應用程式。"</string>
     <string name="capturing_bugreport" msgid="832512801903486821">"正在擷取錯誤報告"</string>
     <string name="available_virtual_keyboard_category" msgid="7445262027711560629">"可用的虛擬鍵盤"</string>
     <string name="manage_keyboards" msgid="7983890675377321912">"管理鍵盤"</string>
@@ -1022,14 +996,14 @@
     <string name="high_power_system" msgid="6263052626979462255">"無法優化電量"</string>
     <string name="manage_notification_access_title" msgid="8659254371564990084">"通知權限"</string>
     <string name="no_notification_listeners" msgid="5119406452675724448">"沒有任何已安裝的應用程式要求通知存取權。"</string>
-    <string name="notification_listener_security_warning_summary" msgid="8602907284276088658">"這些應用程式將可讀取所有通知，包括聯絡人姓名和你收到的訊息文字等個人資料，還能關閉通知或觸發通知中的動作按鈕。"</string>
+    <string name="notification_listener_security_warning_summary" msgid="8602907284276088658">"這些應用程式將可讀取所有通知，包括聯絡人姓名和您收到的訊息文字等個人資料，還能關閉通知或觸發通知中的動作按鈕。"</string>
     <string name="default_notification_access_package_summary" msgid="1354775994781420222">"系統要求"</string>
     <string name="directory_access" msgid="7338555825237012006">"目錄存取權"</string>
     <string name="directory_access_description" msgid="3630855858552422012">"這些應用程式有權存取特定目錄。"</string>
     <string name="directory_on_volume" msgid="5628089584970521703">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
     <string name="system_alert_window_settings" msgid="5790572489650085051">"顯示在其他應用程式上層"</string>
     <string name="permit_draw_overlay" msgid="5312730681030266735">"允許顯示在其他應用程式上層"</string>
-    <string name="allow_overlay_description" msgid="5152329837278240259">"允許應用程式在其他使用中的應用程式上顯示。這可能會干擾你使用這些應用程式，或變更它們的顯示或運作方式。"</string>
+    <string name="allow_overlay_description" msgid="5152329837278240259">"允許應用程式在其他使用中的應用程式上顯示。這可能會干擾您使用這些應用程式，或變更它們的顯示或運作方式。"</string>
     <string name="write_system_settings" msgid="4284654265954461890">"修改系統設定"</string>
     <string name="write_settings_title" msgid="2361816483383105754">"可修改系統設定"</string>
     <string name="write_settings_description" msgid="7382397926674265937">"此權限可讓應用程式修改系統設定。"</string>
@@ -1037,15 +1011,15 @@
     <string name="write_settings_off" msgid="6730113471695092167">"否"</string>
     <string name="manage_external_storage_title" msgid="8139593207533811077">"所有檔案存取權"</string>
     <string name="permit_manage_external_storage" msgid="1776899171934627417">"允許存取以管理所有檔案"</string>
-    <string name="allow_manage_external_storage_description" msgid="4288250228151617611">"允許此應用程式讀取、修改和刪除此裝置或任何已連接的儲存空間卷宗上的所有檔案。如獲得權限，應用程式可能會在你不知情的情況下存取檔案。"</string>
+    <string name="allow_manage_external_storage_description" msgid="4288250228151617611">"允許此應用程式讀取、修改和刪除此裝置或任何已連接的儲存空間卷宗上的所有檔案。如獲得權限，應用程式可能會在您不知情的情況下存取檔案。"</string>
     <string name="picture_in_picture_title" msgid="2636935591386702348">"畫中畫"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="3688997906817583854">"允許畫中畫"</string>
     <string name="picture_in_picture_empty_text" msgid="4370198922852736600">"沒有已安裝的應用程式支援畫中畫"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="3296649114939705896">"當你離開正運作中的應用程式時，允許該應用程式建立畫中畫視窗 (例如方便你繼續觀看影片)。該視窗會顯示在你目前使用的其他應用程式上層。"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="3296649114939705896">"當您離開正運作中的應用程式時，允許該應用程式建立畫中畫視窗 (例如方便您繼續觀看影片)。該視窗會顯示在您目前使用的其他應用程式上層。"</string>
     <string name="alarms_and_reminders_description" msgid="4063972350154624500">"允許應用程式設定鬧鐘及安排有時效的操作。這樣，應用程式就可以在背景中執行，可能會較耗電。\n\n如果關閉此權限，應用程式所設定的鬧鐘和預定在特定時間進行的事件便無法執行。"</string>
     <string name="turn_screen_on_title" msgid="5293798529284629011">"開啟螢幕"</string>
     <string name="allow_turn_screen_on" msgid="4903401106871656521">"允許開啟螢幕"</string>
-    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"允許應用程式開啟螢幕。應用程式獲授權後，可在你未有明確表明意圖的情況下隨時開啟螢幕。"</string>
+    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"允許應用程式開啟螢幕。應用程式獲授權後，可在您未有明確表明意圖的情況下隨時開啟螢幕。"</string>
     <string name="special_access" msgid="21806055758289916">"特別應用程式權限"</string>
     <string name="string_concat" msgid="5213870180216051497">"<xliff:g id="PART1">%1$s</xliff:g>，<xliff:g id="PART2">%2$s</xliff:g>"</string>
     <string name="audio_category" msgid="6143623109624947993">"音訊"</string>
@@ -1065,7 +1039,7 @@
     <string name="title_data_saver" msgid="7500278996154002792">"數據節省模式"</string>
     <string name="summary_data_saver" msgid="6793558728898207405">"自動調整影片畫質以使用節省流動數據"</string>
     <string name="title_data_alert" msgid="8262081890052682475">"數據用量和通知"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"你可以經 Wi-Fi、以太網絡或手機的熱點連接互聯網。"</string>
+    <string name="data_saver_header_info" msgid="2706725187498535785">"您可以經 Wi-Fi、以太網絡或手機的熱點連接互聯網。"</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"要向其他藍牙裝置顯示嗎？"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"應用程式要求將電視設為向其他藍牙裝置顯示 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒。"</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1078,9 +1052,9 @@
     <string name="disabled_by_policy_title_suspend_packages" msgid="6500185610058872758">"無法開啟此應用程式"</string>
     <string name="default_admin_support_msg" msgid="7913455019068370350">"如有任何問題，請與 IT 管理員聯絡"</string>
     <string name="admin_support_more_info" msgid="9053232166115098434">"更多詳細資料"</string>
-    <string name="admin_profile_owner_message" msgid="5729169873349157622">"你的管理員可以監控及管理與工作設定檔相關的應用程式和資料，包括設定、權限、公司存取權、網絡活動，以及裝置的位置資料。"</string>
-    <string name="admin_profile_owner_user_message" msgid="6431405126322617268">"你的管理員可以監控及管理與此使用者相關的應用程式和資料，包括設定、權限、公司存取權、網絡活動，以及裝置的位置資料。"</string>
-    <string name="admin_device_owner_message" msgid="1935507216776040907">"你的管理員可以監控及管理與此裝置相關的應用程式和資料，包括設定、權限、公司存取權、網絡活動，以及裝置的位置資料。"</string>
+    <string name="admin_profile_owner_message" msgid="5729169873349157622">"您的管理員可以監控及管理與工作設定檔相關的應用程式和資料，包括設定、權限、公司存取權、網絡活動，以及裝置的位置資料。"</string>
+    <string name="admin_profile_owner_user_message" msgid="6431405126322617268">"您的管理員可以監控及管理與此使用者相關的應用程式和資料，包括設定、權限、公司存取權、網絡活動，以及裝置的位置資料。"</string>
+    <string name="admin_device_owner_message" msgid="1935507216776040907">"您的管理員可以監控及管理與此裝置相關的應用程式和資料，包括設定、權限、公司存取權、網絡活動，以及裝置的位置資料。"</string>
     <string name="remove_managed_profile_label" msgid="8950011141359605612">"移除公司檔案"</string>
     <string name="active_device_admin_msg" msgid="185537304726228624">"裝置管理應用程式"</string>
     <string name="remove_device_admin" msgid="2623866073546295104">"停用此裝置管理應用程式"</string>
@@ -1092,11 +1066,11 @@
     <string name="device_admin_warning" msgid="7399916080685200660">"啟動此管理應用程式將允許「<xliff:g id="APP_NAME">%1$s</xliff:g>」應用程式執行以下操作："</string>
     <string name="device_admin_warning_simplified" msgid="3310965971422346950">"此裝置將由「<xliff:g id="APP_NAME">%1$s</xliff:g>」管理及監控。"</string>
     <string name="device_admin_status" msgid="5467001937240455367">"此管理應用程式已啟用，並允許「<xliff:g id="APP_NAME">%1$s</xliff:g>」應用程式執行以下操作："</string>
-    <string name="adding_profile_owner_warning" msgid="3888867082224127564">"如繼續操作，管理員將會管理你的使用者。除了你的個人資料，管理員亦可能會儲存其他相關的資料。\n\n你的管理員可以監控及管理與此使用者相關的設定、存取權、應用程式和資料，包括網絡活動和裝置的位置資料。"</string>
+    <string name="adding_profile_owner_warning" msgid="3888867082224127564">"如繼續操作，管理員將會管理您的使用者。除了您的個人資料，管理員亦可能會儲存其他相關的資料。\n\n您的管理員可以監控及管理與此使用者相關的設定、存取權、應用程式和資料，包括網絡活動和裝置的位置資料。"</string>
     <string name="share_remote_bugreport_dialog_title" msgid="2080017987692459555">"要分享錯誤報告嗎？"</string>
-    <string name="share_remote_bugreport_dialog_message_finished" msgid="8515056665416643253">"你的 IT 管理員要求你提供錯誤報告，以協助解決此裝置的問題。報告可能包含應用程式和相關資料。"</string>
-    <string name="share_remote_bugreport_dialog_message" msgid="4637489112422692638">"你的 IT 管理員要求你提供錯誤報告，以協助解決此裝置的問題。報告可能包含應用程式和相關資料，裝置的運作速度也可能暫時減慢。"</string>
-    <string name="sharing_remote_bugreport_dialog_message" msgid="8096239263583331293">"你已向 IT 管理員提供此錯誤報告。請聯絡他們以瞭解詳情。"</string>
+    <string name="share_remote_bugreport_dialog_message_finished" msgid="8515056665416643253">"您的 IT 管理員要求您提供錯誤報告，以協助解決此裝置的問題。報告可能包含應用程式和相關資料。"</string>
+    <string name="share_remote_bugreport_dialog_message" msgid="4637489112422692638">"您的 IT 管理員要求您提供錯誤報告，以協助解決此裝置的問題。報告可能包含應用程式和相關資料，裝置的運作速度也可能暫時減慢。"</string>
+    <string name="sharing_remote_bugreport_dialog_message" msgid="8096239263583331293">"您已向 IT 管理員提供此錯誤報告。請聯絡他們以瞭解詳情。"</string>
     <string name="share_remote_bugreport_action" msgid="6760197666368262892">"分享"</string>
     <string name="decline_remote_bugreport_action" msgid="2130779396296090961">"拒絕"</string>
     <string name="network_connection_request_dialog_title" msgid="4103963119407212989">"可配合「<xliff:g id="APPNAME">%1$s</xliff:g>」使用的裝置"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"開機行為"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"重設"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"以太網絡配對碼"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"能源模式"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"改善電視閒置時的能源效率"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"啟用以下功能："</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"請注意，這個模式可能會增加裝置的耗電量。"</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"啟用「<xliff:g id="ENERGYMODENAME">%s</xliff:g>」"</string>
 </resources>
diff --git a/Settings/res/values-zh-rTW/energy-modes.xml b/Settings/res/values-zh-rTW/energy-modes.xml
deleted file mode 100644
index 4ba34115a..000000000
--- a/Settings/res/values-zh-rTW/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"必要的網路功能"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"低耗電"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"在沒有人使用電視時關閉網路連線。"</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"重大更新與功能"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"建議的網路功能"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"最佳化耗電量"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"開啟可透過網路喚醒電視的功能 (連網待機)。"</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Insert feature 1]"</item>
-    <item msgid="8724721267222341891">"[Insert feature 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"其他網路功能"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"高耗電"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"在沒有人使用電視時，這個選項還會開啟建議功能以外的功能，耗電量可能會因此增加。"</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Insert feature 1]"</item>
-    <item msgid="170760143032597722">"[Insert feature 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-zh-rTW/strings.xml b/Settings/res/values-zh-rTW/strings.xml
index 01b34b5a2..864d6eae1 100644
--- a/Settings/res/values-zh-rTW/strings.xml
+++ b/Settings/res/values-zh-rTW/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"備份與還原"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"恢復原廠設定"</string>
     <string name="device_calibration" msgid="2907914144048739705">"校正"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"關機計時器"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"設定計時器自動將電視關機，藉此節約用電"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"開關和電源"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"節能設定"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"裝置"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"選取格式"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"進階音效設定"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"允許遊戲模式"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"配合內容的動態範圍"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"啟用這個選項後，系統會配合內容切換使用不同的動態範圍格式。請注意，切換格式時螢幕可能會顯示一片黑。\n\n如要查看更多動態範圍選項，請點選「進階顯示設定」。"</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"偏好的動態範圍"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"系統自動轉換"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"讓系統管理格式轉換作業"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"如果選取這個選項，系統會決定要傳送至螢幕的適當動態範圍，並視需要將內容轉換為該動態範圍。"</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"一律與內容的格式保持一致"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"強制轉換"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"強制轉換為你偏好的格式"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"強制轉換為你偏好的格式。如果強制進行轉換，顯示模式或高動態範圍格式的其他設定可能會受到影響。"</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"一律轉換為標準動態範圍格式"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"一律轉換為「<xliff:g id="HDR_TYPE">%s</xliff:g>」格式"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"要強制進行高動態範圍輸出作業嗎？"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"系統預設會強制轉換為「<xliff:g id="HDR_TYPE">%s</xliff:g>」格式。"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"你的螢幕將採用 1080p 60Hz 解析度。這個選項不支援採用 4K 60Hz 解析度的螢幕。"</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"目前的解析度不支援 Dolby Vision。如果你手動啟用 Dolby Vision，螢幕解析度將變更為 1080p 60Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"要將解析度變更為 1080p 60Hz 嗎？"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"一律強制轉換成 Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"當「進階顯示設定」&gt;「HDR 格式」中的 Dolby Vision 處於停用狀態時，如果強制轉換成 Dolby Vision，就會將其重新啟用。"</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"一律強制轉換成 HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"當「進階顯示設定」&gt;「HDR 格式」中的 HDR10 處於停用狀態時，如果強制轉換成 HDR10，就會將其重新啟用。"</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"一律強制轉換成 HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"當「進階顯示設定」&gt;「HDR 格式」中的 HLG 處於停用狀態時，如果強制轉換成 HLG，就會重新將其啟用。"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"一律強制轉換成 HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"當「進階顯示設定」&gt;「HDR 格式」中的 HDR10+ 處於停用狀態時，如果強制轉換成 HDR10+，就會將其重新啟用。"</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"一律強制轉換成 SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"如果強制轉換成 SDR，「進階顯示設定」&gt;「HDR 格式」中的所有格式將遭到停用。"</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"採用內容影格速率"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"只在可順暢轉換時變更影格速率"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"流暢轉換"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"如果應用程式要求，而且你的電視支援流暢轉換，你的裝置就會依據所觀看內容的原始影格速率輸出畫面。"</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"你連接的螢幕不支援流暢切換刷新率。如果未改用支援的螢幕，這個選項就不會發揮作用。"</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"一律根據內容變更影格速率"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"非流暢轉換"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"如果應用程式要求，你的裝置會依據所觀看內容的原始影格速率輸出畫面。這可能會讓螢幕在影片開始或結束播放時，短暫出現空白畫面。"</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"一律不採用"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"即使應用程式要求，你的裝置也絕不會依據所觀看內容的原始影格速率輸出畫面。"</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"要將解析度變更為「%1$s」嗎？"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"選取 [確定] 就能立即使用 %1$s。"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"「%1$s」不支援 Dolby Vision，因此 Dolby Vision 會在「進階顯示設定」中處於停用狀態"</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"這個模式支援：%1$s\n在某些電視上，你可能需要開啟增強型 HDMI，才能啟用更多高動態範圍格式。請查看電視設定，確認是否支援增強型 HDMI。"</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"這個模式支援以下高動態範圍類型：%1$s。在某些電視上，你可能必須開啟增強型 HDMI，才能啟用更多高動態範圍格式。請查看電視設定，確認是否支援增強型 HDMI。"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"取消"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"確定"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"清除快取資料？"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"這項操作會清除所有應用程式的快取資料。"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"這個裝置是由貴機構所管理。"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"這個裝置是由 <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> 所管理。"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">"、"</string>
+    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
     <string name="learn_more" msgid="820336467414665686">"瞭解詳情"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{相機應用程式}other{相機應用程式}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"日曆應用程式"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"請確認是否要停用在播放媒體時關閉螢幕的設定，這麼做可能使耗電量增加。"</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"閒置時"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"觀看影視內容時"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"自動關機"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"閒置時自動關機"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"觀看影視內容時自動關機"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"自動關閉電視"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"閒置時自動關閉電視"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"在播放媒體時自動關閉電視"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"「閒置時」計時器設定的時間必須比「觀看影視內容時」計時器短"</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"「觀看影視內容時」計時器設定的時間必須比「閒置時」計時器長"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"在待機模式下限制網路連線"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"開機行為"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"重設"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"乙太網路配對碼"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"耗電模式"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"在沒有人使用電視時改善耗電量"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"啟用以下功能："</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"請注意，這個模式可能會使裝置耗電量增加。"</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"啟用「<xliff:g id="ENERGYMODENAME">%s</xliff:g>」"</string>
 </resources>
diff --git a/Settings/res/values-zu/energy-modes.xml b/Settings/res/values-zu/energy-modes.xml
deleted file mode 100644
index f8acbbd9d..000000000
--- a/Settings/res/values-zu/energy-modes.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Izakhi ezibalulekile zenethiwekhi"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Ukusetshenziswa kwamandla okuphansi"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Vala uxhumo lenethiwekhi lapho i-TV ingasetshenziswa."</string>
-  <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Izibuyekezo nokukhethwayo okubucayi"</item>
-  </string-array>
-    <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Izakhi ezinconyiwe zenethiwekhi"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Ukusetshenziswa kwamandla okulungiselelwe"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Ivula izakhi ezivusa i-TV ngenethiwekhi (okubekwe eceleni kwenethiwekhi)."</string>
-  <string-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Faka isakhi 1]"</item>
-    <item msgid="8724721267222341891">"[Faka isakhi 2]"</item>
-  </string-array>
-    <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Izakhi ezengeziwe zenethiwekhi"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Ukwenyuka kokusetshenziswa kwamandla"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Ngokungeziwe kuzakhi ezinconyiwe, le nketho ivula izakhi ezengeziwe lapho i-TV ingasetshenziswa ezingase zikhulise ukusetshenziswa kwamandla."</string>
-  <string-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Faka isakhi 1]"</item>
-    <item msgid="170760143032597722">"[Faka isakhi 2]"</item>
-  </string-array>
-    <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
-    <skip />
-</resources>
diff --git a/Settings/res/values-zu/strings.xml b/Settings/res/values-zu/strings.xml
index 418505706..7a14f6ab1 100644
--- a/Settings/res/values-zu/strings.xml
+++ b/Settings/res/values-zu/strings.xml
@@ -112,8 +112,8 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Ikhophi Yasenqolobaneni Nokubuyisela"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Ukuhlela kabusha idatha yasembonini"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Ukusika"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Isibalisikhathi Sokuvala"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Setha izibalisikhathi ukuze uvale i-TV futhi ulondoloze amandla"</string>
+    <string name="device_energy_saver" msgid="5560942970290949739">"Amandla Namandla"</string>
+    <string name="device_eco_settings" msgid="8478430139722946388">"Amasethingi e-Eco"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Amadivayisi"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Khetha amafomethi"</string>
@@ -151,38 +151,11 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"I-HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Amasethingi womsindo athuthukisiwe"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Vumela imodi yegeyimu"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Matanisa okuqukethwe kobubanzi be-dynamic"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Uma unika amandla lokhu okukhethwa kukho, isistimu izoshintsha phakathi kwamafomethi ebanga aguqukayo ahlukahlukene ukuze ifane nokuqukethwe. Lokhu kungase kubangele isikrini esimnyama ngesikhathi sokushintshwa kwefomethi.\n\nChofoza amasethingi okubonisa okuthuthukile ukuze uthole okukhethwa kukho okuningi kwebanga eliguqukayo."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Ibanga eliguqukayo elikhethwayo"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Ukuguqulwa okukhethwa yisistimu"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Ake siphathe uhlelo lokuguqulwa kwefomethi"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Lapho le ndlela ikhethiwe, uhlelo luzonquma uhla olushukumisayo oluzothunyelwa kwisibonisi sakho bese uguqula okuqukethwe kuleli banga elinamandla njengoba kudingeka."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Ihlala ihambelana nefomethi yokuqukethwe"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Ukuphoqelela ukuguqulwa"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Kuphoxelela ukuguqulwa kwefomethi ethandwayo"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Cindezela ukuguqulwa kwefomethi ethandwayo. Ukuphoqelela ukuguqulwa kungathinta amanye amasethingi Kumodi Yokubonisa noma ifomethi ye-HDR."</string>
-    <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Njalo ku-SDR"</string>
-    <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Njalo ku-<xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
-    <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Ingabe ufuna ukuphoqa ukuphuma kwe-HDR?"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Ngokuzenzakalela ukuguqulwa kuzophoqelelwa ku-<xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Isibonisi sakho sizosebenza ngokucaca okungu-1080p 60Hz. Lokhu ongakukhetha akuhambelani nesibonisi sakho lapho usebenza ekuxazululeni kwesinqumo se-4k 60Hz."</string>
-    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"I-Dolby Vision ayisekelwe ekulungisweni kwamanje. Uma unika amandla i-Dolby Vision ngesandla, ukulungiswa kwesibonisi sakho kuzoshintshwa kube ngu-1080p 60Hz"</string>
-    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Shintsha ukulungiswa kube ngu-1080p 60Hz?"</string>
-    <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Njalo phoqa ukuguqulwa ku-Dolby Vision"</string>
-    <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Uma i-Dolby Vision ikhutshaziwe Kumafomethi e-HDR Kumasethingi Okubonisa Athuthukisiwe, ukuphoqelela ukuguqulwa ku-Dolby Vision kuzokunika amandla kabusha."</string>
-    <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Njalo phoqa ukuguqulwa ku-HDR10"</string>
-    <string name="dynamic_range_selection_force_hdr10_summary" msgid="7784573527636502784">"Uma i-HDR10 ikhutshaziwe Kumafomethi e-HDR Kumasethingi Okubonisa Athuthukisiwe, ukuphoqa ukuguqulwa ku-HDR10 kuzokunika amandla kabusha."</string>
-    <string name="dynamic_range_selection_force_hlg_title" msgid="3976190987768712696">"Ngaso sonke isikhathi phoqa ukuguqulwa ku-HLG"</string>
-    <string name="dynamic_range_selection_force_hlg_summary" msgid="5371949016689544001">"Uma i-HLG ikhutshaziwe Kumafomethi e-HDR Kumasethingi Okubonisa Athuthukisiwe, ukuphoqa ukuguqulwa ku-HLG kuzokunika amandla kabusha."</string>
-    <string name="dynamic_range_selection_force_hdr10plus_title" msgid="1305556000063625735">"Njalo phoqa ukuguqulwa ku-HDR10+"</string>
-    <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Uma i-HDR10+ ikhutshaziwe Kumafomethi e-HDR Kumasethingi Okubonisa Athuthukisiwe, ukuphoqa ukuguqulwa ku-HDR10+ kuzokunika amandla kabusha."</string>
-    <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Ngaso sonke isikhathi phoqa uuguqulelwa ku-SDR"</string>
-    <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Ukuphoqelela ukuguqulwa ku-SDR kuzokhubaza wonke amafomethi Kumafomethi e-HDR KuMASETHINGI okubonisa Athuthukisiwe."</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"Fanisa isilinganiso sikazimele wokuqukethwe"</string>
-    <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Okungenamthungo kuphela"</string>
+    <string name="match_content_frame_rate_seamless" msgid="5900012519258795448">"Okungenazihibe"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Uma uhlelo lwakho lokusebenza likucela, idivayisi yakho izofanisa okukhishwayo kwayo nezinga lozimele lokwangempela lokuqukethwe okubukayo, KUPHELA uma i-TV yakho ikwazi ukwenza ukuguqulwa okungenazihibe."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Isibonisi sakho esixhunyiwe asisekeli izinguquko zesilinganiso sokuvuselela ezingenaziphazamiso. Le nketho ngeke ibe nomthelela ngaphandle kokuthi ushintshele kusibonisi esiyisekelayo."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Njalo"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="1534300397118594640">"Akukhona okungenazihibe"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Uma uhlelo lokusebenza likucela, idivayisi yakho izofanisa okukhiswayo kwakho nezinga lozimele lokwangempela lokuqukethwe okubukayo. Lokhu kungase kubangele ukuthi isikrini singabi nalutho okwesikhashana nje lapho uphuma noma ungena kukudlala kwevidiyo."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Soze"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Ngisho noma uhlelo lokusebenza likucela, idivayisi yakho ayisoze yazama ukufanisa okukhiswayo kwakho nezinga lozimele lokwangempela lokuqukethwe okubukayo."</string>
@@ -218,11 +191,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Shintsha ukucaca kube ngu-%1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Khetha okuthi KULUNGILE ukuze usebenzise i-%1$s kusukela manje."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"I-Dolby Vision ayisekelwe ku-%1$s futhi izokhutshazwa kokuthi \"Amasethingi Esibonisi Athuthukisiwe\""</string>
-    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Le modi isekela: %1$s\nKwamanye ama-TV, kungase kudingeke ukuthi uvule i-HDMI Ethuthukisiwe ukuze unike amandla amafomethi e-HDR engeziwe. Hlola amasethingi akho e-TV ukuze ubone ukuthi lokhu kuyasekelwa yini."</string>
+    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Le modi isekela i-%1$s. Kwamanye ama-TV, kungase kudingeke uvule i-HDMI Ethuthukisiwe ukuze unike amandla amafomethi e-HDR angeziwe. Hlola amasethingi akho e-TV ukuze ubone ukuthi lokhu kuyasekelwa yini."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Khansela"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"KULUNGILE"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"I-Hz"</string>
-    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="resolution_display_mode" msgid="1862830706980223728">"I-<xliff:g id="RESOLUTION">%1$s</xliff:g> ( <xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Sula idatha efakwe kunqolobane?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Lokhu kuzosula idatha efakwe kunqolobane yazo zonke izinhlelo zokusebenza."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -300,8 +273,8 @@
     <string name="no_device_admins" msgid="4628974717150185625">"Azikho izinhlelo zokusebenza zomlawuli wedivayisi ezitholakalayo"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="7678529948487939871">"Kukhutshazwe umlawuli"</string>
     <string name="disabled_by_administrator_summary" msgid="3420979957115426764">"Ayitholakali"</string>
-    <string name="manage_device_admin" msgid="5714217234035017983">"Ama-app omlawuli wedivayisi"</string>
-    <string name="number_of_device_admins_none" msgid="2734299122299837459">"Awekho ama-app asebenzayo"</string>
+    <string name="manage_device_admin" msgid="5714217234035017983">"Izinhlelo zokusebenza zomlawuli wedivayisi"</string>
+    <string name="number_of_device_admins_none" msgid="2734299122299837459">"Azikho izinhlelo zokusebenza ezisebenzayo"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="108190334043671416">"Kukhutshazwe umlawuli, inqubomgomo yokubethela, noma isitoreji sezitifiketi"</string>
     <string name="enterprise_privacy_settings" msgid="8226765895133003202">"Ulwazi lwedivayisi oluphethwe"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5719549523275019419">"Ushintsho nezilungiselelo eziphethwe inhlangano yakho"</string>
@@ -323,7 +296,7 @@
     <string name="enterprise_privacy_location_access" msgid="8978502415647245748">"Izimvume zendawo"</string>
     <string name="enterprise_privacy_microphone_access" msgid="3746238027890585248">"Izimvume zemakrofoni"</string>
     <string name="enterprise_privacy_camera_access" msgid="6258493631976121930">"Izimvume zekhamera"</string>
-    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="5538330175901952288">"Ama-app azenzekelayo"</string>
+    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="5538330175901952288">"Izinhlelo zokusebenza ezizenzakalelayo"</string>
     <string name="enterprise_privacy_number_packages" msgid="6256222390430349008">"{count,plural, =1{i-app engu-#}one{ama-app angu-#}other{ama-app angu-#}}"</string>
     <string name="enterprise_privacy_input_method" msgid="5814752394251833058">"Ikhibhodi ezenzakalelayo"</string>
     <string name="enterprise_privacy_input_method_name" msgid="1088874503312671318">"Sethela ku-<xliff:g id="APP_LABEL">%s</xliff:g>"</string>
@@ -343,7 +316,8 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Le divayisi iphethwe inhlangano yakho."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Le divayisi iphethwe yi-<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
+    <string name="word_separator" msgid="3175619900852797955">","</string>
+    <string name="space_separator" msgid="4169645647388594972">" I-160"</string>
     <string name="learn_more" msgid="820336467414665686">"Funda kabanzi"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{I-app yekhamera}one{Ama-app wekhamera}other{Ama-app wekhamera}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Uhlelo lokusebenza lekhalenda"</string>
@@ -960,9 +934,9 @@
     <string name="device_energy_saver_disable_allow_turning_screen_off_text" msgid="6334963903866002164">"Sicela uqinisekise ukwenqabela isibonisi ukuba ivuleke lapho ubukele, okunethuba lokusetshenziswa kwamandla amaningi."</string>
     <string name="device_energy_saver_sleep_timeout" msgid="1841900768718452039">"Lapho ingasebenzi"</string>
     <string name="device_energy_saver_attentive_timeout" msgid="3649486668821348087">"Lapho ubuka"</string>
-    <string name="device_energy_saver_category_title" msgid="170076161677525986">"Vala ngokuzenzakalelayo"</string>
-    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="6588352532253294558">"Vala ngokuzenzakalelayo uma ingasebenzi"</string>
-    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="3273988875711109352">"Vala ngokuzenzakalelayo uma ubukele"</string>
+    <string name="device_energy_saver_category_title" msgid="2604826113821035545">"Vala i-TV ngokuzenzakalelayo"</string>
+    <string name="device_energy_saver_sleep_timeout_dialog_title" msgid="1223814536589471788">"Vala i-TV ngokuzenzakalelayo uma ingasebenzi"</string>
+    <string name="device_energy_saver_attentive_timeout_dialog_title" msgid="1654557070579253248">"Vala i-TV ngokuzenzakalelayo uma ubukele"</string>
     <string name="device_energy_saver_validation_sleep" msgid="7490897287741107840">"\"Lapho singasebenzi\" isibali sikhathi kufanele sibe sifushane kunesibali sikhathi esithi \"Lapho ubukele\"."</string>
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"\"Lapho ubukele\" isibali sikhathi kufanele sibe side kunesibali sikhathi esithi \"Lapho singasebenzi\""</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"Khawulela uxhumo lenethiwekhi ekulindeni"</string>
@@ -1082,11 +1056,11 @@
     <string name="admin_profile_owner_user_message" msgid="6431405126322617268">"Umqondisi wakho angakwazi ukwengamela futhi aphathe izinhlelo zokusebenza nedatha ephathelene nalo msebenzisi, kufaka phakathi izilungiselelo, izimvume, ukufinyelela kwezinkampani, umsebenzi wenethiwekhi kanye nolwazi lwendawo ledivayisi yakho."</string>
     <string name="admin_device_owner_message" msgid="1935507216776040907">"Umqondisi wakho angakwazi ukwengamela nokuphatha izinhlelo zokusebenza nedatha ephathelene naele divayisi, kufaka phakathi izimvume zezilungiselelo, ukufinyelela kwebhizinisi, umsebenzi wenethiwekhi nolwazi lwendawo yedivayisi yakho."</string>
     <string name="remove_managed_profile_label" msgid="8950011141359605612">"Susa iphrofayela yomsebenzi"</string>
-    <string name="active_device_admin_msg" msgid="185537304726228624">"Ama-app omlawuli wedivayisi"</string>
+    <string name="active_device_admin_msg" msgid="185537304726228624">"Uhlelo lokusebenza lomlawuli wedivayisi"</string>
     <string name="remove_device_admin" msgid="2623866073546295104">"Yekisa ukusebenza lolu hlelo lokusebenza lomlawuli wedivayisi"</string>
     <string name="uninstall_device_admin" msgid="6301368408620948266">"Khipha uhlelo lokusebenza"</string>
     <string name="remove_and_uninstall_device_admin" msgid="1504351551194915633">"Yekisa futhi ukhiphe"</string>
-    <string name="select_device_admin_msg" msgid="8475934459999710332">"Ama-app omlawuli wedivayisi"</string>
+    <string name="select_device_admin_msg" msgid="8475934459999710332">"Izinhlelo zokusebenza zomlawuli wedivayisi"</string>
     <string name="add_device_admin_msg" msgid="5390773166682603421">"Sebenzisa uhlelo lokusebenza lomlawuli wedivayisi?"</string>
     <string name="add_device_admin" msgid="5078281377915844544">"Sebenzisa lolu hlelo lokusebenza lomlawuli wedivayisi"</string>
     <string name="device_admin_warning" msgid="7399916080685200660">"Ukusebenzisa lolu hlelo lokusebenza lomlawuli kuzovumela uhlelo lokusebenza <xliff:g id="APP_NAME">%1$s</xliff:g> ukwenza imisebenzi elandelayo:"</string>
@@ -1118,9 +1092,4 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Ukuziphatha kokuvulwa"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Setha kabusha"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Ikhodi yokubhangqa ye-Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Amamodi Amandla"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Thuthukisa ukusebenza kahle kwamandla uma i-TV ingasebenzi"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Inika amandla:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Qaphela ukuthi le modi ingase ikhulise ukusetshenziswa kwamandla kwedivayisi."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Nika amandla okuthi \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
 </resources>
diff --git a/TwoPanelSettingsLib/Android.bp b/TwoPanelSettingsLib/Android.bp
index fa0056bc6..a944c5d30 100644
--- a/TwoPanelSettingsLib/Android.bp
+++ b/TwoPanelSettingsLib/Android.bp
@@ -47,8 +47,6 @@ android_library {
         "androidx.cardview_cardview",
         "statslog-tvsettings",
     ],
-
-    min_sdk_version: "30",
 }
 
 // For the test package.
diff --git a/TwoPanelSettingsLib/res/values-my/strings.xml b/TwoPanelSettingsLib/res/values-my/strings.xml
index f60797be7..7803b5cae 100644
--- a/TwoPanelSettingsLib/res/values-my/strings.xml
+++ b/TwoPanelSettingsLib/res/values-my/strings.xml
@@ -17,9 +17,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="info_status_on" msgid="8274851391556672594">"ဖွင့်"</string>
-    <string name="info_status_off" msgid="1947357954040244822">"ပိတ်"</string>
-    <string name="switch_on" msgid="6078857185301284868">"ဖွင့်"</string>
-    <string name="switch_off" msgid="2555309941117626592">"ပိတ်"</string>
+    <string name="info_status_on" msgid="8274851391556672594">"ဖွင့်ထားသည်"</string>
+    <string name="info_status_off" msgid="1947357954040244822">"ပိတ်ထားသည်"</string>
+    <string name="switch_on" msgid="6078857185301284868">"ဖွင့်ထားသည်"</string>
+    <string name="switch_off" msgid="2555309941117626592">"ပိတ်ထားသည်"</string>
     <string name="switch_talkback_identifier" msgid="3243563960920396436">"ပြောင်းရန်"</string>
 </resources>
diff --git a/TwoPanelSettingsLib/res/values-uz/strings.xml b/TwoPanelSettingsLib/res/values-uz/strings.xml
index 3a3f69ab1..c0b03a529 100644
--- a/TwoPanelSettingsLib/res/values-uz/strings.xml
+++ b/TwoPanelSettingsLib/res/values-uz/strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="info_status_on" msgid="8274851391556672594">"Yoniq"</string>
-    <string name="info_status_off" msgid="1947357954040244822">"Oʻchiq"</string>
+    <string name="info_status_off" msgid="1947357954040244822">"Yoqilmagan"</string>
     <string name="switch_on" msgid="6078857185301284868">"YONIQ"</string>
     <string name="switch_off" msgid="2555309941117626592">"OʻCHIQ"</string>
     <string name="switch_talkback_identifier" msgid="3243563960920396436">"Almashtirish"</string>
author	Android Build Coastguard Worker <android-build-coastguard-worker@google.com>	2023-07-08 04:39:55 +0000
committer	Android Build Coastguard Worker <android-build-coastguard-worker@google.com>	2023-07-08 04:39:55 +0000
commit	cf95e18ef27a5f5ea53ec5b0bdf0c6b73171fa1b (patch)
tree	801e5153963a9a347f13082c836e331d5a8e3760
parent	21e873ecce493c168ac30e72a9e6c9e7630400a9 (diff)
parent	4eb7b888ab394100643c6500e06e3b31f1780760 (diff)
download	TvSettings-android14-mainline-healthfitness-release.tar.gz