diff --git a/Android.bp b/Android.bp
index 7b88591..26226a7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -65,6 +65,8 @@
         "TvSettingsStaticLibs",
     ],
     platform_apis: true,
+    // TODO(b/319716205): re-enable use_resource_processor
+    use_resource_processor: false,
 }
 
 android_app {
@@ -89,6 +91,8 @@
     static_libs: [
         "TvSettingsStaticLibs",
     ],
+    // TODO(b/319716205): re-enable use_resource_processor
+    use_resource_processor: false,
 }
 
 android_app {
@@ -116,9 +120,10 @@
     static_libs: [
         "TvSettingsStaticLibs",
     ],
+    // TODO(b/319716205): re-enable use_resource_processor
+    use_resource_processor: false,
 }
 
-
 // Two-panel TvSettings
 android_app {
     name: "TvSettingsTwoPanel",
@@ -154,6 +159,8 @@
             "com.android.tv.twopanelsettingsoverlay.*",
         ],
     },
+    // TODO(b/319716205): re-enable use_resource_processor
+    use_resource_processor: false,
 }
 
 // Two-panel TvSettings 0 Debug
@@ -187,4 +194,6 @@
     static_libs: [
         "TvSettingsStaticLibs",
     ],
+    // TODO(b/319716205): re-enable use_resource_processor
+    use_resource_processor: false,
 }
diff --git a/OWNERS b/OWNERS
index e0a84a2..7b24890 100644
--- a/OWNERS
+++ b/OWNERS
@@ -3,4 +3,4 @@
 oindriladawn@google.com
 olegk@google.com
 zhizhiliu@google.com
-gersonrod@google.com
\ No newline at end of file
+gersonrod@google.com
diff --git a/Settings/AndroidManifest.xml b/Settings/AndroidManifest.xml
index 5cf7e6d..4302007 100644
--- a/Settings/AndroidManifest.xml
+++ b/Settings/AndroidManifest.xml
@@ -75,6 +75,11 @@
     <uses-permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
     <uses-permission android:name="android.permission.SET_UNRESTRICTED_KEEP_CLEAR_AREAS"/>
 
+    <!-- Permissions for reading network change related data. -->
+    <permission
+        android:name="com.android.settings.connectivity.READ_NETWORK_CHANGE_DATA"
+        android:protectionLevel="signature|preinstalled" />
+
     <application
          android:name=".TvSettingsApplication"
          android:allowClearUserData="false"
@@ -212,6 +217,15 @@
             </intent-filter>
         </activity>
 
+        <!-- The other application needs to define the similar custom permission in its manifest
+        to be able to READ network change data -->
+        <provider
+            android:name=".connectivity.NetworkChangeContentProvider"
+            android:authorities="com.android.settings.connectivity.networkchangedetection"
+            android:exported="true"
+            android:readPermission="com.android.settings.connectivity.READ_NETWORK_CHANGE_DATA" >
+        </provider>
+
         <!-- AccountSliceActivity is just here to facilitate the activity-alias below to eliminate
              the risk of repackaging. -->
         <activity
@@ -459,14 +473,6 @@
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.settings.DATA_SAVER_SETTINGS"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.settings.DATA_ALERT_SETTINGS"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-            <intent-filter>
                 <action android:name="android.settings.panel.action.INTERNET_CONNECTIVITY"/>
                 <action android:name="android.settings.panel.action.WIFI"/>
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -1288,6 +1294,15 @@
         </receiver>
 
         <receiver
+            android:name=".connectivity.EthernetDetectionReceiver"
+            android:exported="false"
+            android:enabled="true">
+            <intent-filter>
+                <action android:name="com.android.settings.connectivity.ETHERNET_DETECTED"/>
+            </intent-filter>
+        </receiver>
+
+        <receiver
             android:name=".PreBootCompleteReceiver"
             android:enabled="true"
             android:exported="true">
diff --git a/Settings/res/values-af/energy-modes.xml b/Settings/res/values-af/energy-modes.xml
index b29f339..2f7937f 100644
--- a/Settings/res/values-af/energy-modes.xml
+++ b/Settings/res/values-af/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Lae energiemodus"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"met noodsaaklike netwerkkenmerke"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Skakel netwerkverbinding af wanneer die TV nie gebruik word nie (bystandmodus)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Laag"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Bystand"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Bystand — Netwerkverbinding is af wanneer TV nie gebruik word nie"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Kritieke opdaterings en funksies"</item>
+    <item msgid="4002284890471636101">"[Voeg kenmerk 1 in]"</item>
+    <item msgid="7072772341455731040">"[Voeg kenmerk 2 in]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Geoptimeerde energiemodus"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"met aanbeveelde netwerkkenmerke"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Laat kenmerke toe om die TV oor die netwerk wakker te maak (netwerkbystand)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Alle noodsaaklike kenmerke"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Geoptimeer"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Netwerkbystand"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Netwerkbystand — Aktiveer kenmerke om die TV via die netwerk wakker te maak"</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="6636328986387241066">"Verhoogde energiemodus"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"met bykomende netwerkkenmerke"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Laat ekstra kenmerke toe selfs wanneer die TV nie gebruik word nie."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Alle aanbevole kenmerke"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Het verhoog"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Altyd gekoppel"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Altyd gekoppel — Aktiveer netwerkkenmerke wanneer TV nie gebruik word nie"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Voeg kenmerk 1 in]"</item>
     <item msgid="170760143032597722">"[Voeg kenmerk 2 in]"</item>
diff --git a/Settings/res/values-af/strings.xml b/Settings/res/values-af/strings.xml
index 32ac0b3..085ec10 100644
--- a/Settings/res/values-af/strings.xml
+++ b/Settings/res/values-af/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google-regsafdeling"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Lisensiedata is nie beskikbaar nie"</string>
     <string name="about_model" msgid="9164284529291439296">"Model"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Toestelmodus"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Winkeldemonstrasie"</string>
     <string name="about_version" msgid="6223547403835399861">"Android TV-bedryfstelselweergawe"</string>
     <string name="about_serial" msgid="3432319328808745459">"Reeksnommer"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV-bedryfstelselbou"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Internetverbinding"</string>
     <string name="connected" msgid="4981532275162345997">"Gekoppel"</string>
     <string name="not_connected" msgid="475810896484271663">"Nie gekoppel nie"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Geen internet nie"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Gestoor"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Verkeerde wagwoord"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-fi-wagwoord is te kort"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Aanmelding nodig"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Ander opsies"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Sien alles"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Sien minder"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Pasmaak beperkings"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Net \'n oomblik …"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Verander PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Skep beperkte profiel?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Reeds geskep"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Slaan oor"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Skep PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Voer beperkte profiel in?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Geen beperkte profiel nie"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Reeds ingevoer"</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">"Hierdie program het toegang tot jou rekeninge. Beheer deur <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Voer PIN in om hierdie kanaal te kyk"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Opgeneemde mikrofoon(one)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Kon nie begin om oudio op te neem nie."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Kon nie oudio opneem nie."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Databespaarder"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Verstel outomaties die videogehalte om minder mobiele data te gebruik"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Datagebruik en -waarskuwings"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Jy kan aan die internet koppel met wi-fi, Ethernet of jou foon se warmkol."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Maak sigbaar vir ander Bluetooth-toestelle?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"’n Program wil jou TV <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes lank vir ander Bluetooth-toestelle sigbaar maak."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Hierdie instellings affekteer die toestel wanneer dit 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_mode_eco_hint" msgid="5280058011809503514">"Kragverbruik kan verhoog volgens die aantal TV-kenmerke wat jy aktiveer."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Aktiveer “<xliff:g id="ENERGYMODENAME">%s</xliff:g>”"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Soek my afstandbeheerder"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Speel ’n klank om jou Google TV-afstandbeheerder te kry as dit soek is"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Druk die knoppie aan die agterkant van jou Google TV om vir 30 sekondes lank ’n klank op jou afstandbeheerder te speel. Dit werk net met ondersteunde Google TV-afstandbeheerders.\n\nDruk enige knoppie op jou afstandbeheerder om die klank te stop."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Daar is ’n knoppie op jou Google TV wat jy kan druk om vir 30 sekondes ’n klank op jou afstandbeheerder te speel. Dit werk net met ondersteunde Google TV-afstandbeheerders.\n\nDruk enige knoppie op jou afstandbeheerder om die klank te stop."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"As Soek my afstandbeheerder geaktiveer is, kan jy ’n klank speel om jou Google TV se afstandbeheerder op te spoor indien dit misplaas is."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Speel klank"</string>
 </resources>
diff --git a/Settings/res/values-am/energy-modes.xml b/Settings/res/values-am/energy-modes.xml
index 2e4c6ce..3c75572 100644
--- a/Settings/res/values-am/energy-modes.xml
+++ b/Settings/res/values-am/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"ዝቅተኛ የኃይል ሁነታ"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"ከአስፈላጊ የአውታረ መረብ ባህሪያት ጋር"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"ቲቪው ጥቅም ላይ በማይሆንበት ጊዜ (ተጠባባቂ ሁነታ) የአውታረ መረብ ግንኙነትን ያጥፉ።"</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"ዝቅተኛ"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"ተጠባባቂ"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"ተጠባባቂ — ቲቪው ጥቅም ላይ በማይውልበት ጊዜ የአውታረ መረብ ግንኙነት ጠፍቷል"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"ወሳኝ ዝማኔዎች እና ተግባራት"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"የተመቻቸ የኃይል ሁነታ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"ከሚመከሩ የአውታረ መረብ ባህሪያት ጋር"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"በአውታረ መረብ ላይ (የአውታረ መረብ ተጠባባቂ) ቲቪውን ለማንቃት ባህሪያትን ይፈቅዳል።"</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"ሁሉም አስፈላጊ ባህሪያት"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"እንዲተባ ተደርጓል"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"የአውታረ መረብ ተጠባባቂ"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"የአውታረ መረብ ተጠባባቂ — በአውታረ መረቡ ላይ ቲቪውን ለማንቃት ባህሪያትን ያነቃል"</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="6636328986387241066">"የጨመረ የኃይል ሁነታ"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"ከተጨማሪ የአውታረ መረብ ባህሪያት ጋር"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"ቲቪው ጥቅም ላይ በማይሆንበት ጊዜ እንኳን ተጨማሪ ባህሪያትን ይፈቅዳል።"</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"ሁሉም የሚመከሩ ባህሪያት"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"ጨምሯል"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"ሁልጊዜ ተገናኝቷል"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"ሁልጊዜ ተገናኝቷል — ቲቪው ጥቅም ላይ በማይውልበት ጊዜ የአውታረ መረብ ባህሪያትን ያነቃል"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-am/strings.xml b/Settings/res/values-am/strings.xml
index 0879b07..f344d47 100644
--- a/Settings/res/values-am/strings.xml
+++ b/Settings/res/values-am/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google ህግ ነክ"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"የፈቃድ ውሂብ አይገኝም"</string>
     <string name="about_model" msgid="9164284529291439296">"ሞዴል"</string>
+    <string name="device_mode" msgid="7258350575590118152">"የመሣሪያ ሁነታ"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"የመደብር ቅንጭብ ማሳያ"</string>
     <string name="about_version" msgid="6223547403835399861">"የAndroid TV ስርዓተ ስሪት"</string>
     <string name="about_serial" msgid="3432319328808745459">"መለያ ቁጥር"</string>
     <string name="about_build" msgid="8467840394761634575">"የAndroid TV ስርዓተ ክወና ግንብ"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"የበይነመረብ ግንኙነት"</string>
     <string name="connected" msgid="4981532275162345997">"ተገናኝቷል"</string>
     <string name="not_connected" msgid="475810896484271663">"አልተገናኘም"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"ምንም በይነመረብ የለም"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"ተቀምጧል"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"የተሳሳተ የይለፍ ቃል"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"የWi-Fi ይለፍ ቃል በጣም አጭር ነው"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"በመለያ መግባት ያስፈልጋል"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"ሌሎች አማራጮች"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"ሁሉንም ይመልከቱ"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"ያነሰ ይመልከቱ"</string>
@@ -902,6 +909,13 @@
     <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>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"የተገደበ መገለጫ ይፈጠር?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"አስቀድሞ ተፈጥሯል"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"ዝለል"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"ፒን ፍጠር"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"የተገደበ መገለጫ ይግባ?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"ምንም የተገደበ መገለጫ የለም"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"አስቀድሞ ገብቷል"</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="pin_enter_unlock_channel" msgid="243855138978654080">"ይህንን ሰርጥ ለመመልከት ፒን ያስገቡ"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"የተቀዳ ማይክሮፎን(ፎኖች)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"ኦዲዮን መቅዳት መጀመር አልተሳካም።"</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"ኦዲዮን መቅዳት አልተሳካም።"</string>
-    <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="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>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"እነዚህ ቅንብሮች መሣሪያው ጥቅም ላይ በማይውልበት ጊዜ ተጽዕኖ ያደርጉበታል"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"ይህን ያነቃል፦"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ይህ ሁነታ የመሣሪያው ኃይል አጠቃቀምን ሊጨምር እንደሚችል ያስታውሱ።"</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"የኃይል ፍጆታ ከሚያነቋቸው የቲቪ ባህሪያት ብዛት ጋር ሊጨምር ይችላል።"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"«<xliff:g id="ENERGYMODENAME">%s</xliff:g>» ይንቃ"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"የእኔን የርቀት መቆጣጠሪያ አግኝ"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"የGoogle ቲቪ የርቀት መቆጣጠሪያዎ ያለ ቦታው ተቀምጦ ከሆነ አካባቢውን ለማግኘት ድምፅን ያጫውቱ"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"ድምፅን በርቀት መቆጣጠሪያዎ ላይ ለ30 ሰከንዶች ለማጫወት ከእርስዎ Google ቲቪ ጀርባ ያለውን አዝራር ይጫኑ። ይህ የሚሠራው በሚደገፉ የGoogle ቲቪ የርቀት መቆጣጠሪያዎች ብቻ ነው።\n\nድምፁን ለማስቆም የርቀት መቆጣጠሪያዎ ላይ ማንኛውንም አዝራር ይጫኑ።"</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"በእርስዎ Google ቲቪ ላይ ለ30 ሰከንዶች በርቀት መቆጣጠሪያዎ ላይ ድምፅን ለማጫወት መግፋት የሚችሉት አዝራር አለ። ይህ የሚሠራው በሚደገፉ የGoogle ቲቪ የርቀት መቆጣጠሪያዎች ብቻ ነው።\n\nድምፁን ለማስቆም በርቀት መቆጣጠሪያዎ ላይ ያለ ማንኛውንም አዝራር ይጫኑ።"</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"የእኔን የርቀት መቆጣጠሪያ አግኝ ሲነቃ የGoogle ቲቪ የርቀት መቆጣጠሪያዎ ያለ ቦታው ተቀምጦ ከሆነ ለማግኘት ድምፅን ማጫወት ይችላሉ።"</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"ድምፅ አጫውት"</string>
 </resources>
diff --git a/Settings/res/values-ar/energy-modes.xml b/Settings/res/values-ar/energy-modes.xml
index 26ca5c5..40d1656 100644
--- a/Settings/res/values-ar/energy-modes.xml
+++ b/Settings/res/values-ar/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"وضع الطاقة المنخفضة"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"مع الميزات الأساسية للشبكة"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"إيقاف الاتصال بالشبكة عندما لا يكون التلفزيون قيد الاستخدام (وضع الاستعداد)"</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"مستوى الطاقة منخفض"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"وضع الاستعداد"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"وضع الاستعداد: يوقِف الاتصال بالشبكة عندما يكون التلفزيون غير مُستخدَم."</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"التحديثات والوظائف المهمة"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"وضع الطاقة الأمثل"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"مع الميزات المقترَحة للشبكة"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"السماح للميزات بتنشيط التلفزيون عبر الشبكة (وضع الاستعداد المتصل بالشبكة)"</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"كل الميزات الأساسية"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"وضع الطاقة الأمثل"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"وضع الاستعداد المتصل بالشبكة"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"وضع الاستعداد المتصل بالشبكة: يفعِّل الميزات التي تعمل على تنشيط التلفزيون من خلال الشبكة."</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="6636328986387241066">"وضع الطاقة الزائدة"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"مع الميزات الإضافية للشبكة"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"إتاحة ميزات إضافية حتى في حال عدم استخدام التلفزيون"</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"كل الميزات المقترَحة"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"وضع الطاقة الزائدة"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"الاتصال دائمًا"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"وضع الاتصال دائمًا: يفعِّل ميزات الشبكة عندما يكون التلفزيون غير مُستخدَم."</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-ar/strings.xml b/Settings/res/values-ar/strings.xml
index 72f13e5..e222f38 100644
--- a/Settings/res/values-ar/strings.xml
+++ b/Settings/res/values-ar/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"معلومات قانونية من Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"بيانات الترخيص غير متاحة"</string>
     <string name="about_model" msgid="9164284529291439296">"الطراز"</string>
+    <string name="device_mode" msgid="7258350575590118152">"وضع الجهاز"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"وضع العرض التوضيحي بالمتجر"</string>
     <string name="about_version" msgid="6223547403835399861">"نسخة نظام تشغيل Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"الرقم المسلسل"</string>
     <string name="about_build" msgid="8467840394761634575">"إصدار نظام تشغيل Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"اتصال الإنترنت"</string>
     <string name="connected" msgid="4981532275162345997">"متصل"</string>
     <string name="not_connected" msgid="475810896484271663">"غير متصل"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"لا يتوفّر اتصال بالإنترنت"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"شبكة محفوظة"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"كلمة مرور غير صحيحة"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"كلمة مرور Wi-Fi قصيرة جدًا."</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"تسجيل الدخول مطلوب"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"خيارات أخرى"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"عرض الكل"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"عرض أقل"</string>
@@ -902,6 +909,13 @@
     <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>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"هل تريد إنشاء ملف شخصي محدود؟"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"سبق أن تم إنشاء الملف الشخصي."</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"التخطّي"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"إنشاء رقم تعريف شخصي"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"هل تريد إدخال ملف شخصي محدود؟"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"ما مِن ملفات شخصية محدودة."</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"سبق أن تم إدخال الملف الشخصي."</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="pin_enter_unlock_channel" msgid="243855138978654080">"أدخل رقم التعريف الشخصي لمشاهدة هذه القناة"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"الميكروفون (الميكروفونات) المستخدمة في التسجيل"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"تعذّر بدء تسجيل الصوت."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"تعذّر تسجيل الصوت."</string>
-    <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="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>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"تؤثِّر هذه الإعدادات في الجهاز عندما يكون غير مُستخدَم"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"يفعِّل هذا الوضع الميزات التالية:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ملاحظة: قد يؤدي استخدام هذا الوضع إلى زيادة استهلاك طاقة الجهاز."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"قد تؤدي زيادة عدد ميزات التلفزيون المفعَّلة إلى زيادة استهلاك الطاقة."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"تفعيل وضع \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"العثور على جهاز التحكّم عن بُعد"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"يمكنك تشغيل صوت لتحديد موقع جهاز التحكّم في Google TV عن بُعد إذا لم يكن في مكانه."</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"اضغط على الزرّ المتوفّر في الجزء الخلفي من Google TV لتشغيل صوت على جهاز التحكّم عن بُعد لمدة 30 ثانية. لا تعمل هذه الميزة إلا مع أجهزة التحكّم عن بُعد المتوافقة مع Google TV.\n\nلإيقاف الصوت، اضغط على أي زرّ على جهاز التحكّم عن بُعد."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"يتوفّر زرّ في Google TV يمكنك الضغط عليه لتشغيل صوت على جهاز التحكّم عن بُعد لمدة 30 ثانية. لا تعمل هذه الميزة إلا مع أجهزة التحكّم عن بُعد المتوافقة مع Google TV.\n\nلإيقاف الصوت، اضغط على أي زرّ على جهاز التحكّم عن بُعد."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"عندما تكون ميزة \"العثور على جهاز التحكّم عن بُعد\" مفعَّلة، يمكنك تشغيل صوت لتحديد موقع جهاز التحكّم في Google TV عن بُعد إذا لم يكن في مكانه."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"تشغيل الصوت"</string>
 </resources>
diff --git a/Settings/res/values-as/energy-modes.xml b/Settings/res/values-as/energy-modes.xml
index bb43784..8e7a801 100644
--- a/Settings/res/values-as/energy-modes.xml
+++ b/Settings/res/values-as/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"কম শক্তিৰ ম’ড"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"অত্যাৱশ্যকীয় নেটৱৰ্কৰ সুবিধাৰ সৈতে"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"টিভি ব্যৱহাৰ নকৰা সময়ত (ষ্টেণ্ডবাই ম’ড) নেটৱৰ্ক সংযোগ অফ কৰক।"</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"নিম্ন"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"ষ্টেণ্ডবাই"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"ষ্টেণ্ডবাই — টিভিটো ব্যৱহাৰ হৈ নাথাকিলে নেটৱৰ্ক সংযোগটো অফ হৈ থাকে"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"গুৰুত্বপূৰ্ণ আপডে’ট আৰু ফাংশ্বনসমূহ"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"অপ্টিমাইজ কৰা শক্তিৰ ম’ড"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"চুপাৰিছ কৰা নেটৱৰ্কৰ সুবিধাৰ সৈতে"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"নেটৱৰ্কৰ জৰিয়তে টিভিটো সক্ৰিয় কৰাৰ সুবিধা আগবঢ়ায় (নেটৱৰ্কড ষ্টেণ্ডবাই)।"</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"আটাইবোৰ অত্যাৱশ্যকীয় সুবিধা"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"অপ্টিমাইজ কৰা"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"নেটৱৰ্কড ষ্টেণ্ডবাই"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"নেটৱৰ্কড ষ্টেণ্ডবাই — নেটৱৰ্কৰ জৰিয়তে টিভিটো সক্ৰিয় কৰিবলৈ সুবিধাসমূহ সক্ষম কৰে"</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="6636328986387241066">"বৰ্ধিত শক্তিৰ ম’ড"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"অতিৰিক্ত নেটৱৰ্কৰ সুবিধাৰ সৈতে"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"টিভিটো ব্যৱহাৰ হৈ নাথাকিলেও অতিৰিক্ত সুবিধা ব্যৱহাৰ কৰিবলৈ দিয়ে।"</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"আটাইবোৰ চুপাৰিছ কৰা সুবিধা"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"বৃদ্ধি কৰা হৈছে"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"সদায় সংযুক্ত হৈ থাকে"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"সদায় সংযুক্ত হৈ থাকে — টিভিটো ব্যৱহাৰ হৈ নথকা অৱস্থাত নেটৱৰ্কৰ সুবিধাসমূহ সক্ষম কৰে"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-as/strings.xml b/Settings/res/values-as/strings.xml
index 937d016..e402c81 100644
--- a/Settings/res/values-as/strings.xml
+++ b/Settings/res/values-as/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Googleৰ আইনী পৃষ্ঠা"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"অনুজ্ঞাপত্ৰৰ ডেটা নাই"</string>
     <string name="about_model" msgid="9164284529291439296">"মডেল"</string>
+    <string name="device_mode" msgid="7258350575590118152">"ডিভাইচ ম’ড"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"ষ্ট’ৰ ডেম’"</string>
     <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>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"ইণ্টাৰনেট সংযোগ"</string>
     <string name="connected" msgid="4981532275162345997">"সংযোগ কৰা হ’ল"</string>
     <string name="not_connected" msgid="475810896484271663">"সংযোগ হোৱা নাই"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"ইণ্টাৰনেট নাই"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"ছেভ কৰা হৈছে"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"ভুল পাছৱৰ্ড"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"ৱাই-ফাইৰ পাছৱৰ্ডটো বেছি চুটি"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"ছাইন-ইন কৰাৰ প্ৰয়োজন"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"অন্য বিকল্পসমূহ"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"সকলো চাওক"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"কম সংখ্যক চাওক"</string>
@@ -902,6 +909,13 @@
     <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>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"প্ৰতিবন্ধিত প্ৰ’ফাইল সৃষ্টি কৰিবনে?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"ইতিমধ্যে সৃষ্টি কৰা হৈছে"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"এৰি যাওক"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"পিন সৃষ্টি কৰক"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"প্ৰতিবন্ধিত প্ৰ’ফাইল দিবনে?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"কোনো প্ৰতিবন্ধিত প্ৰ’ফাইল নাই"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"ইতিমধ্যে দিয়া হৈছে"</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="pin_enter_unlock_channel" msgid="243855138978654080">"এই চেনেলটো চাবলৈ পিন দিয়ক"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"ৰেকর্ড কৰা মাইক্ৰ’ফ’ন(সমূহ)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"অডিঅ\' ৰেকৰ্ড আৰম্ভ কৰাত বিফল হ\'ল।"</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"অডিঅ\' ৰেকৰ্ড কৰাত বিফল হ\'ল।"</string>
-    <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">"আপুনি ৱাই-ফাই, ইথাৰনেট অথবা আপোনাৰ ফ’নৰ হটস্পটৰ জৰিয়তে ইণ্টাৰনেটৰ সৈতে সংযুক্ত হ’ব পাৰে।"</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>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"এই ছেটিংসমূহে ডিভাইচটো ব্যৱহাৰ হৈ নথকা অৱস্থাত প্ৰভাৱ পেলায়"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"সক্ষম কৰা সুবিধাসমূহ:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"মন কৰিব যে এই ম’ডটোৰ ফলত ডিভাইচটোৱে অধিক শক্তি ব্যয় কৰিব পাৰে।"</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"আপুনি সক্ষম কৰা টিভিৰ সুবিধাসমূহৰ সমান্তৰালভাৱে শক্তিৰ খৰচ বৃদ্ধি পাব পাৰে।"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" সক্ষম কৰক"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"মোৰ ৰিম’ট বিচাৰক"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"আপোনাৰ Google TV ৰিম’টটো হেৰালে সেইটো বিচাৰিবলৈ কোনো ধ্বনি প্লে’ কৰক"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"আপোনাৰ ৰিম’টত ৩০ ছেকেণ্ডৰ বাবে কোনো ধ্বনি প্লে’ কৰিবলৈ আপোনাৰ Google TVৰ পিছফালে থকা বুটামটোত টিপক। এইটোৱে কেৱল সমৰ্থিত Google TV ৰিম’ট কণ্ট্ৰ’লৰ জৰিয়তেহে কাম কৰে।\n\nধ্বনিটো বন্ধ কৰিবলৈ আপোনাৰ ৰিম’টটোত যিকোনো বুটাম টিপক।"</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"আপোনাৰ Google TVত এটা বুটাম আছে, যিটো আপুনি নিজৰ ৰিম’টত ৩০ ছেকেণ্ডৰ বাবে এটা ধ্বনি প্লে’ কৰিবলৈ টিপিব পাৰে। এইটোৱে কেৱল সমৰ্থিত Google TV ৰিম’ট কণ্ট্ৰ’লৰ জৰিয়তেহে কাম কৰে।\n\nধ্বনিটো বন্ধ কৰিবলৈ আপোনাৰ ৰিম’টটোত যিকোনো বুটাম টিপক।"</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"মোৰ ৰিম’ট বিচাৰক সক্ষম কৰিলে, আপোনাৰ Google TVৰ ৰিম’টটো সঠিক স্থানত নাথাকিলে সেইটোৰ অৱস্থান জানিবলৈ আপুনি এটা ধ্বনি প্লে’ কৰিব পাৰে।"</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"ধ্বনি প্লে’ কৰক"</string>
 </resources>
diff --git a/Settings/res/values-az/energy-modes.xml b/Settings/res/values-az/energy-modes.xml
index c1afd73..9e43715 100644
--- a/Settings/res/values-az/energy-modes.xml
+++ b/Settings/res/values-az/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Aşağı enerji rejimi"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"zəruri şəbəkə funksiyaları ilə"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"TV istifadə edilmədikdə (gözləmə rejimi) şəbəkə bağlantısını deaktiv edin."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Aşağı"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Gözləmə rejimi"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Gözləmə rejimi — TV istifadə edilmədikdə şəbəkə bağlantısı deaktiv olur"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Vacib güncəllənmə və funksiyalar"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Optimal enerji rejimi"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"tövsiyə edilən şəbəkə funksiyaları ilə"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Şəbəkə vasitəsilə TV-ni oyadan funksiyalara icazə verir (şəbəkəli gözləmə rejimi)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Əsas funksiyalar"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimallaşdırılıb"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Şəbəkəli gözləmə rejimi"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Şəbəkəli gözləmə rejimi — TV-ni şəbəkə vasitəsilə oyatmaq üçün funksiyaları işə salır"</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="6636328986387241066">"Artırılmış enerji rejimi"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"əlavə şəbəkə funksiyaları ilə"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"TV istifadə edilməsə belə, əlavə funksiyalara icazə verir."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Tövsiyə edilən funksiyalar"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Artıb"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Həmişə qoşulu"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Həmişə qoşulu — TV istifadə edilmədikdə şəbəkə funksiyalarını aktivləşdirir"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-az/strings.xml b/Settings/res/values-az/strings.xml
index 19c2dc7..637447d 100644
--- a/Settings/res/values-az/strings.xml
+++ b/Settings/res/values-az/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google hüquqi"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Lisenziya datası əlçatan deyil"</string>
     <string name="about_model" msgid="9164284529291439296">"Model"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Cihaz rejimi"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Mağaza demosu"</string>
     <string name="about_version" msgid="6223547403835399861">"Android TV ƏS versiyası"</string>
     <string name="about_serial" msgid="3432319328808745459">"Seriya nömrəsi"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV ƏS buraxılışı"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"İnternet bağlantısı"</string>
     <string name="connected" msgid="4981532275162345997">"Qoşulu"</string>
     <string name="not_connected" msgid="475810896484271663">"Qoşulu deyil"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"İnternet yoxdur"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Yadda saxlandı"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Yanlış parol"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi parolu qısadır"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Giriş tələb olunur"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Digər seçimlər"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Hamısına baxın"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Daha azına baxın"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Məhdudiyyətləri fərdiləşdirin"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Bir saniyə..."</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Pini dəyişin"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Məhdud profil yaradılsın?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Yaradılıb"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Ötürün"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"PIN yaradın"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Məhdud profil daxil edilsin?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Məhdud profil yoxdur"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Daxil edilib"</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">"Bu tətbiq hesablarınıza daxil ola bilər. <xliff:g id="APP">%1$s</xliff:g> tərəfindən idarə olunur."</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Bu kanalı izləmək üçün PİN kodu daxil edin"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Yazılmış mikrofon(lar)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Audio yazmanı başlatmaq alınmadı."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Audio yazma alınmadı."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Trafikə qənaət"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Daha az mobil data istifadə etmək üçün video keyfiyyətini avtomatik tənzimləyin"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Data istifadəsi və siqnalları"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"İnternetə Wi-Fi, Ethernet və ya telefonun hotspotu ilə qoşula bilərsiniz."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Digər Bluetooth cihazlarına görünsün?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Tətbiq TV-nizi digər Bluetooth cihazları üçün <xliff:g id="TIMEOUT">%1$d</xliff:g> saniyə ərzində görünən etmək istəyir."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Bu ayarlar cihaz istifadə edilmədikdə ona təsir edə bilər"</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_mode_eco_hint" msgid="5280058011809503514">"Aktivləşdirdiyiniz TV funksiyalarının sayına görə enerji istehlakı arta bilər."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" rejiminin aktivləşdirilməsi"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Pultumu tapın"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Google TV pultu itibsə, tapmaq üçün səs oxudun"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Pultda 30 saniyəlik səs oxutmaq üçün Google TV-nin arxasındakı düyməyə basın. Bu, yalnız dəstəklənən Google TV pultları ilə işləyir.\n\nSəsi dayandırmaq üçün pultun hər hansı düyməsinə basın."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Google TV-də 30 saniyə pultda səs oxutmaq üçün düymə var. Bu, yalnız dəstəklənən Google TV pultları ilə işləyir.\n\nSəsi dayandırmaq üçün pultun hər hansı düyməsinə basın."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Pultumu tapın funksiyası aktiv olduqda Google TV pultunu tapmaq üçün səs oxuda bilərsiniz."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Səs oxudun"</string>
 </resources>
diff --git a/Settings/res/values-b+sr+Latn/energy-modes.xml b/Settings/res/values-b+sr+Latn/energy-modes.xml
index fc10cf4..f0bb152 100644
--- a/Settings/res/values-b+sr+Latn/energy-modes.xml
+++ b/Settings/res/values-b+sr+Latn/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Režim niske potrošnje"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"sa neophodnim mrežnim funkcijama"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Isključite mrežnu vezu kada se TV ne koristi (režim mirovanja)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Nisko"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Režim mirovanja"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Režim mirovanja – mrežna veza je isključena kada se TV ne koristi"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Važna ažuriranja i funkcije"</item>
+    <item msgid="4002284890471636101">"[Umetnite funkciju 1]"</item>
+    <item msgid="7072772341455731040">"[Umetnite funkciju 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Režim optimalne potrošnje"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"sa preporučenim mrežnim funkcijama"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Omogućava funkcije koje bude TV preko mreže (režim mirovanja na mreži)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Sve osnovne funkcije"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimizovano"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Režim mirovanja na mreži"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Režim mirovanja na mreži – omogućava da funkcije probude TV preko mreže"</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="6636328986387241066">"Režim povećane potrošnje"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"sa dodatnim mrežnim funkcijama"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Omogućava dodatne funkcije čak i kada se TV ne koristi."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Sve preporučene funkcije"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Povećano"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Uvek povezano"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Uvek povezano – omogućava funkcije mreže kada se TV ne koristi"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Umetnite funkciju 1]"</item>
     <item msgid="170760143032597722">"[Umetnite funkciju 2]"</item>
diff --git a/Settings/res/values-b+sr+Latn/strings.xml b/Settings/res/values-b+sr+Latn/strings.xml
index df2e6c6..96125f4 100644
--- a/Settings/res/values-b+sr+Latn/strings.xml
+++ b/Settings/res/values-b+sr+Latn/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google pravne informacije"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Podaci o licenci nisu dostupni"</string>
     <string name="about_model" msgid="9164284529291439296">"Model"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Režim uređaja"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Demonstracija u prodavnici"</string>
     <string name="about_version" msgid="6223547403835399861">"Verzija operativnog sistema Android TV-a"</string>
     <string name="about_serial" msgid="3432319328808745459">"Serijski broj"</string>
     <string name="about_build" msgid="8467840394761634575">"Verzija operativnog sistema Android TV-a"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Internet veza"</string>
     <string name="connected" msgid="4981532275162345997">"Povezano"</string>
     <string name="not_connected" msgid="475810896484271663">"Nije povezano"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Nema interneta"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Sačuvano"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Pogrešna lozinka"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Lozinka za WiFi je prekratka"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Treba da se prijavite"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Druge opcije"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Prikaži sve"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Prikaži manje"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Prilagodi ograničenja"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Samo malo…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Promeni PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Želite da napravite ograničeni profil?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Već je napravljeno"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Preskoči"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Napravite PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Želite da unesete ograničeni profil?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Nema ograničenog profila"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Već je unet"</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">"Ova aplikacija može da pristupa vašim nalozima. To kontroliše <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Unesite PIN da biste gledali ovaj kanal"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Mikrofoni za snimanje"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Pokretanje snimanja zvuka nije uspelo."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Snimanje zvuka nije uspelo."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Ušteda podataka"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Automatski prilagođava kvalitet videa radi uštede mobilnih podataka"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Potrošnja podataka i obaveštenja"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Možete da se povežete na internet pomoću WiFi-ja, eterneta ili hotspota na telefonu."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Želite da učinite vidljivim za druge Bluetooth uređaje?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Aplikacija želi da učini TV vidljivim za druge Bluetooth uređaje na <xliff:g id="TIMEOUT">%1$d</xliff:g> sek."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Ova podešavanja utiču na uređaj kada se 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_mode_eco_hint" msgid="5280058011809503514">"Potrošnja energije može da se poveća kada omogućite veći broj funkcija TV-a."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Omogućite režim <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Pronađi moj daljinski"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Pustite zvuk da biste locirali daljinski za Google TV ako ste ga zaturili"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Pritisnite dugme na poleđini Google TV-a da biste na daljinskom pustili zvuk od 30 sekundi. To radi samo na podržanim daljinskim upravljačima za Google TV.\n\nDa biste zaustavili ovaj zvuk, pritisnite bilo koje dugme na daljinskom."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Na Google TV-u postoji dugme koje možete da pritisnete kako biste na daljinskom pustili zvuk u trajanju od 30 sekundi. To funkcioniše samo na podržanim daljinskim upravljačima za Google TV.\n\nDa biste zaustavili ovaj zvuk, pritisnite bilo koje dugme na daljinskom."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Kada je omogućena funkcija Pronađi moj daljinski, možete da pustite zvuk da biste locirali daljinski upravljač za Google TV ako ste ga zaturili."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Pusti zvuk"</string>
 </resources>
diff --git a/Settings/res/values-be/energy-modes.xml b/Settings/res/values-be/energy-modes.xml
index ec885b1..eac30e5 100644
--- a/Settings/res/values-be/energy-modes.xml
+++ b/Settings/res/values-be/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Рэжым паніжанага спажывання энергіі"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"з асноўнымі сеткавымі функцыямі"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Калі тэлевізар не выкарыстоўваецца (рэжым чакання), падключэнне да сеткі прыпыняецца."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Нізкае спажыванне энергіі"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Рэжым чакання"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Рэжым чакання – падключэнне да сеткі не працуе, калі тэлевізар не выкарыстоўваецца"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Важныя абнаўленні і функцыі"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Рэжым аптымізаванага спажывання энергіі"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"з рэкамендаванымі сеткавымі функцыямі"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Дазваляе выкарыстоўваць функцыі, якія абуджаюць тэлевізар па сетцы (рэжым чакання праз сетку)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Усе асноўныя функцыі"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Аптымізаванае спажыванне энергіі"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Рэжым чакання праз сетку"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Рэжым чакання праз сетку – дазваляе выводзіць тэлевізар з рэжыму сну праз сетку"</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="6636328986387241066">"Рэжым павышанага спажывання энергіі"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"з дадатковымі сеткавымі функцыямі"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Дазваляе выкарыстоўваць дадатковыя функцыі, нават калі тэлевізар не выкарыстоўваецца."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Усе рэкамендаваныя функцыі"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Павышанае спажыванне энергіі"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Пастаяннае падключэнне да сеткі"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Пастаяннае падключэнне да сеткі – сеткавыя функцыі ўключаны, нават калі тэлевізарам не карыстаюцца"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-be/strings.xml b/Settings/res/values-be/strings.xml
index ed1e196..ddd0e91 100644
--- a/Settings/res/values-be/strings.xml
+++ b/Settings/res/values-be/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Прававая інфармацыя Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Даныя ліцэнзіі недаступныя"</string>
     <string name="about_model" msgid="9164284529291439296">"Мадэль"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Рэжым прылады"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Дэмарэжым для крамы"</string>
     <string name="about_version" msgid="6223547403835399861">"Версія АС Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Серыйны нумар"</string>
     <string name="about_build" msgid="8467840394761634575">"Зборка АС Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Падключэнне да інтэрнэту"</string>
     <string name="connected" msgid="4981532275162345997">"Падключана"</string>
     <string name="not_connected" msgid="475810896484271663">"Няма падключэння"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Няма падключэння да інтэрнэту"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Захавана"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Няправільны пароль"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Пароль Wi-Fi занадта кароткі"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Неабходна выканаць уваход"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Іншыя параметры"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Праглядзець усё"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Паказаць менш"</string>
@@ -902,6 +909,13 @@
     <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">"Змяніць PIN-код"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Стварыць абмежаваны профіль?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Профіль ужо створаны"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Прапусціць"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Стварыць PIN-код"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Увайсці ў абмежаваны профіль?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Няма абмежаваных профіляў"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Уваход ужо выкананы"</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="pin_enter_unlock_channel" msgid="243855138978654080">"Увядзіце PIN-код, каб паглядзець гэты канал"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Мікрафон(ы) для запісу"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Не ўдалося запусціць запіс аўдыя."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Збой запісу аўдыя."</string>
-    <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, Ethernet ці хот-спота тэлефона."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Зрабіць бачным для іншых прылад з Bluetooth?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Праграма запытвае дазвол на ўключэнне бачнасці вашага тэлевізара для іншых прылад з Bluetooth на <xliff:g id="TIMEOUT">%1$d</xliff:g> с."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Гэтыя налады ўплываюць на работу прылады, калі яна не выкарыстоўваецца"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"Уключае:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Улічвайце, што гэты рэжым можа павялічыць спажыванне энергіі прыладай."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"Пры ўключэнні большай колькасці функцый тэлевізара спажыванне энергіі можа павялічвацца."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Уключыць рэжым \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Пошук пульта"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Каб знайсці згублены пульт Google TV, вы можаце прайграць на ім гукавы сігнал"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Націсніце кнопку на задняй панэлі Google TV, каб пульт прайграў 30-секундны гукавы сігнал. Функцыя працуе толькі на пультах Google TV, якія падтрымліваюцца.\n\nКаб выключыць сігнал, націсніце любую кнопку на пульце."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"На вашай прыладзе Google TV ёсць кнопка, якую можна націснуць, каб на працягу 30 секунд на пульце прайграваўся гук. Функцыя працуе толькі на пультах Google TV, якія падтрымліваюцца.\n\nКаб выключыць сігнал, націсніце любую кнопку на пульце."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Функцыя \"Пошук пульта\" дазваляе знайсці згублены пульт Google TV з дапамогай гукавога сігналу."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Прайграць гук"</string>
 </resources>
diff --git a/Settings/res/values-bg/energy-modes.xml b/Settings/res/values-bg/energy-modes.xml
index 8ef75c8..4e6a268 100644
--- a/Settings/res/values-bg/energy-modes.xml
+++ b/Settings/res/values-bg/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Режим с намалена консумация на енергия"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"с основни функции на мрежата"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Изключване на връзката с мрежата, когато телевизорът не се използва (режим на готовност)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Нисък разход"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Режим на готовност"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Режим на готовност – връзката с мрежата е изключена, когато телевизорът не се използва"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Критични актуализации и функции"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Режим с оптимизирана консумация на енергия"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"с препоръчани функции на мрежата"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Разрешава функции, които активират телевизора през мрежата (режим на готовност с връзка с мрежата)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Всички основни функции"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Оптимизиран разход"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Мрежови режим на готовност"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Мрежови режим на готовност – включва функции за активиране на телевизора през мрежата"</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="6636328986387241066">"Режим с повишена консумация на енергия"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"с допълнителни функции на мрежата"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Разрешава допълнителни функции дори когато телевизорът не се използва."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Всички препоръчани функции"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Увеличен разход"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Постоянна връзка"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Постоянна връзка – мрежовите функции работят, когато телевизорът не се използва"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-bg/strings.xml b/Settings/res/values-bg/strings.xml
index c196b82..1223e36 100644
--- a/Settings/res/values-bg/strings.xml
+++ b/Settings/res/values-bg/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google – правен текст"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Данните за лиценза не са налице"</string>
     <string name="about_model" msgid="9164284529291439296">"Модел"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Режим на устройството"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Демонстрация в магазин"</string>
     <string name="about_version" msgid="6223547403835399861">"Версия на операционната система на Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Сериен номер"</string>
     <string name="about_build" msgid="8467840394761634575">"Компилация на операционната система на Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Връзка с интернет"</string>
     <string name="connected" msgid="4981532275162345997">"Установена е връзка"</string>
     <string name="not_connected" msgid="475810896484271663">"Няма връзка"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Няма интернет"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Запазено"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Грешна парола"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Паролата за Wi-Fi е твърде кратка"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Изисква се влизане в профил"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Други опции"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Показване на всички"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Преглед на по-малко"</string>
@@ -902,6 +909,13 @@
     <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>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Създ. на огран. потр. профил?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Вече създадохте"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Пропускане"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Създаване на ПИН"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Вход в ограничен потр. профил?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Няма ограничен потр. профил"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Вече въведохте"</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="pin_enter_unlock_channel" msgid="243855138978654080">"Въведете ПИН кода, за да гледате този канал"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Записани микрофони"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Стартирането на записването на аудио не бе успешно."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Записването на аудио не бе успешно."</string>
-    <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, Ethernet или точката за достъп на телефона ви."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Да се направи ли видимо за други устройства с Bluetooth?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Приложение иска да направи телевизора ви видим за други устройства с Bluetooth за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Тези настройки засягат устройството, когато не се използва"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"Активира:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Имайте предвид, че този режим може да увеличи консумацията на енергия на устройството."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"Разходът на енергия може да се увеличи в зависимост от броя на активираните функции на телевизора."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Активиране на „<xliff:g id="ENERGYMODENAME">%s</xliff:g>“"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Намиране на дистанционното ми управление"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Възпроизвеждане на звук, чрез който да намерите дистанционното си управление за Google TV"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Натиснете бутона на гърба на устройството си Google TV, за да се възпроизведе звук на дистанционното ви управление, който продължава 30 секунди. Това работи само с поддържани дистанционни управления за Google TV.\n\nЗа да спрете звука, натиснете произволен бутон на дистанционното си управление."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Устройството ви с Google TV има бутон, който можете да натиснете, за да се възпроизвежда звук на дистанционното ви управление в продължение на 30 секунди. Това работи само с поддържани дистанционни управления за Google TV.\n\nЗа да спрете звука, натиснете произволен бутон на дистанционното си управление."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Когато функцията „Намиране на дистанционното ми управление“ е активирана, може да се възпроизведе звук, за да откриете дистанционното управление на Google TV, ако не можете да го намерите."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Пускане на звук"</string>
 </resources>
diff --git a/Settings/res/values-bn/energy-modes.xml b/Settings/res/values-bn/energy-modes.xml
index d66bae1..40aac2f 100644
--- a/Settings/res/values-bn/energy-modes.xml
+++ b/Settings/res/values-bn/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"লো \'এনার্জি\' মোড"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"গুরুত্বপূর্ণ নেটওয়ার্ক ফিচার সহ"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"টিভি ব্যবহার না করা হলে (\'স্ট্যান্ডবাই\' মোড) নেটওয়ার্ক কানেকশন বন্ধ করে দিন।"</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"কম"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"স্ট্যান্ডবাই"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"স্ট্যান্ডবাই — টিভি না চললে নেটওয়ার্ক কানেকশন বন্ধ থাকে"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"গুরুত্বপূর্ণ আপডেট এবং ফাংশন"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"অপ্টিমাইজ করা \'এনার্জি\' মোড"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"সাজেস্ট করা নেটওয়ার্ক ফিচার সহ"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"নেটওয়ার্কের মাধ্যমে টিভি চালু করার জন্য ফিচারকে অনুমতি দেয় (নেটওয়ার্ক স্ট্যান্ডবাই)।"</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"প্রয়োজনীয় সব ফিচার"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"অপ্টিমাইজ করা হয়েছে"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"নেটওয়ার্ক স্ট্যান্ডবাই"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"নেটওয়ার্ক স্ট্যান্ডবাই — নেটওয়ার্কে টিভি অ্যাক্টিভ করতে ফিচার চালু করে"</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="6636328986387241066">"বর্ধিত \'এনার্জি\' মোড"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"অতিরিক্ত নেটওয়ার্ক ফিচার সহ"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"অতিরিক্ত ফিচারের অনুমতি দেয় এমনকি টিভি ব্যবহার না করা হলেও।"</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"সাজেস্ট করা সব ফিচার"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"বাড়ানো হয়েছে"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"সবসময় কানেক্ট থাকে"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"সবসময় কানেক্ট থাকে — টিভি না চললে নেটওয়ার্ক ফিচার চালু করে"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-bn/strings.xml b/Settings/res/values-bn/strings.xml
index 746d026..c5f6540 100644
--- a/Settings/res/values-bn/strings.xml
+++ b/Settings/res/values-bn/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google আইনি"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"লাইসেন্স ডেটা অনুপলব্ধ"</string>
     <string name="about_model" msgid="9164284529291439296">"মডেল"</string>
+    <string name="device_mode" msgid="7258350575590118152">"ডিভাইস মোড"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"স্টোর ডেমো"</string>
     <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>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"ইন্টারনেট কানেকশন"</string>
     <string name="connected" msgid="4981532275162345997">"কানেক্ট হয়ে আছে"</string>
     <string name="not_connected" msgid="475810896484271663">"সংযুক্ত নয়"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"ইন্টারনেট কানেকশন নেই"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"সেভ করা আছে"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"ভুল পাসওয়ার্ড"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"ওয়াই-ফাই পাসওয়ার্ড খুবই ছোট"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"সাইন-ইন করতে হবে"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"অন্যান্য বিকল্প"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"সব দেখুন"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"কিছু সংখ্যক দেখুন"</string>
@@ -902,6 +909,13 @@
     <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>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"বিধিনিষেধযুক্ত প্রোফাইল চান?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"আগেই তৈরি করা হয়েছে"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"এড়িয়ে যান"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"পিন তৈরি করুন"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"বিধিনিষেধযুক্ত প্রোফাইল চান?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"বিধিনিষেধযুক্ত প্রোফাইল নেই"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"আগে থেকেই রয়েছে"</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="pin_enter_unlock_channel" msgid="243855138978654080">"এই চ্যানেলটি দেখার জন্য পিন লিখুন"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"রেকর্ড করা মাইক্রোফোন"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"অডিও রেকর্ডিং চালু করা যায়নি।"</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"অডিও রেকর্ডিং করা যায়নি।"</string>
-    <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">"ওয়াই-ফাই, ইথারনেট বা আপনার ফোনের হটস্পট ব্যবহার করে আপনি ইন্টারনেটে কানেক্ট করতে পারেন।"</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>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"এইসব সেটিংস ডিভাইস বন্ধ থাকাকালীন তার উপর প্রভাব ফেলতে পারে"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"চালু করে:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"মনে রাখবেন যে এই মোড ডিভাইসের শক্তি খরচ বাড়াতে পারে।"</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"আপনার চালু করা টিভি ফিচারের সংখ্যার সাথে বিদ্যুতের খরচ বাড়তে পারে।"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" চালু করুন"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"আমার রিমোট খুঁজুন"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"আপনার Google TV-এর রিমোট হারিয়ে গেলে, সেটি খুঁজতে সাউন্ড চালান"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"আপনার রিমোটে ৩০ সেকেন্ডের জন্য সাউন্ড চালাতে আপনার Google TV-এর পিছনের বোতাম প্রেস করুন। এটি শুধুমাত্র মানানসই Google TV রিমোট কন্ট্রোলের সাথে কাজ করে।\n\nসাউন্ড বন্ধ করতে, আপনার রিমোটের যেকোনও বোতাম প্রেস করুন।"</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"আপনার Google TV-তে একটি বোতাম আছে যা আপনি ৩০ সেকেন্ডের জন্য সাউন্ড প্লে করতে নিজের রিমোট থেকে পুশ করতে পারেন। এটি শুধুমাত্র মানানসই Google TV রিমোট কন্ট্রোলের সাথে কাজ করে।\n\nসাউন্ড বন্ধ করতে, আপনার রিমোটের বোতাম প্রেস করুন।"</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"\'আমার রিমোট খুঁজুন\' সুবিধা চালু থাকাকালীন, আপনার Google TV-এর রিমোট হারিয়ে গেলে, সেটি খুঁজে পেতে সাউন্ড চালাতে পারবেন।"</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"সাউন্ড চালান"</string>
 </resources>
diff --git a/Settings/res/values-bs/energy-modes.xml b/Settings/res/values-bs/energy-modes.xml
index f9eba06..c32c032 100644
--- a/Settings/res/values-bs/energy-modes.xml
+++ b/Settings/res/values-bs/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Način rada za nisku potrošnju energije"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"s bitnim mrežnima funkcijama"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Isključite mrežnu vezu kada se TV ne koristi (način rada mirovanja)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Nisko"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Mirovanje"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Mirovanje – mrežna veza je isključena kada se TV ne koristi"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Ključna ažuriranja i funkcije"</item>
+    <item msgid="4002284890471636101">"[Umetni 1. funkciju]"</item>
+    <item msgid="7072772341455731040">"[Umetni 2. funkciju]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Način rada za optimiziranu potrošnju energije"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"s preporučenim mrežnim funkcijama"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Omogućava funkcije za aktiviranje TV-a putem mreže (mirovanje na mreži)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Sve bitne funkcije"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimizirano"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Mirovanje na mreži"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Mirovanje na mreži – omogućava funkcije radi aktiviranja TV-a putem mreže"</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="6636328986387241066">"Način rada za povećanu potrošnju energije"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"s dodatnim mrežnim funkcijama"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Omogućava dodatne funkcije čak i kada se TV ne koristi."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Sve preporučene funkcije"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Povećano"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Uvijek povezano"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Uvijek povezano – omogućava mrežne funkcije kada se TV ne koristi"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Umetni funkciju 1]"</item>
     <item msgid="170760143032597722">"[Umetni funkciju 2]"</item>
diff --git a/Settings/res/values-bs/strings.xml b/Settings/res/values-bs/strings.xml
index 2b09be8..5f2a9f4 100644
--- a/Settings/res/values-bs/strings.xml
+++ b/Settings/res/values-bs/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Googleove pravne informacije"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Podaci o licenci nisu dostupni"</string>
     <string name="about_model" msgid="9164284529291439296">"Model"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Način rada uređaja"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Demo verzija za trgovinu"</string>
     <string name="about_version" msgid="6223547403835399861">"Verzija OS-a za Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Serijski broj"</string>
     <string name="about_build" msgid="8467840394761634575">"Verzija OS-a za Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Internetska veza"</string>
     <string name="connected" msgid="4981532275162345997">"Povezano"</string>
     <string name="not_connected" msgid="475810896484271663">"Nije povezano"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Nema internetske veze"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Sačuvano"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Pogrešna lozinka"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Lozinka za WiFi je prekratka"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Potrebna je prijava"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Ostale opcije"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Prikaži sve"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Prikaži manje"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Prilagodi ograničenja"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Samo trenutak…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Promijenite PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Kreirati ograničeni profil?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Već je kreirano"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Preskoči"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Kreirajte PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Ući na ograničeni profil?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Nema nijednog ograničenog profila"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Već je uneseno"</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">"Ova aplikacija može pristupati vašim računima. Kontrolira aplikacija <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Unesite PIN da gledate ovaj kanal"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Mikrofoni za snimanje"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Pokretanje snimanja zvuka nije uspjelo."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Snimanje zvuka nije uspjelo."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Ušteda podataka"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Automatski podesite kvalitet videozapisa radi uštede mobilnih podataka"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Prijenos podataka i obavještenja"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Možete se povezati s internetom pomoću WiFi mreže, Etherneta ili pristupne tačke telefona."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Učiniti vidljivim drugim Bluetooth uređajima?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Aplikacija traži da TV bude vidljiv drugim Bluetooth uređajima <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Ove postavke se odnose na uređaj kada se 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_mode_eco_hint" msgid="5280058011809503514">"Potrošnja energije se može povećati u zavisnosti od broja funkcija TV-a koje omogućite."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Omogućite \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Pronađi moj daljinski upravljač"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Reproducirajte zvuk da pronađete daljinski upravljač za Google TV ako ga izgubite"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Pritisnite dugme na poleđini Google TV-a da reproducirate zvuk na daljinskom upravljaču 30 sekundi. Ovo funkcionira samo s podržanim daljinskim upravljačima za Google TV.\n\nDa zaustavite zvuk, pritisnite bilo koje dugme na daljinskom upravljaču."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Na Google TV-u se nalazi dugme koje možete pritisnuti da reproducirate zvuk na daljinskom upravljaču u trajanju od 30 sekundi. Ovo funkcionira samo s podržanim daljinskim upravljačima za Google TV.\n\nDa zaustavite zvuk, pritisnite bilo koje dugme na daljinskom upravljaču."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Kada je usluga Pronađi moj daljinski upravljač omogućena, možete reproducirati zvuk da pronađete daljinski upravljač za Google TV ako ga izgubite."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Reproduciraj zvuk"</string>
 </resources>
diff --git a/Settings/res/values-ca/energy-modes.xml b/Settings/res/values-ca/energy-modes.xml
index befe8c0..df60c0d 100644
--- a/Settings/res/values-ca/energy-modes.xml
+++ b/Settings/res/values-ca/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Mode de baix consum"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"amb funcions de xarxa essencials"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Desactiva la connexió a la xarxa quan el televisor no es fa servir (mode d\'espera)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Baix"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"En espera"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"En espera: la connexió a la xarxa està desactivada quan el televisor no s\'està utilitzant"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Actualitzacions i funcions importants"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Mode de consum optimitzat"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"amb funcions de xarxa recomanades"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Permet funcions per activar el televisor a través de la xarxa (mode d\'espera en xarxa)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Totes les funcions essencials"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimitzat"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Mode d\'espera en xarxa"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Mode d\'espera en xarxa: activa funcions per encendre el televisor a través de la 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="6636328986387241066">"Mode d\'alt consum"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"amb funcions de xarxa addicionals"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Permet funcions addicionals fins i tot quan el televisor no es fa servir."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Totes les funcions recomanades"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Alt"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Connexió permanent"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Connexió permanent: activa les funcions de xarxa quan el televisor no s\'està utilitzant"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-ca/strings.xml b/Settings/res/values-ca/strings.xml
index 2d4724c..0053e78 100644
--- a/Settings/res/values-ca/strings.xml
+++ b/Settings/res/values-ca/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Informació legal de Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Les dades sobre llicències no estan disponibles"</string>
     <string name="about_model" msgid="9164284529291439296">"Model"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Mode de dispositiu"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Demostració de botiga"</string>
     <string name="about_version" msgid="6223547403835399861">"Versió del sistema operatiu d\'Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Número de sèrie"</string>
     <string name="about_build" msgid="8467840394761634575">"Compilació del sistema operatiu d\'Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Connexió a Internet"</string>
     <string name="connected" msgid="4981532275162345997">"Connectat"</string>
     <string name="not_connected" msgid="475810896484271663">"No connectat"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Sense connexió a Internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Desada"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Contrasenya incorrecta"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"La contrasenya de la Wi‑Fi és massa curta"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Cal iniciar la sessió"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Altres opcions"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Mostra-ho tot"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Mostra\'n menys"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Personalitza les restriccions"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Un moment…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Canvi de PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Vols crear un perfil restringit?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Ja s\'ha creat"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Omet"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Crea un PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Entrar al perfil restringit?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"No hi ha cap perfil restringit"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Ja s\'hi ha accedit"</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">"Aquesta aplicació pot accedir als teus comptes. Controlada per <xliff:g id="APP">%1$s</xliff:g>."</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Introdueix el PIN per veure aquest canal"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Micròfons de la gravació"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"No s\'ha pogut començar a gravar àudio."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"No s\'ha pogut gravar àudio."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Estalvi de dades"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Ajusta la qualitat del vídeo automàticament per utilitzar menys dades mòbils"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Alertes i ús de dades"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Pots connectar-te a Internet per Wi‑Fi, Ethernet o mitjançant el punt d\'accés Wi‑Fi del teu telèfon."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Vols que sigui visible per a altres dispositius Bluetooth?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Una aplicació vol que el televisor sigui visible per a la resta de dispositius Bluetooth durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Aquestes opcions de configuració afecten el dispositiu quan no s\'està utilitzant"</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_mode_eco_hint" msgid="5280058011809503514">"El consum d\'energia pot augmentar segons el nombre de funcions del televisor que activis."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Activa <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Troba el meu comandament"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Reprodueix un so per localitzar el teu comandament de Google TV si no el trobes"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Prem el botó de la part posterior del teu dispositiu Google TV per reproduir un so al comandament durant 30 segons. Això només funciona amb els comandaments de Google TV.\n\nPer aturar el so, prem qualsevol botó al comandament."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Pots prémer un botó que hi ha al dispositiu Google TV per reproduir un so al comandament durant 30 segons. Això només funciona amb els comandaments de Google TV.\n\nPer aturar el so, prem qualsevol botó al comandament."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Quan la funció Troba el meu comandament està activada, pots reproduir un so per localitzar el comandament de Google TV si no el trobes."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Reprodueix un so"</string>
 </resources>
diff --git a/Settings/res/values-cs/energy-modes.xml b/Settings/res/values-cs/energy-modes.xml
index 7fe52fb..d2ca07f 100644
--- a/Settings/res/values-cs/energy-modes.xml
+++ b/Settings/res/values-cs/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Režim nízké energie"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"se základními funkcemi sítě"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Vypnout připojení k síti, když televizi nikdo nepoužívá (pohotovostní režim)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Nízká"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Pohotovostní režim"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Pohotovostní režim — když televize není používána, je připojení k síti vypnuté"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Důležité aktualizace a funkce"</item>
+    <item msgid="4002284890471636101">"[Vložit funkci 1]"</item>
+    <item msgid="7072772341455731040">"[Vložit funkci 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Režim optimalizované energie"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"s doporučenými funkcemi sítě"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Nabízí funkce, které televizi probudí přes síť (pohotovostní režim při připojení)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Všechny nezbytné funkce"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimalizováno"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Pohotovostní režim při připojení"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Pohotovostní režim při připojení — povoluje funkce k probuzení televize přes síť"</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="6636328986387241066">"Režim zvýšené energie"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"s dalšími síťovými funkcemi"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Nabízí další funkce, když se televize nepoužívá."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Všechny doporučené funkce"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Zvýšená"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Vždy připojeno"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Vždy připojeno — povoluje síťové funkce, 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>
diff --git a/Settings/res/values-cs/strings.xml b/Settings/res/values-cs/strings.xml
index 2cde3ef..de915d8 100644
--- a/Settings/res/values-cs/strings.xml
+++ b/Settings/res/values-cs/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Právní informace společnosti Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Údaje o licenci jsou nedostupné."</string>
     <string name="about_model" msgid="9164284529291439296">"Model"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Režim zařízení"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Ukázkový režim pro obchody"</string>
     <string name="about_version" msgid="6223547403835399861">"Verze operačního systému Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Sériové číslo"</string>
     <string name="about_build" msgid="8467840394761634575">"Sestavení operačního systému Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Internetové připojení"</string>
     <string name="connected" msgid="4981532275162345997">"Připojeno"</string>
     <string name="not_connected" msgid="475810896484271663">"Nepřipojeno"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Nejste připojeni k internetu"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Uloženo"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Nesprávné heslo"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Heslo sítě Wi-Fi je moc krátké"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Je vyžadováno přihlášení"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Další možnosti"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Zobrazit vše"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Zobrazit méně"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Přizpůsobit omezení"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Chviličku..."</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Změnit PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Vytvořit omezený profil?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Už je vytvořený"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Přeskočit"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Vytvořit PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Vstoupit do omezeného profilu?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Žádný omezený profil"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Už jste v něm"</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">"Tato aplikace má přístup k vašim účtům. Řízeno aplikací <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Kanál můžete sledovat po zadání kódu PIN"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Nahrané mikrofony"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Nahrávání zvuku se nepodařilo zahájit."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Nahrávání zvuku se nezdařilo."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Spořič dat"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Automaticky upravit kvalitu videa za účelem úspory mobilních dat"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Využití dat a upozornění"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"K internetu se můžete připojit přes Wi-Fi, ethernet nebo hotspot telefonu."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Zviditelnit pro ostatní zařízení Bluetooth?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Aplikace požaduje zviditelnění televize pro ostatní zařízení Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Tato nastavení ovlivňují zařízení, když ho 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_mode_eco_hint" msgid="5280058011809503514">"Pokud povolíte více funkcí televize, může se spotřeba energie zvýšit."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Zapnout režim <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Vyhledání dálkového ovládání"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Pokud někam založíte dálkové ovládání ke Google TV, najděte ho podle zvuku"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Stiskněte tlačítko na zadní části Google TV a dálkové ovládání bude 30 sekund vydávat zvuk. Funguje to jen s podporovaným dálkovým ovládáním Google TV.\n\nZvuk vypnete stisknutím libovolného tlačítka na dálkovém ovládání."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Na televizi Google TV je tlačítko, po jehož stisknutí se bude na dálkovém ovládání 30 sekund přehrávat zvuk. Funguje to jen s podporovaným dálkovým ovládáním Google TV.\n\nZvuk vypnete stisknutím libovolného tlačítka na dálkovém ovládání."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Pokud je aktivováno vyhledávání dálkového ovládání, můžete si nechat přehrát zvuk, abyste našli dálkové ovládání Google TV, když nevíte, kde je."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Přehrát zvuk"</string>
 </resources>
diff --git a/Settings/res/values-da/energy-modes.xml b/Settings/res/values-da/energy-modes.xml
index 644cd97..be76d63 100644
--- a/Settings/res/values-da/energy-modes.xml
+++ b/Settings/res/values-da/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Lavt energiforbrug"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"med vigtige netværksfunktioner"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Afbryd netværksforbindelsen, når fjernsynet ikke er i brug (standbytilstand)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Lav"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Standby"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Standby — Netværksforbindelsen er deaktiveret, når fjernsynet ikke er i brug"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Vigtige opdateringer og funktioner"</item>
+    <item msgid="4002284890471636101">"[Indsæt funktion 1]"</item>
+    <item msgid="7072772341455731040">"[Indsæt funktion 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Optimeret energiforbrug"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"med anbefalede netværksfunktioner"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Giver funktioner tilladelse til at vække fjernsynet via netværket (netværkstilsluttet standbytilstand)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Alle grundlæggende funktioner"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimeret"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Netværkstilsluttet standbytilstand"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Netværkstilsluttet standbytilstand — Aktiverer funktioner, der kan tænde fjernsynet via netværket"</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="6636328986387241066">"Øget energiforbrug"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"med yderligere netværksfunktioner"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Aktiverer yderligere funktioner, selv når fjernsynet ikke er i brug."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Alle anbefalede funktioner"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Øget"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Altid forbundet"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Altid forbundet — Aktiverer netværksfunktioner, når fjernsynet ikke er i brug"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-da/strings.xml b/Settings/res/values-da/strings.xml
index f59d1de..898234e 100644
--- a/Settings/res/values-da/strings.xml
+++ b/Settings/res/values-da/strings.xml
@@ -264,7 +264,7 @@
     <string name="bluetooth_known_devices_category" msgid="6895470515631452961">"Tilbehør"</string>
     <string name="bluetooth_official_remote_category" msgid="5817814488268307170">"Fjernbetjening"</string>
     <string name="bluetooth_official_remote_entry_title" msgid="6699700335229570038">"Indstillinger for fjernbetjeningen"</string>
-    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"Konfigurer fjernbetjeningsknapper"</string>
+    <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"Konfigurer fjern­betjenings­knapper"</string>
     <string name="bluetooth_ir_entry_subtitle" msgid="4606207128353416151">"Styr lydstyrke, afbryderknap og indgangskilde på fjernsyn, modtagere og soundbars"</string>
     <string name="bluetooth_connect_action_title" msgid="7715342395313781643">"Opret forbindelse"</string>
     <string name="bluetooth_connect_confirm" msgid="4769958536295137386">"Opret forbindelse til %1$s"</string>
@@ -278,7 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Forbundet"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Afbrudt"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Du har ikke tilladelse til at ændre Bluetooth-indstillinger."</string>
-    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Brug som lydoutput på fjernsyn"</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Brug til tv-lyd"</string>
     <string name="send_feedback" msgid="936698637869795473">"Giv feedback"</string>
     <string name="launch_help" msgid="2607478763131952469">"Hjælp"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Juridisk information fra Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Licensdataene er utilgængelige"</string>
     <string name="about_model" msgid="9164284529291439296">"Model"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Enhedstilstand"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Demotilstand"</string>
     <string name="about_version" msgid="6223547403835399861">"Android TV OS-version"</string>
     <string name="about_serial" msgid="3432319328808745459">"Serienummer"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV OS-build"</string>
@@ -433,8 +435,13 @@
     <string name="title_ip_address" msgid="705842159484772807">"IP-adresse"</string>
     <string name="title_ssid" msgid="255328048344188682">"Angiv navn på Wi-Fi-netværk"</string>
     <string name="title_internet_connection" msgid="7502414094881828069">"Internetforbindelse"</string>
-    <string name="connected" msgid="4981532275162345997">"Tilsluttet"</string>
+    <string name="connected" msgid="4981532275162345997">"Forbundet"</string>
     <string name="not_connected" msgid="475810896484271663">"Ikke tilsluttet"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Ingen internetadgang"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Gemt"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Forkert adgangskode"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Adgangskoden til Wi-Fi er for kort"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Login er påkrævet"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Andre valgmuligheder"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Se alle"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Se færre"</string>
@@ -903,6 +910,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Tilpas begrænsninger"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Et øjeblik..."</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Skift pinkode"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Opret en begrænset profil?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Er allerede oprettet"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Spring over"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Opret pinkode"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Skift til en begrænset profil?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Ingen begrænset profil"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Allerede angivet"</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">"Denne app har adgang til dine konti. Administreres af <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Angiv pinkode for at se denne kanal"</string>
@@ -1015,8 +1029,8 @@
     <string name="manage_keyboards" msgid="7983890675377321912">"Administrer tastaturer"</string>
     <string name="app_permission_summary_allowed" msgid="5359622119044147500">"Tilladt"</string>
     <string name="app_permission_summary_not_allowed" msgid="5131611341738385303">"Ikke tilladt"</string>
-    <string name="usage_access" msgid="8402350645248312782">"Adgang til telefonbrug"</string>
-    <string name="usage_access_description" msgid="3276026988575551587">"Med adgang til telefonbrug kan en app se, hvilke andre apps du anvender og hvor ofte, samt dit mobilselskab, dine sprogindstillinger og andre oplysninger."</string>
+    <string name="usage_access" msgid="8402350645248312782">"Adgang til brug"</string>
+    <string name="usage_access_description" msgid="3276026988575551587">"Med adgang til brug kan en app se, hvilke andre apps du anvender og hvor ofte, samt dit mobilselskab, dine sprogindstillinger og andre oplysninger."</string>
     <string name="high_power_apps" msgid="5841073958519976562">"Energioptimering"</string>
     <string name="high_power_apps_description" msgid="8651692364795060525">"Optimer energiforbruget for apps"</string>
     <string name="high_power_apps_empty" msgid="3084512758421482051">"Ingen apps skal optimeres"</string>
@@ -1039,7 +1053,7 @@
     <string name="write_settings_on" msgid="71675710746513956">"Ja"</string>
     <string name="write_settings_off" msgid="6730113471695092167">"Nej"</string>
     <string name="manage_external_storage_title" msgid="8139593207533811077">"Adgang til alle filer"</string>
-    <string name="permit_manage_external_storage" msgid="1776899171934627417">"Tillad administrationsadgang til alle filer"</string>
+    <string name="permit_manage_external_storage" msgid="1776899171934627417">"Tillad admin­istrations­adgang til alle filer"</string>
     <string name="allow_manage_external_storage_description" msgid="4288250228151617611">"Giv denne app tilladelse til at læse, ændre og slette alle filer på denne enhed eller andre tilsluttede lagringsløsninger. Hvis du giver tilladelse til dette, kan appen få adgang til dine filer, uden du specifikt bliver gjort opmærksom på det."</string>
     <string name="picture_in_picture_title" msgid="2636935591386702348">"Integreret billede"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="3688997906817583854">"Tillad integreret billede"</string>
@@ -1065,10 +1079,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Lydkilde (mikrofoner)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Lydoptagelsen kunne ikke startes."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Lydoptagelsen mislykkedes."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Datasparefunktion"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Juster automatisk videokvaliteten, så der bruges mindre mobildata"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Databrug og underretninger"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Du kan få internetforbindelse via Wi-Fi, Ethernet eller din telefons hotspot."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Vil du gøre det synligt for andre Bluetooth-enheder?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"En app anmoder om at gøre dit fjernsyn synligt for andre Bluetooth-enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1080,7 +1090,7 @@
     <string name="disabled_by_policy_title_screen_capture" msgid="5774035841010091253">"Screenshots er ikke tilladt"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="6500185610058872758">"Denne app kan ikke åbnes"</string>
     <string name="default_admin_support_msg" msgid="7913455019068370350">"Kontakt din it-administrator, hvis du har spørgsmål"</string>
-    <string name="admin_support_more_info" msgid="9053232166115098434">"Mere info"</string>
+    <string name="admin_support_more_info" msgid="9053232166115098434">"Flere oplysninger"</string>
     <string name="admin_profile_owner_message" msgid="5729169873349157622">"Din administrator kan overvåge og administrere apps og data, der er knyttet til din arbejdsprofil, herunder indstillinger, tilladelser, virksomhedsadgang, netværksaktivitet og enhedens lokationsoplysninger."</string>
     <string name="admin_profile_owner_user_message" msgid="6431405126322617268">"Din administrator kan overvåge og administrere apps og data, der er knyttet til denne bruger, herunder indstillinger, tilladelser, virksomhedsadgang, netværksaktivitet og enhedens lokationsoplysninger."</string>
     <string name="admin_device_owner_message" msgid="1935507216776040907">"Din administrator kan overvåge og administrere apps og data, der er knyttet til denne enhed, herunder indstillinger, tilladelser, virksomhedsadgang, netværksaktivitet og enhedens lokationsoplysninger."</string>
@@ -1124,13 +1134,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Disse indstillinger påvirker enheden, når den 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_mode_eco_hint" msgid="5280058011809503514">"Antallet af aktiverede funktioner på fjernsynet kan øge strømforbruget."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Aktivér \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Find min fjernbetjening"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Afspil en lyd for at finde din fjernbetjening til Google TV, hvis den er blevet væk"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Tryk på knappen på bagsiden af din Google TV-enhed for at afspille en lyd på din fjernbetjening i 30 sekunder. Dette virker kun på understøttede Google TV-fjernbetjeninger.\n\nTryk på en vilkårlig knap på fjernbetjeningen for at stoppe lyden."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Der er en knap på dit Google TV, som du kan trykke på for at afspille en lyd på din fjernbetjening i 30 sekunder. Dette virker kun på understøttede Google TV-fjernbetjeninger.\n\nTryk på en vilkårlig knap på fjernbetjeningen for at stoppe lyden."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Når Find min fjernbetjening er aktiveret, kan du afspille en lyd for at finde din fjernbetjening til Google TV, hvis den er blevet væk."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Afspil lyd"</string>
 </resources>
diff --git a/Settings/res/values-de/energy-modes.xml b/Settings/res/values-de/energy-modes.xml
index 1a1f607..6ebb7c3 100644
--- a/Settings/res/values-de/energy-modes.xml
+++ b/Settings/res/values-de/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Energiesparmodus"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"mit wichtigen Netzwerkfunktionen"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Netzwerkverbindung ausschalten, wenn der Fernseher nicht verwendet wird (Stand-by-Modus)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Niedrig"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Standby"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Standby – Netzwerkverbindung ist deaktiviert, wenn der Fernseher ausgeschaltet ist"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Wichtige Updates und Funktionen"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Modus für optimierten Energieverbrauch"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"mit empfohlenen Netzwerkfunktionen"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Ermöglicht es Funktionen, den Ruhemodus des Fernsehers über das Netzwerk zu beenden (Bereitschaftsbetrieb)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Alle wesentlichen Funktionen"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimiert"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Vernetzter Bereitschaftsbetrieb"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Vernetzter Bereitschaftsbetrieb – Ruhemodus des Fernsehers kann über das Netzwerk beendet werden"</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="6636328986387241066">"Modus mit erhöhtem Energieverbrauch"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"mit zusätzlichen Netzwerkfunktionen"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Bietet zusätzliche Funktionen, auch wenn der Fernseher nicht verwendet wird."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Alle empfohlenen Funktionen"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Erhöht"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Immer verbunden"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Immer verbunden – Netzwerkfunktionen sind aktiviert, wenn der Fernseher ausgeschaltet ist"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-de/strings.xml b/Settings/res/values-de/strings.xml
index 5541161..e4a015b 100644
--- a/Settings/res/values-de/strings.xml
+++ b/Settings/res/values-de/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Rechtliche Hinweise"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Lizenzdaten sind nicht verfügbar."</string>
     <string name="about_model" msgid="9164284529291439296">"Modell"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Gerätemodus"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Demomodus"</string>
     <string name="about_version" msgid="6223547403835399861">"Android TV-Betriebssystemversion"</string>
     <string name="about_serial" msgid="3432319328808745459">"Seriennummer"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV-Betriebssystem-Build"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Internetverbindung"</string>
     <string name="connected" msgid="4981532275162345997">"Verbunden"</string>
     <string name="not_connected" msgid="475810896484271663">"Nicht verbunden"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Kein Internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Gespeichert"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Falsches Passwort"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"WLAN-Passwort ist zu kurz"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Anmeldung erforderlich"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Weitere Optionen"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Alle anzeigen"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Weniger anzeigen"</string>
@@ -697,7 +704,7 @@
     <string name="palette_color_blue" msgid="8836682634988540630">"Blau"</string>
     <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" msgid="5856158637840030531">"Bedienungshilfe-\\nKurzbefehl"</string>
     <string name="accessibility_shortcut_enable" msgid="6603542432267329986">"Kurzbefehl für Bedienungshilfen 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>
@@ -719,7 +726,7 @@
     <string name="captions_edgecolor" msgid="2779925179084237336">"Rahmenfarbe"</string>
     <string name="captions_backgroundshow" msgid="1080183686470477645">"Hintergrund anzeigen"</string>
     <string name="captions_backgroundcolor" msgid="2056944109914399253">"Hintergrundfarbe"</string>
-    <string name="captions_backgroundopacity" msgid="1850126438162000027">"Hintergrund­­­transparenz"</string>
+    <string name="captions_backgroundopacity" msgid="1850126438162000027">"Hintergrund­deck­kraft"</string>
     <string name="captioning_preview_text" msgid="3034147586392743237">"Untertitel sehen so aus."</string>
     <string name="captions_textopacity" msgid="6055602491649526307">"Textdeckkraft"</string>
     <string name="captions_windowshow" msgid="6002072054703167886">"Fenster anzeigen"</string>
@@ -750,7 +757,7 @@
     <string name="system_accessibility_tts_engine_config" msgid="4757760652785865532">"Modulkonfiguration"</string>
     <string name="system_speak_passwords" msgid="8556036524146404052">"Passwörter aussprechen"</string>
     <string name="system_preferred_engine" msgid="3545505072652708443">"Bevorzugtes Modul"</string>
-    <string name="system_speech_rate" msgid="6553204071403872669">"Sprechgeschwindig¬keit"</string>
+    <string name="system_speech_rate" msgid="6553204071403872669">"Sprechgeschwindig­keit"</string>
     <string name="system_play_sample" msgid="3934369914309865584">"Beispiel abspielen"</string>
     <string name="system_install_voice_data" msgid="8016395777968958673">"Sprachdaten installieren"</string>
     <string name="system_general" msgid="687760148454147771">"Allgemein"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Einschränkungen anpassen"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Einen Moment bitte…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"PIN ändern"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Eingeschränktes Profil erstellen?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Bereits erstellt"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Überspringen"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"PIN erstellen"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Eingeschränktes Profil aufrufen?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Kein eingeschränktes Profil"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Bereits aufgerufen"</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">"Diese App darf auf deine Konten zugreifen. Von <xliff:g id="APP">%1$s</xliff:g> festgelegt"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Zum Ansehen dieses Kanals PIN eingeben"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Für Aufnahme verwendete(s) Mikrofon(e)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Audioaufnahme konnte nicht gestartet werden."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Audioaufnahme fehlgeschlagen."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Datensparmodus"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Videoqualität automatisch anpassen, um weniger mobile Daten zu verwenden"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Datennutzung und Warnmeldungen"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Du kannst dich über WLAN, Ethernet oder den Hotspot deines Smartphones mit dem Internet verbinden."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Für andere Bluetooth-Geräte sichtbar machen?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Eine App fordert die Berechtigung, deinen Fernseher <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden lang für andere Bluetooth-Geräte sichtbar zu machen."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Einstellungen für ausgeschaltetes Gerät"</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_mode_eco_hint" msgid="5280058011809503514">"Der Stromverbrauch kann steigen, je mehr Funktionen des Fernsehers du aktivierst."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"„<xliff:g id="ENERGYMODENAME">%s</xliff:g>“ aktivieren?"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Fernbedienung finden"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Du kannst auf deiner Google TV-Fernbedienung einen Ton wiedergeben lassen, wenn du sie verlegt hast"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Drück die Taste auf der Rückseite deines Google TV, um 30 Sekunden lang einen Ton auf deiner Fernbedienung wiedergeben zu lassen. Dafür ist eine Fernbedienung erforderlich, die Google TV unterstützt.\n\nDrücke zum Beenden der Wiedergabe eine beliebige Taste auf deiner Fernbedienung."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Du kannst eine Taste an deinem Google TV drücken, um 30 Sekunden lang einen Ton auf deiner Fernbedienung wiedergeben zu lassen. Dafür ist eine Fernbedienung erforderlich, die Google TV unterstützt.\n\nDrücke zum Beenden der Wiedergabe eine beliebige Taste auf deiner Fernbedienung."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Wenn die Funktion „Fernbedienung finden“ aktiviert ist, kannst du einen Ton abspielen, um deine Google TV-Fernbedienung wiederzufinden, wenn du sie verlegt hast."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Ton wiedergeben lassen"</string>
 </resources>
diff --git a/Settings/res/values-el/energy-modes.xml b/Settings/res/values-el/energy-modes.xml
index 0a3778f..dc8500e 100644
--- a/Settings/res/values-el/energy-modes.xml
+++ b/Settings/res/values-el/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Λειτουργία χαμηλής ενέργειας"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"με βασικές λειτουργίες δικτύου"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Απενεργοποιεί τη σύνδεση δικτύου όταν η τηλεόραση δεν χρησιμοποιείται (κατάσταση αναμονής)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Χαμηλή"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Κατάσταση αναμονής"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Κατάσταση αναμονής — Η σύνδεση δικτύου είναι απενεργοποιημένη όταν η τηλεόραση δεν είναι σε χρήση"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Σημαντικές ενημερώσεις και λειτουργίες"</item>
+    <item msgid="4002284890471636101">"[Εισαγωγή λειτουργίας 1]"</item>
+    <item msgid="7072772341455731040">"[Εισαγωγή λειτουργίας 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Βελτιστοποιημένη λειτουργία ενέργειας"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"με προτεινόμενες λειτουργίες δικτύου"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Επιτρέπει στις λειτουργίες να ενεργοποιούν την τηλεόραση μέσω δικτύου (αναμονή δικτύου)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Όλες οι βασικές λειτουργίες"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Βελτιστοποιημένη"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Αναμονή δικτύου"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Αναμονή δικτύου — Ενεργοποιεί λειτουργίες για αφύπνιση της τηλεόρασης μέσω δικτύου"</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="6636328986387241066">"Λειτουργία αυξημένης ενέργειας"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"με πρόσθετες λειτουργίες δικτύου"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Επιτρέπει επιπλέον λειτουργίες ακόμη και όταν η τηλεόραση δεν χρησιμοποιείται."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Όλες οι προτεινόμενες λειτουργίες"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Αυξημένη"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Πάντα σε σύνδεση"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Πάντα σε σύνδεση — Ενεργοποιεί λειτουργίες δικτύου όταν η τηλεόραση δεν είναι σε χρήση"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Εισαγωγή λειτουργίας 1]"</item>
     <item msgid="170760143032597722">"[Εισαγωγή λειτουργίας 2]"</item>
diff --git a/Settings/res/values-el/strings.xml b/Settings/res/values-el/strings.xml
index 2f1395c..302a37d 100644
--- a/Settings/res/values-el/strings.xml
+++ b/Settings/res/values-el/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Νομικές πληροφορίες Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Τα δεδομένα άδειας δεν είναι διαθέσιμα"</string>
     <string name="about_model" msgid="9164284529291439296">"Μοντέλο"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Λειτουργία συσκευής"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Επίδειξη σε κατάστημα"</string>
     <string name="about_version" msgid="6223547403835399861">"Έκδοση λειτουργικού συστήματος Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Σειριακός αριθμός"</string>
     <string name="about_build" msgid="8467840394761634575">"Έκδοση λειτουργικού συστήματος Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Σύνδεση στο διαδίκτυο"</string>
     <string name="connected" msgid="4981532275162345997">"Συνδέθηκε"</string>
     <string name="not_connected" msgid="475810896484271663">"Δεν συνδέθηκε"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Χωρίς σύνδεση στο διαδίκτυο"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Αποθηκεύτηκε"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Λανθασμένος κωδικός πρόσβασης"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Ο κωδικός πρόσβασης Wi-Fi είναι πολύ μικρός"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Απαιτείται σύνδεση"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Άλλες επιλογές"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Εμφάνιση όλων"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Εμφάνιση λιγότερων"</string>
@@ -902,6 +909,13 @@
     <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">"Αλλαγή κωδικού PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Δημιουργία περιορισμ. προφίλ;"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Έχει ήδη δημιουργηθεί"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Παράβλεψη"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Δημιουργία PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Εισαγωγή περιορισμένου προφίλ;"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Κανένα περιορισμένο προφίλ"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Έχει ήδη καταχωριστεί"</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="pin_enter_unlock_channel" msgid="243855138978654080">"Εισαγάγετε το PIN για να δείτε αυτό το κανάλι"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Μικρόφωνα εγγραφής"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Απέτυχε η έναρξη εγγραφής ήχου."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Η εγγραφή ήχου απέτυχε."</string>
-    <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, Ethernet ή του σημείου πρόσβασης Wi-Fi του τηλεφώνου σας."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Να είναι ορατή σε άλλες συσκευές Bluetooth;"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Μια εφαρμογή θέλει να κάνει ορατή την τηλεόρασή σας σε άλλες συσκευές Bluetooth για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Αυτές οι ρυθμίσεις επηρεάζουν τη συσκευή όταν δεν είναι σε χρήση"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"Ενεργοποιεί:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Έχετε υπόψη ότι η συγκεκριμένη λειτουργία μπορεί να αυξήσει την κατανάλωση ενέργειας της συσκευής."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"Η κατανάλωση ενέργειας ενδέχεται να αυξηθεί με τον αριθμό των λειτουργιών τηλεόρασης που ενεργοποιείτε."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Ενεργοποίηση <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Εύρεση τηλεχειριστηρίου"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Αναπαράγετε ήχο για να εντοπίσετε το τηλεχειριστήριο του Google TV, σε περίπτωση που το έχετε χάσει"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Πατήστε το κουμπί στο πίσω μέρος του Google TV για την αναπαραγωγή ενός ήχου στο τηλεχειριστήριο για 30 δευτερόλεπτα. Αυτό έχει αποτέλεσμα μόνο σε υποστηριζόμενα τηλεχειριστήρια Google TV.\n\nΓια να διακόψετε τον ήχο, πατήστε ένα κουμπί στο τηλεχειριστήριο."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Υπάρχει ένα κουμπί στο Google TV που μπορείτε να πατήσετε για την αναπαραγωγή ενός ήχου στο τηλεχειριστήριο για 30 δευτερόλεπτα. Αυτό έχει αποτέλεσμα μόνο σε υποστηριζόμενα τηλεχειριστήρια Google TV.\n\nΓια να διακόψετε τον ήχο, πατήστε ένα κουμπί στο τηλεχειριστήριο."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Όταν είναι ενεργή η Εύρεση τηλεχειριστηρίου, μπορείτε να αναπαράγετε έναν ήχο για να εντοπίσετε το τηλεχειριστήριο του Google TV σε περίπτωση που το έχετε χάσει."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Αναπαραγωγή ήχου"</string>
 </resources>
diff --git a/Settings/res/values-en-rAU/energy-modes.xml b/Settings/res/values-en-rAU/energy-modes.xml
index 4c4a71d..229c80c 100644
--- a/Settings/res/values-en-rAU/energy-modes.xml
+++ b/Settings/res/values-en-rAU/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Low energy mode"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"with essential network features"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Turn off network connection when the TV is not in use (standby mode)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Low"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Standby"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Standby — Network connection is off when the TV is not in use"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Critical updates and functions"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Optimised energy mode"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"with recommended network features"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Allows features to wake the TV over the network (networked standby)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"All essential features"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimised"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Networked standby"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Networked standby — Enables features to wake up the TV over the network"</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="6636328986387241066">"Increased energy mode"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"with additional network features"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Allows extra features even when the TV is not in use."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"All recommended features"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Increased"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Always connected"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Always connected — Enables network features when 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>
diff --git a/Settings/res/values-en-rAU/strings.xml b/Settings/res/values-en-rAU/strings.xml
index acefe48..8d9f4b7 100644
--- a/Settings/res/values-en-rAU/strings.xml
+++ b/Settings/res/values-en-rAU/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google legal"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Licence data is unavailable"</string>
     <string name="about_model" msgid="9164284529291439296">"Model"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Device Mode"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Shop demo"</string>
     <string name="about_version" msgid="6223547403835399861">"Android TV OS version"</string>
     <string name="about_serial" msgid="3432319328808745459">"Serial number"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV OS build"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Internet connection"</string>
     <string name="connected" msgid="4981532275162345997">"Connected"</string>
     <string name="not_connected" msgid="475810896484271663">"Not connected"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"No Internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Saved"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Wrong password"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi password is too short"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Sign-in required"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Other Options"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"See all"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"See fewer"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Customise restrictions"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"One moment…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Change pin"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Create restricted profile?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Already created"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Skip"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Create PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Enter restricted profile?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"No restricted profile"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Already entered"</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">"This app can access your accounts. Controlled by <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Enter PIN to watch this channel"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Recorded microphone(s)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Failed to start recording audio."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Audio recording failed."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Data Saver"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Automatically adjust video quality to use less mobile data"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Data usage and alerts"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"You can connect to the Internet with Wi-Fi, Ethernet or your phone\'s hotspot."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Make visible to other Bluetooth devices?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"An app wants to make your TV visible to other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"These settings affect the device when 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_mode_eco_hint" msgid="5280058011809503514">"Power consumption may increase with the number of TV features you enable."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Enable \'<xliff:g id="ENERGYMODENAME">%s</xliff:g>\'"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Find my remote"</string>
-    <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Play a sound to locate your Google TV remote if it\'s been misplaced"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Press the button at the back of your Google TV to play a sound on your remote for 30 seconds. This only works with supported Google TV remote controls.\n\nTo stop the sound, press any button on your remote."</string>
-    <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"When Find my remote is enabled, you can play a sound to locate your Google TV remote if it\'s been misplaced."</string>
+    <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Play a sound to locate your Google TV Streamer Voice Remote if it\'s been misplaced"</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"There is a button on your Google TV that you can push to play a sound on your remote for 30 seconds. This only works with supported Google TV remote controls.\n\nTo stop the sound, press any button on your remote."</string>
+    <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"When Find my remote is enabled, you can play a sound to locate your Google TV Streamer Voice Remote if it\'s been misplaced."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Play sound"</string>
 </resources>
diff --git a/Settings/res/values-en-rCA/energy-modes.xml b/Settings/res/values-en-rCA/energy-modes.xml
index dc45075..7282897 100644
--- a/Settings/res/values-en-rCA/energy-modes.xml
+++ b/Settings/res/values-en-rCA/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Low energy mode"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"with essential network features"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Turn off network connection when the TV is not in use (standby mode)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Low"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Standby"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Standby — Network connection is off when the TV is not in use"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Critical updates and functions"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Optimized energy mode"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"with recommended network features"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Allows features to wake the TV over the network (networked standby)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"All essential features"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimized"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Networked Standby"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Networked standby — Enables features to wake up the TV over the network"</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="6636328986387241066">"Increased energy mode"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"with additional network features"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Allows extra features even when the TV is not in use."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"All recommended features"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Increased"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Always connected"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Always connected — Enables network features when 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>
diff --git a/Settings/res/values-en-rCA/strings.xml b/Settings/res/values-en-rCA/strings.xml
index b9e77dd..c74af63 100644
--- a/Settings/res/values-en-rCA/strings.xml
+++ b/Settings/res/values-en-rCA/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google legal"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"License data is unavailable"</string>
     <string name="about_model" msgid="9164284529291439296">"Model"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Device Mode"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Store Demo"</string>
     <string name="about_version" msgid="6223547403835399861">"Android TV OS version"</string>
     <string name="about_serial" msgid="3432319328808745459">"Serial number"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV OS build"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Internet connection"</string>
     <string name="connected" msgid="4981532275162345997">"Connected"</string>
     <string name="not_connected" msgid="475810896484271663">"Not connected"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"No Internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Saved"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Wrong password"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi password is too short"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Sign-in required"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Other options"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"See all"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"See fewer"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Customize restrictions"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"One moment…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Change pin"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Create restricted profile?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Already Created"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Skip"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Create PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Enter restricted profile?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"No restricted profile"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Already entered"</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">"This app can access your accounts. Controlled by <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Enter PIN to watch this channel"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Recorded microphone(s)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Failed to start recording audio."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Audio recording failed."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Data Saver"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Automatically adjust video quality to use less mobile data"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Data usage and alerts"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"You can connect to the internet with Wi-Fi, Ethernet, or your phone\'s hotspot."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Make visible to other Bluetooth devices?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"An app wants to make your TV visible to other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"These settings affect the device when 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_mode_eco_hint" msgid="5280058011809503514">"Power consumption may increase with the number of TV features you enable."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Enable \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Find my remote"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Play a sound to locate your Google TV remote if it\'s misplaced"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Press the button at the back of your Google TV to play a sound on your remote for 30 seconds. This only works with supported Google TV remote controls.\n\nTo stop the sound, press any button on your remote."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"There is a button on your Google TV that you can push to play a sound on your remote for 30 seconds. This only works with supported Google TV remote controls.\n\nTo stop the sound, press any button on your remote."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"When Find my remote is enabled, you can play a sound to locate your Google TV remote if it\'s misplaced."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Play sound"</string>
 </resources>
diff --git a/Settings/res/values-en-rGB/energy-modes.xml b/Settings/res/values-en-rGB/energy-modes.xml
index 4c4a71d..229c80c 100644
--- a/Settings/res/values-en-rGB/energy-modes.xml
+++ b/Settings/res/values-en-rGB/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Low energy mode"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"with essential network features"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Turn off network connection when the TV is not in use (standby mode)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Low"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Standby"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Standby — Network connection is off when the TV is not in use"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Critical updates and functions"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Optimised energy mode"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"with recommended network features"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Allows features to wake the TV over the network (networked standby)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"All essential features"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimised"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Networked standby"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Networked standby — Enables features to wake up the TV over the network"</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="6636328986387241066">"Increased energy mode"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"with additional network features"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Allows extra features even when the TV is not in use."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"All recommended features"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Increased"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Always connected"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Always connected — Enables network features when 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>
diff --git a/Settings/res/values-en-rGB/strings.xml b/Settings/res/values-en-rGB/strings.xml
index eebc5b1..51f345b 100644
--- a/Settings/res/values-en-rGB/strings.xml
+++ b/Settings/res/values-en-rGB/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google legal"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Licence data is unavailable"</string>
     <string name="about_model" msgid="9164284529291439296">"Model"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Device Mode"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Shop demo"</string>
     <string name="about_version" msgid="6223547403835399861">"Android TV OS version"</string>
     <string name="about_serial" msgid="3432319328808745459">"Serial number"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV OS build"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Internet connection"</string>
     <string name="connected" msgid="4981532275162345997">"Connected"</string>
     <string name="not_connected" msgid="475810896484271663">"Not connected"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"No Internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Saved"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Wrong password"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi password is too short"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Sign-in required"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Other Options"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"See all"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"See fewer"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Customise restrictions"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"One moment…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Change pin"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Create restricted profile?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Already created"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Skip"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Create PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Enter restricted profile?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"No restricted profile"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Already entered"</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">"This app can access your accounts. Controlled by <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Enter PIN to watch this channel"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Recorded microphone(s)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Failed to start recording audio."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Audio recording failed."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Data Saver"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Automatically adjust video quality to use less mobile data"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Data usage and alerts"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"You can connect to the Internet with Wi-Fi, Ethernet or your phone\'s hotspot."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Make visible to other Bluetooth devices?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"An app wants to make your TV visible to other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"These settings affect the device when 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_mode_eco_hint" msgid="5280058011809503514">"Power consumption may increase with the number of TV features you enable."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Enable \'<xliff:g id="ENERGYMODENAME">%s</xliff:g>\'"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Find my remote"</string>
-    <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Play a sound to locate your Google TV remote if it\'s been misplaced"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Press the button at the back of your Google TV to play a sound on your remote for 30 seconds. This only works with supported Google TV remote controls.\n\nTo stop the sound, press any button on your remote."</string>
-    <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"When Find my remote is enabled, you can play a sound to locate your Google TV remote if it\'s been misplaced."</string>
+    <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Play a sound to locate your Google TV Streamer Voice Remote if it\'s been misplaced"</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"There is a button on your Google TV that you can push to play a sound on your remote for 30 seconds. This only works with supported Google TV remote controls.\n\nTo stop the sound, press any button on your remote."</string>
+    <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"When Find my remote is enabled, you can play a sound to locate your Google TV Streamer Voice Remote if it\'s been misplaced."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Play sound"</string>
 </resources>
diff --git a/Settings/res/values-en-rIN/energy-modes.xml b/Settings/res/values-en-rIN/energy-modes.xml
index 4c4a71d..229c80c 100644
--- a/Settings/res/values-en-rIN/energy-modes.xml
+++ b/Settings/res/values-en-rIN/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Low energy mode"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"with essential network features"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Turn off network connection when the TV is not in use (standby mode)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Low"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Standby"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Standby — Network connection is off when the TV is not in use"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Critical updates and functions"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Optimised energy mode"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"with recommended network features"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Allows features to wake the TV over the network (networked standby)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"All essential features"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimised"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Networked standby"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Networked standby — Enables features to wake up the TV over the network"</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="6636328986387241066">"Increased energy mode"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"with additional network features"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Allows extra features even when the TV is not in use."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"All recommended features"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Increased"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Always connected"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Always connected — Enables network features when 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>
diff --git a/Settings/res/values-en-rIN/strings.xml b/Settings/res/values-en-rIN/strings.xml
index eebc5b1..51f345b 100644
--- a/Settings/res/values-en-rIN/strings.xml
+++ b/Settings/res/values-en-rIN/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google legal"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Licence data is unavailable"</string>
     <string name="about_model" msgid="9164284529291439296">"Model"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Device Mode"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Shop demo"</string>
     <string name="about_version" msgid="6223547403835399861">"Android TV OS version"</string>
     <string name="about_serial" msgid="3432319328808745459">"Serial number"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV OS build"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Internet connection"</string>
     <string name="connected" msgid="4981532275162345997">"Connected"</string>
     <string name="not_connected" msgid="475810896484271663">"Not connected"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"No Internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Saved"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Wrong password"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi password is too short"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Sign-in required"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Other Options"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"See all"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"See fewer"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Customise restrictions"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"One moment…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Change pin"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Create restricted profile?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Already created"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Skip"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Create PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Enter restricted profile?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"No restricted profile"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Already entered"</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">"This app can access your accounts. Controlled by <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Enter PIN to watch this channel"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Recorded microphone(s)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Failed to start recording audio."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Audio recording failed."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Data Saver"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Automatically adjust video quality to use less mobile data"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Data usage and alerts"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"You can connect to the Internet with Wi-Fi, Ethernet or your phone\'s hotspot."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Make visible to other Bluetooth devices?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"An app wants to make your TV visible to other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"These settings affect the device when 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_mode_eco_hint" msgid="5280058011809503514">"Power consumption may increase with the number of TV features you enable."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Enable \'<xliff:g id="ENERGYMODENAME">%s</xliff:g>\'"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Find my remote"</string>
-    <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Play a sound to locate your Google TV remote if it\'s been misplaced"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Press the button at the back of your Google TV to play a sound on your remote for 30 seconds. This only works with supported Google TV remote controls.\n\nTo stop the sound, press any button on your remote."</string>
-    <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"When Find my remote is enabled, you can play a sound to locate your Google TV remote if it\'s been misplaced."</string>
+    <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Play a sound to locate your Google TV Streamer Voice Remote if it\'s been misplaced"</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"There is a button on your Google TV that you can push to play a sound on your remote for 30 seconds. This only works with supported Google TV remote controls.\n\nTo stop the sound, press any button on your remote."</string>
+    <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"When Find my remote is enabled, you can play a sound to locate your Google TV Streamer Voice Remote if it\'s been misplaced."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Play sound"</string>
 </resources>
diff --git a/Settings/res/values-en-rXC/energy-modes.xml b/Settings/res/values-en-rXC/energy-modes.xml
index 7af8bb2..dff4878 100644
--- a/Settings/res/values-en-rXC/energy-modes.xml
+++ b/Settings/res/values-en-rXC/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‎‏‏‎‎‏‎‎‏‎‎‏‎‎‎‏‎‎‎‎‎‎‏‎‏‏‎‎‏‎‎‎‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‎Low energy mode‎‏‎‎‏‎"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎‏‏‏‏‎‎‎‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‎‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‎with essential network features‎‏‎‎‏‎"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‎‏‏‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎Turn off network connection when the TV is not in use (standby mode).‎‏‎‎‏‎"</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‎‎‎‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎Low‎‏‎‎‏‎"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‎‎‎‎‎‎‎‏‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎Standby‎‏‎‎‏‎"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‏‏‎‎‎‏‎‎‏‎‏‎Standby — Network connection is off when the TV is not in use‎‏‎‎‏‎"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‏‎‎Critical updates and functions‎‏‎‎‏‎"</item>
+    <item msgid="4002284890471636101">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‎‏‎‎‏‏‏‏‎‎‏‏‎‎‏‏‏‎‎‏‎‎‎‎‏‎‏‎[Insert feature 1]‎‏‎‎‏‎"</item>
+    <item msgid="7072772341455731040">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‏‎‎‎‏‎‏‎‏‏‎‏‏‎‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‎[Insert feature 2]‎‏‎‎‏‎"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‎‎‏‏‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎Optimized energy mode‎‏‎‎‏‎"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‎‎‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‎‎‎‎‏‏‎‎with recommended network features‎‏‎‎‏‎"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎Allows features to wake the TV over the network (networked standby).‎‏‎‎‏‎"</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‎‎‏‏‎‎‏‏‏‏‎‎‎‏‏‎‏‏‏‏‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‏‎‏‎‎‏‎All essential features‎‏‎‎‏‎"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎‎‎‎‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‎‎‏‎‎‏‎‎‎‏‏‏‎‎Optimized‎‏‎‎‏‎"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‏‎‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎‎Networked Standby‎‏‎‎‏‎"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‎‎‎‏‎‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎Networked standby — Enables features to wake up the TV over the network‎‏‎‎‏‎"</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="6636328986387241066">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‏‎‎Increased energy mode‎‏‎‎‏‎"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‎‏‎‎‎‎‏‏‎‎‎‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‎‎‏‏‏‎with additional network features‎‏‎‎‏‎"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‎‏‏‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎Allows extra features even when the TV is not in use.‎‏‎‎‏‎"</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‏‎‏‏‎‏‏‏‎‎‎‎‎‎All recommended features‎‏‎‎‏‎"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎Increased‎‏‎‎‏‎"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‏‎‎‏‏‎‎‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎‎Always connected‎‏‎‎‏‎"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‏‎‏‎‎‏‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‏‎‎‏‏‎‏‎‏‎‎Always connected — Enables network features when 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>
diff --git a/Settings/res/values-en-rXC/strings.xml b/Settings/res/values-en-rXC/strings.xml
index cda8be0..3adc906 100644
--- a/Settings/res/values-en-rXC/strings.xml
+++ b/Settings/res/values-en-rXC/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‎‎‏‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎Google legal‎‏‎‎‏‎"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‎‏‏‏‎‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‏‎‏‎‎License data is unavailable‎‏‎‎‏‎"</string>
     <string name="about_model" msgid="9164284529291439296">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎Model‎‏‎‎‏‎"</string>
+    <string name="device_mode" msgid="7258350575590118152">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‏‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‎‎Device Mode‎‏‎‎‏‎"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‏‎‏‎‎‎‎‎‏‎‏‏‎‎‎‎‏‏‎‏‏‏‎‎‏‏‎‎‏‎‏‏‏‏‎‎‎‎‏‏‏‏‎‏‏‎‎‎Store Demo‎‏‎‎‏‎"</string>
     <string name="about_version" msgid="6223547403835399861">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‎‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‎Android TV OS version‎‏‎‎‏‎"</string>
     <string name="about_serial" msgid="3432319328808745459">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎Serial number‎‏‎‎‏‎"</string>
     <string name="about_build" msgid="8467840394761634575">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‎‎‎‏‏‏‏‎Android TV OS build‎‏‎‎‏‎"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‎‏‎‎‎‎‏‎‏‎‏‏‎‎‏‏‏‎‎‏‎‏‎Internet connection‎‏‎‎‏‎"</string>
     <string name="connected" msgid="4981532275162345997">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‎‎‏‏‎‎‎‏‏‏‏‏‎‎‏‎‎‎‎‎‏‏‎‏‎Connected‎‏‎‎‏‎"</string>
     <string name="not_connected" msgid="475810896484271663">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‏‏‏‎Not connected‎‏‎‎‏‎"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‎‏‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‏‎‎‎‎‎No Internet‎‏‎‎‏‎"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‏‏‏‎‎‏‎‏‎‏‎Saved‎‏‎‎‏‎"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‏‎‏‎‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‎‎Wrong password‎‏‎‎‏‎"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‎‏‏‎‎‎‏‏‏‎‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎‎‎‎‎‎‎‏‎Wi-Fi password is too short‎‏‎‎‏‎"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‎‎‏‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‎‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‏‎‏‎‎‏‎‎‏‎Sign-in required‎‏‎‎‏‎"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‎‎‎‎‎‏‎‎‏‎‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‎Other options‎‏‎‎‏‎"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‎‏‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‏‏‎See all‎‏‎‎‏‎"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‏‎‏‏‎See fewer‎‏‎‎‏‎"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‏‏‎‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎Customize restrictions‎‏‎‎‏‎"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‏‎‎‎‏‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‎One moment…‎‏‎‎‏‎"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎Change pin‎‏‎‎‏‎"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‎‏‏‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‎‎‏‎Create restricted profile?‎‏‎‎‏‎"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‎‎‏‎‎‏‏‏‏‏‎‎‎‎Already Created‎‏‎‎‏‎"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‎‏‎‎‏‏‏‎‎‎‏‏‎‎‏‎‎‏‎‎‏‎‎‎‎‏‎‏‏‏‎‎‏‎Skip‎‏‎‎‏‎"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‎‏‎‏‏‎‏‎‏‏‎‏‏‎‏‏‏‎‏‏‏‎Create PIN‎‏‎‎‏‎"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‏‎Enter restricted profile?‎‏‎‎‏‎"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎‏‏‎‏‎‏‎‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎No restricted profile‎‏‎‎‏‎"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‎Already entered‎‏‎‎‏‎"</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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‎‎‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‎‎‎This app can access your accounts. Controlled by ‎‏‎‎‏‏‎<xliff:g id="APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‎‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‏‏‏‎‎‎‎‎‎‎‎Enter PIN to watch this channel‎‏‎‎‏‎"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‏‎‎‎‎‎‎‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎Recorded microphone(s)‎‏‎‎‏‎"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎Failed to start recording audio.‎‏‎‎‏‎"</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‎‏‎‎‏‎Audio recording failed.‎‏‎‎‏‎"</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‏‏‎‎‏‎‏‏‎‎‎‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‎‎‎‎‏‎‏‎‏‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‎‎Data Saver‎‏‎‎‏‎"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎Automatically adjust video quality to use less mobile data‎‏‎‎‏‎"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎Data usage and alerts‎‏‎‎‏‎"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‏‎‎‎‎‎‎‏‏‏‎‎‎‎‎‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‏‎You can connect to the internet with Wi-Fi, Ethernet, or your phone\'s hotspot.‎‏‎‎‏‎"</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‎‏‎‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎Make visible to other Bluetooth devices?‎‏‎‎‏‎"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‏‏‎‎‏‎‏‎‏‎‏‎‏‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎An app wants to make your TV visible to other Bluetooth devices for ‎‏‎‎‏‏‎<xliff:g id="TIMEOUT">%1$d</xliff:g>‎‏‎‎‏‏‏‎ seconds.‎‏‎‎‏‎"</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‎‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‎‏‏‎‎‏‎‎‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‎‎‏‎These settings affect the device when 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_mode_eco_hint" msgid="5280058011809503514">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‏‏‎‏‎‎‎‏‎‎‎‏‏‎‎‏‎‎‏‎‏‏‎‏‎‏‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎‎‏‎‎‎‏‏‎‏‎‎Power consumption may increase with the number of TV features you enable.‎‏‎‎‏‎"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‎‏‎Enable \"‎‏‎‎‏‏‎<xliff:g id="ENERGYMODENAME">%s</xliff:g>‎‏‎‎‏‏‏‎\"‎‏‎‎‏‎"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‏‏‎‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‏‏‏‎‏‏‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎‎‎‎‎‎‎Find my remote‎‏‎‎‏‎"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‎‏‎‎‎‏‏‎‎‏‏‎‎‎‎‎‎‏‎‎‎‎‎‎‎‏‎‎Play a sound to locate your Google TV remote if it\'s misplaced‎‏‎‎‏‎"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‎‎‎‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎Press the button at the back of your Google TV to play a sound on your remote for 30 seconds. This only works with supported Google TV remote controls.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To stop the sound, press any button on your remote.‎‏‎‎‏‎"</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‏‏‎There is a button on your Google TV that you can push to play a sound on your remote for 30 seconds. This only works with supported Google TV remote controls.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To stop the sound, press any button on your remote.‎‏‎‎‏‎"</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‎‏‎‎‏‏‎‎‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎‎‏‎‏‏‎‎When Find my remote is enabled, you can play a sound to locate your Google TV remote if it\'s misplaced.‎‏‎‎‏‎"</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‏‎‎‏‏‎‎‎‏‏‎‎‎‎‎‏‎‏‏‎‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‎‏‎‏‎‏‎‎‎Play sound‎‏‎‎‏‎"</string>
 </resources>
diff --git a/Settings/res/values-es-rUS/energy-modes.xml b/Settings/res/values-es-rUS/energy-modes.xml
index c386d1a..bff8ecb 100644
--- a/Settings/res/values-es-rUS/energy-modes.xml
+++ b/Settings/res/values-es-rUS/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Modo de bajo consumo"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"con funciones de red esenciales"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Desactiva la conexión de red cuando la TV no esté en uso (modo en espera)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Bajo"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"En espera"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"En espera: La conexión de red está desactivada cuando la TV no está en uso"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Funciones y actualizaciones importantes"</item>
+    <item msgid="4002284890471636101">"[Insertar función 1]"</item>
+    <item msgid="7072772341455731040">"[Insertar función 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Modo de consumo optimizado"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"con funciones de red recomendadas"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Permite que las funciones activen la TV cuando está conectada a la red (en espera en red)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Todas las funciones esenciales"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimizado"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"En espera en red"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"En espera en red: Habilita funciones para activar la TV a través de la 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="6636328986387241066">"Modo de alto consumo"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"con funciones de red adicionales"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Permite funciones adicionales cuando la TV no está en uso."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Funciones recomendadas (todas)"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Alto"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Siempre conectadas"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Siempre conectadas: Habilita las funciones de red cuando la TV no está en uso"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insertar función 1]"</item>
     <item msgid="170760143032597722">"[Insertar función 2]"</item>
diff --git a/Settings/res/values-es-rUS/strings.xml b/Settings/res/values-es-rUS/strings.xml
index 11b016d..c156d94 100644
--- a/Settings/res/values-es-rUS/strings.xml
+++ b/Settings/res/values-es-rUS/strings.xml
@@ -148,12 +148,12 @@
     <string name="surround_sound_disabled_format_info_clicked" msgid="463393349034930031">"Para poder habilitarlo, cambia la selección de formato a manual."</string>
     <string name="surround_sound_enabled_format_info_clicked" msgid="4003154853054756792">"Para poder inhabilitarlo, cambia la selección de formato a fin de que sea manual."</string>
     <string name="display_category_title" msgid="247804007525046312">"Pantalla"</string>
-    <string name="advanced_display_settings_title" msgid="6293280819870140631">"Configuración de pantalla avanzada"</string>
+    <string name="advanced_display_settings_title" msgid="6293280819870140631">"Configuración avanzada de pantalla"</string>
     <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 que aparezca 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="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 que aparezca una pantalla negra durante el cambio de formato.\n\nHaz clic en Configuración avanzada de 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">"Deja que el sistema se ocupe de la conversión del formato"</string>
@@ -170,15 +170,15 @@
     <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_dv_summary" msgid="1052851029985095562">"Si la opción Dolby Vision está desactivada en formatos HDR en la Configuración avanzada de pantalla, 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_hdr10_summary" msgid="7784573527636502784">"Si la opción HDR10 está desactivada en formatos HDR en la Configuración avanzada de pantalla, 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_hlg_summary" msgid="5371949016689544001">"Si la opción HLG está desactivada en formatos HDR en la Configuración avanzada de pantalla, 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_hdr10plus_summary" msgid="918038386222537401">"Si la opción HDR10+ está desactivada en formatos HDR en la Configuración avanzada de pantalla, 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="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 avanzada de pantalla."</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_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>
@@ -218,7 +218,7 @@
     <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_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision no es compatible en %1$s, por lo que se desactivará en \"Configuración  avanzada de pantalla\""</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_dialog_cancel" msgid="3683616572317946129">"Cancelar"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Aceptar"</string>
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Avisos legales de Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Los datos de licencia no están disponibles."</string>
     <string name="about_model" msgid="9164284529291439296">"Modelo"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Modo de dispositivo"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Modo de demostración para tiendas"</string>
     <string name="about_version" msgid="6223547403835399861">"Versión del SO de Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Número de serie"</string>
     <string name="about_build" msgid="8467840394761634575">"Compilación del SO de Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Conexión a Internet"</string>
     <string name="connected" msgid="4981532275162345997">"Conectado"</string>
     <string name="not_connected" msgid="475810896484271663">"Desconectado"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"No hay conexión a Internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Guardada"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Contraseña incorrecta"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"La contraseña de Wi-Fi es demasiado corta"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Debes acceder"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Otras opciones"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Ver todas"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Ver menos"</string>
@@ -641,7 +648,7 @@
     <string name="mic_toggle_info_title" msgid="1086545614315873599">"Acceso al micrófono: <xliff:g id="SENSOR_STATE">%s</xliff:g>"</string>
     <string name="mic_toggle_info_content" msgid="3187791167208947239">"Cuando esté activado, todas las apps y servicios que puedan utilizar el micrófono podrán acceder a él.\n\nSi se desactiva, las apps y los servicios no podrán acceder al micrófono. Sin embargo, es posible que puedas seguir hablando con Asistente de Google si presionas el botón del Asistente en el control remoto.\n\nLos dispositivos de audio que utilizan protocolos personalizados para comunicarse con la TV pueden no verse afectados por esta configuración."</string>
     <string name="mic_remote_toggle_on_info_title" msgid="8503441878870972046">"Se habilitó el micrófono en el control remoto"</string>
-    <string name="mic_remote_toggle_on_info_content" msgid="2715872916376493679">"Asistente de Google puede acceder al micrófono en el control remoto. Si presionas el botón del Asistente de Google en el control remoto, podrás hablar con Asistente."</string>
+    <string name="mic_remote_toggle_on_info_content" msgid="2715872916376493679">"El Asistente de Google puede acceder al micrófono en el control remoto. Si presionas el botón del Asistente de Google en el control remoto, podrás hablar con el Asistente."</string>
     <string name="mic_remote_toggle_off_info_title" msgid="4902909833546393713">"El micrófono está inhabilitado en el control remoto"</string>
     <string name="mic_remote_toggle_off_info_content" msgid="8062526350553191004">"No podrás hablar con Asistente de Google desde el control remoto. Para poder usar el botón del Asistente de Google, habilita el acceso al micrófono."</string>
     <string name="camera_toggle_info_title" msgid="3871317082313736088">"Acceso a la cámara: <xliff:g id="SENSOR_STATE">%s</xliff:g>"</string>
@@ -750,7 +757,7 @@
     <string name="system_accessibility_tts_engine_config" msgid="4757760652785865532">"Configuración del motor"</string>
     <string name="system_speak_passwords" msgid="8556036524146404052">"Decir contraseñas"</string>
     <string name="system_preferred_engine" msgid="3545505072652708443">"Motor preferido"</string>
-    <string name="system_speech_rate" msgid="6553204071403872669">"Velocidad de voz"</string>
+    <string name="system_speech_rate" msgid="6553204071403872669">"Velocidad de habla"</string>
     <string name="system_play_sample" msgid="3934369914309865584">"Reproducir una muestra"</string>
     <string name="system_install_voice_data" msgid="8016395777968958673">"Instalar datos de voz"</string>
     <string name="system_general" msgid="687760148454147771">"General"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Personalizar restricciones"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Un momento…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Cambiar PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"¿Crear perfil restringido?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Ya creado"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Omitir"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Crear PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"¿Acceder a perfil restringido?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Sin perfiles restringidos"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Ya se ingresó"</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">"Esta app puede acceder a tus cuentas. Controlada por <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Ingresa el PIN para mirar este canal"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Micrófono(s) de grabación"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"No se pudo iniciar la grabación de audio."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Error de grabación de audio"</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Ahorro de datos"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Ajustar automáticamente la calidad de video para usar menos datos móviles"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Uso de datos y alertas"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Puedes conectarte a Internet con una red Wi-Fi, Ethernet o el hotspot del teléfono."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"¿Quieres permitir que otros dispositivos Bluetooth lo detecten?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Una app quiere hacer visible tu TV para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Estos parámetros de configuración afectan al dispositivo cuando 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_mode_eco_hint" msgid="5280058011809503514">"El consumo de energía podría aumentar con la cantidad de funciones de TV que habilites."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Habilitar \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Buscar mi control remoto"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Reproduce un sonido para ubicar el control remoto de Google TV si se pierde"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Presiona el botón de la parte posterior de tu Google TV para reproducir un sonido en el control remoto durante 30 segundos. Esta acción solo funciona en controles remotos de Google TV compatibles.\n\nPara detener el sonido, presiona cualquier botón del control remoto."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"En tu Google TV, puedes encontrar un botón y usarlo para reproducir un sonido en el control remoto por 30 segundos. Esta acción solo funciona en controles remotos de Google TV compatibles.\n\nPara detener el sonido, presiona cualquier botón del control remoto."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Si habilitas Buscar mi control remoto, podrás reproducir un sonido para ubicar el control remoto de Google TV."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Reproducir sonido"</string>
 </resources>
diff --git a/Settings/res/values-es/energy-modes.xml b/Settings/res/values-es/energy-modes.xml
index f704e23..f250caf 100644
--- a/Settings/res/values-es/energy-modes.xml
+++ b/Settings/res/values-es/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Modo de bajo consumo"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"con funciones de red básicas"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Desactiva la conexión de red cuando no se está usando la televisión (modo Inactivo)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Bajo"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Inactivo"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Inactivo: la conexión de red está desactivada cuando la TV no se está usando"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Actualizaciones y funciones críticas"</item>
+    <item msgid="4002284890471636101">"[Insertar función 1]"</item>
+    <item msgid="7072772341455731040">"[Insertar función 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Modo de consumo optimizado"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"con funciones de red recomendadas"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Permite que las funciones activen la televisión a través de la red (modo Inactivo con conexión a red)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Todas las funciones esenciales"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimizado"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Inactivo con conexión a red"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Inactivo con conexión a red: habilita funciones que activan la TV a través de la 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="6636328986387241066">"Modo de alto consumo"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"con funciones de red adicionales"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Permite funciones extra aun cuando no se esté usando la televisión."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Todas las funciones recomendadas"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Alto"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Conexión permanente"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Conexión permanente: habilita las funciones de red cuando la TV no se está usando"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-es/strings.xml b/Settings/res/values-es/strings.xml
index 86e74c1..ce3091a 100644
--- a/Settings/res/values-es/strings.xml
+++ b/Settings/res/values-es/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Términos de Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Los datos de licencia no están disponibles"</string>
     <string name="about_model" msgid="9164284529291439296">"Modelo"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Modo Dispositivo"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Demo de tienda"</string>
     <string name="about_version" msgid="6223547403835399861">"Versión del SO de Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Número de serie"</string>
     <string name="about_build" msgid="8467840394761634575">"Compilación del SO de Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Conexión a Internet"</string>
     <string name="connected" msgid="4981532275162345997">"Conectado"</string>
     <string name="not_connected" msgid="475810896484271663">"No conectado"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Sin conexión a Internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Guardada"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Contraseña incorrecta"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"La contraseña de la red Wi-Fi es demasiado corta"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Es necesario iniciar sesión"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Otras opciones"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Ver todo"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Ver menos"</string>
@@ -897,11 +904,18 @@
     <string name="restricted_profile_create_title" msgid="700322590579894058">"Crear perfil restringido"</string>
     <string name="restricted_profile_configure_title" msgid="3327502517511010296">"Ajustes"</string>
     <string name="restricted_profile_configure_apps_title" msgid="2244201859522056827">"Aplicaciones permitidas"</string>
-    <string name="restricted_profile_allowed" msgid="970921490464867884">"Permitido"</string>
+    <string name="restricted_profile_allowed" msgid="970921490464867884">"Permitidas"</string>
     <string name="restricted_profile_not_allowed" msgid="8184983064118036268">"No permitido"</string>
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Personalizar restricciones"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Un momento…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Cambiar PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"¿Crear perfil restringido?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Ya se ha creado"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Saltar"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Crear PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"¿Acceder a perfil restringido?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Sin perfiles restringidos"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Ya se ha accedido"</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">"Esta aplicación puede acceder a tus cuentas. Controladas por <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Introduce el PIN para ver este canal"</string>
@@ -989,7 +1003,7 @@
   <string-array name="rooms">
     <item msgid="6590829789532602097">"Android TV"</item>
     <item msgid="1140506340411482365">"TV del salón"</item>
-    <item msgid="6448060889026244632">"Televisor de la sala de estar"</item>
+    <item msgid="6448060889026244632">"TV de la sala de estar"</item>
     <item msgid="3336274213215419228">"TV del dormitorio"</item>
   </string-array>
     <string name="custom_room" msgid="6798144004583173563">"Introduce un nombre personalizado…"</string>
@@ -1012,7 +1026,7 @@
     <string name="capturing_bugreport" msgid="832512801903486821">"Capturando informe de errores"</string>
     <string name="available_virtual_keyboard_category" msgid="7445262027711560629">"Teclados virtuales disponibles"</string>
     <string name="manage_keyboards" msgid="7983890675377321912">"Gestionar teclados"</string>
-    <string name="app_permission_summary_allowed" msgid="5359622119044147500">"Permitido"</string>
+    <string name="app_permission_summary_allowed" msgid="5359622119044147500">"Permitidas"</string>
     <string name="app_permission_summary_not_allowed" msgid="5131611341738385303">"No permitido"</string>
     <string name="usage_access" msgid="8402350645248312782">"Acceso a datos de uso"</string>
     <string name="usage_access_description" msgid="3276026988575551587">"El acceso a los datos de uso permite que una aplicación controle qué otras aplicaciones utilizas y con qué frecuencia, así como tu operador, los ajustes de idioma y otros detalles."</string>
@@ -1044,7 +1058,7 @@
     <string name="picture_in_picture_app_detail_switch" msgid="3688997906817583854">"Permitir imagen en imagen"</string>
     <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="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 sigan 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="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>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Micrófonos de la grabación"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"No se ha podido empezar a grabar el audio."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"No se ha podido grabar el audio."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Ahorro de datos"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Ajustar automáticamente la calidad de vídeo para usar menos datos móviles"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Uso de datos y alertas"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Puedes conectarte a Internet a través de una red Wi‑Fi, de un cable Ethernet o del punto de acceso de tu teléfono."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"¿Ser visible para otros dispositivos Bluetooth?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Una aplicación quiere hacer visible tu televisión para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Estos ajustes afectan al dispositivo cuando no se está usando"</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_mode_eco_hint" msgid="5280058011809503514">"El consumo de energía puede aumentar con el número de funciones de la TV que habilites."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Habilitar <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Encontrar mi mando a distancia"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Reproduce un sonido para localizar el mando a distancia de Google TV si no sabes dónde está"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Pulsa el botón de la parte posterior de tu Google TV para reproducir un sonido en el mando a distancia durante 30 segundos. Solo funciona con mandos de Google TV compatibles.\n\nPara detener el sonido, pulsa cualquier botón del mando a distancia."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Hay un botón en tu Google TV que puedes pulsar para reproducir un sonido en tu mando a distancia durante 30 segundos. Solo funciona con mandos de Google TV compatibles.\n\nPara detener el sonido, pulsa cualquier botón del mando a distancia."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Cuando la opción Encontrar mi mando a distancia está activada, puedes reproducir un sonido para localizar el mando a distancia de Google TV si no sabes dónde está."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Reproducir sonido"</string>
 </resources>
diff --git a/Settings/res/values-et/energy-modes.xml b/Settings/res/values-et/energy-modes.xml
index 85c19d9..05d9d43 100644
--- a/Settings/res/values-et/energy-modes.xml
+++ b/Settings/res/values-et/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Madala energiatasemega režiim"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"oluliste võrgufunktsioonidega"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Lülitab võrguühenduse välja, kui telerit ei ‏kas‏utata (ooterežiim)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Väike"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Ooterežiim"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Ooterežiim – kui telerit ei kasutata, on võrguühendus katkestatud"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Kriitilised värskendused ja funktsioonid"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Optimeeritud energiarežiim"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"soovitatud võrgufunktsioonidega"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Võimaldab funktsioonidel telerit võrgu kaudu äratada (võrguühendusega ooterežiim)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Kõik põhifunktsioonid"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimeeritud"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Võrguühendusega ooterežiim"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Võrguühendusega ooterežiim – lubab funktsioonidel teleri võrguühenduse kaudu äratada"</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="6636328986387241066">"Suurenenud energiataseme režiim"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"võrgu lisafunktsioonidega"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Võimaldab lisafunktsioone isegi siis, kui telerit ei kasutata."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Kõik soovitatud funktsioonid"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Suurenenud"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Alati ühenduses"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Alati ühendatud – lubab võrgufunktsioonid, kui telerit ei kasutata"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-et/strings.xml b/Settings/res/values-et/strings.xml
index 77dd5a5..971237c 100644
--- a/Settings/res/values-et/strings.xml
+++ b/Settings/res/values-et/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google\'i juriidiline teave"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Litsentsiandmed pole saadaval"</string>
     <string name="about_model" msgid="9164284529291439296">"Mudel"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Seadmerežiim"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Poedemo"</string>
     <string name="about_version" msgid="6223547403835399861">"Android TV OS-i versioon"</string>
     <string name="about_serial" msgid="3432319328808745459">"Seerianumber"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV OS-i järk"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Interneti-ühendus"</string>
     <string name="connected" msgid="4981532275162345997">"Ühendatud"</string>
     <string name="not_connected" msgid="475810896484271663">"Ühendus puudub"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Internetiühendus puudub"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Salvestatud"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Vale parool"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"WiFi-võrgu parool on liiga lühike"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Peate sisse logima"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Muud valikud"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Kuva kõik"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Kuva vähem"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Piirangute kohandamine"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Üks hetk ..."</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"PIN-koodi muutmine"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Kas luua piirangutega profiil?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Juba loodud"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Jäta vahele"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Looge PIN-kood"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Kas sis. piirangutega profiil?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Piirangutega profiili pole"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Juba sisestatud"</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">"Sellel rakendusel on juurdepääs teie kontodele. Seda juhib rakendus <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Kanali vaatamiseks sisestage PIN-kood"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Salvestatud mikrofon(id)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Heli salvestamise alustamine ebaõnnestus."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Heli salvestamine ebaõnnestus."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Andmemahu säästja"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Videokvaliteedi automaatne kohandamine, et kasutada vähem mobiilset andmesidet"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Andmekasutus ja hoiatused"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Saate internetiga ühenduse luua WiFi-võrgu, Etherneti või telefoni kuumkoha kaudu."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Kas muuta seade teistele Bluetooth-seadmetele nähtavaks?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Rakendus soovib <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks teie teleri teistele Bluetoothi seadmetele nähtavaks muuta."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Need seaded mõjutavad seadet, kui seda 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_mode_eco_hint" msgid="5280058011809503514">"Energiatarbimine võib suureneda olenevalt sellest, kui palju teleri funktsioone lubate."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Luba režiim „<xliff:g id="ENERGYMODENAME">%s</xliff:g>”"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Leia mu pult"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Esitage heli, et leida oma kaotsiläinud Google TV pult"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Vajutage Google TV tagaküljel olevat nuppu, et esitada puldil 30-sekundiline heli. See töötab ainult toetatud Google TV kaugjuhtimispultidega.\n\nHeli peatamiseks vajutage puldil mõnda nuppu."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Teie Google TV-l on nupp, mida vajutades saate puldil 30 sekundi vältel heli esitada. See töötab ainult toetatud Google TV kaugjuhtimispultidega.\n\nHeli peatamiseks vajutage puldil mõnda nuppu."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Kui funktsioon Leia mu pult on lubatud, saate esitada heli, et kaotsiläinud Google TV pult üles leida."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Esita heli"</string>
 </resources>
diff --git a/Settings/res/values-eu/energy-modes.xml b/Settings/res/values-eu/energy-modes.xml
index 672b196..58725ba 100644
--- a/Settings/res/values-eu/energy-modes.xml
+++ b/Settings/res/values-eu/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Energia-kontsumo baxuko modua"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"sarearen funtsezko eginbideekin"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Desaktibatu sareko konexioa telebista erabiltzen ari ez zarenean (egonean modua)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Baxua"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Egonean"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Egonean: sareko konexioa desaktibatuta dago telebista erabiltzen ez denean"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"eguneratze eta funtzio garrantzitsuak"</item>
+    <item msgid="4002284890471636101">"[Gehitu 1. eginbidea]"</item>
+    <item msgid="7072772341455731040">"[Gehitu 2. eginbidea]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Energia-kontsumo optimizatuko modua"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"sarearen eginbide gomendatuekin"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Sarearen bidez (sare bidezko egonean modua) telebista aktibatzen duten eginbideak ahalbidetzen ditu."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Ezinbesteko eginbide guztiak"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimizatuta"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Sare-konexio bidezko egonean modua"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Sare-konexio bidezko egonean modua: telebista sarearen bidez aktibatzeko eginbideak gaitzen ditu"</string>
   <string-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Gehitu lehenengo eginbidea]"</item>
     <item msgid="8724721267222341891">"[Gehitu bigarren eginbidea]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="6636328986387241066">"Energia-kontsumo altuko modua"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"sarearen eginbide gehigarriekin"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Eginbide gehigarriak ahalbidetzen ditu, nahiz eta telebista erabiltzen ez ari."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"gomendatutako eginbide guztiak"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Areagotua"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Beti konektatuta"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Beti konektatuta: telebista erabiltzen ez denean sareko eginbideak gaitzen ditu"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Gehitu lehenengo eginbidea]"</item>
     <item msgid="170760143032597722">"[Gehitu bigarren eginbidea]"</item>
diff --git a/Settings/res/values-eu/strings.xml b/Settings/res/values-eu/strings.xml
index 614e8f0..a341eff 100644
--- a/Settings/res/values-eu/strings.xml
+++ b/Settings/res/values-eu/strings.xml
@@ -84,7 +84,7 @@
     <string name="connectivity_ethernet" msgid="4270588618633681766">"Etherneta"</string>
     <string name="connectivity_summary_ethernet_connected" msgid="2612843587731520061">"Ethernet bidez konektatu da"</string>
     <string name="connectivity_summary_no_network_connected" msgid="6111160695454212460">"Ez dago konektatuta sarerik"</string>
-    <string name="connectivity_summary_wifi_disabled" msgid="7819225159680467324">"Desaktibatuta dago Wi-Fi konexioa"</string>
+    <string name="connectivity_summary_wifi_disabled" msgid="7819225159680467324">"Desaktibatuta dago wifi-konexioa"</string>
     <string name="wifi_setting_always_scan" msgid="431846292711998602">"Bilaketa beti erabilgarri"</string>
     <string name="wifi_setting_always_scan_context" msgid="1092998659666221222">"Utzi Google-ren kokapen-zerbitzuari eta beste aplikazioei sareak bilatzen, wifi-konexioa desaktibatuta egon arren"</string>
     <string name="wifi_setting_always_scan_content_description" msgid="484630053450137332">"Bilaketa beti erabilgarri: utzi Google-ren kokapen-zerbitzuari eta beste aplikazioei sareak bilatzen, wifi-konexioa desaktibatuta egon arren."</string>
@@ -250,7 +250,7 @@
     <string name="bluetooth_incoming_pairing_msg" msgid="8587851808387685613">"Igorlea: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;Gailu honekin parekatu nahi duzu?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="6934651048757228432">"Gailu honekin parekatzeko: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;Idatzi hau bertan: &lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;Ondoren, sakatu Itzuli edo Sartu."</string>
     <string name="bluetooth_enter_pin_msg" msgid="8905524093007140634">"Gailu honekin parekatzeko: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, &lt;br&gt;Idatzi gailuaren PINa:"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="889584097447402492">"Honekin parekatzeko: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, &lt;br&gt;Idatzi gailuaren derrigorrezko pasakodea:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="889584097447402492">"Honekin parekatzeko: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, &lt;br&gt;Idatzi gailuaren nahitaezko pasakodea:"</string>
     <string name="bluetooth_pin_values_hint" msgid="6237371515577342950">"0000 edo 1234 izan ohi da"</string>
     <string name="bluetooth_pair" msgid="2410285813728786067">"Parekatu"</string>
     <string name="bluetooth_cancel" msgid="4415185529332987034">"Utzi"</string>
@@ -288,7 +288,7 @@
     <string name="system_keyboard" msgid="1514460705385401872">"Teklatua"</string>
     <string name="system_keyboard_autofill" msgid="8530944165814838255">"Teklatua eta betetze automatikoa"</string>
     <string name="system_autofill" msgid="6983989261108020046">"Betetze automatikoa"</string>
-    <string name="system_home" msgid="2149349845791104094">"Hasierako pantaila"</string>
+    <string name="system_home" msgid="2149349845791104094">"Orri nagusia"</string>
     <string name="system_search" msgid="3170169128257586925">"Bilatu"</string>
     <string name="system_google" msgid="945985164023885276">"Google"</string>
     <string name="system_security" msgid="1012999639810957132">"Segurtasuna eta murrizketak"</string>
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google-ren lege-oharrak"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Lizentziaren datuak ez daude erabilgarri"</string>
     <string name="about_model" msgid="9164284529291439296">"Modeloa"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Gailu modua"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Dendako demo-bertsioa"</string>
     <string name="about_version" msgid="6223547403835399861">"Android TV-ren sistema eragilearen bertsioa"</string>
     <string name="about_serial" msgid="3432319328808745459">"Serie-zenbakia"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV-ren sistema eragilearen konpilazioa"</string>
@@ -397,7 +399,7 @@
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="5634005787486307657">"Ezin da erabili operadore bakarra erabil dezaketen gailuetan"</string>
     <string name="oem_lock_info_message" msgid="2165887409937351689">"Gailua babesteko eginbidea gaitzeko, berrabiarazi gailua."</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="1654574152815129396">"Guztira, <xliff:g id="SIZE">%1$s</xliff:g> utzi dira libre.\n\nAzken exekuzio-data: <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="fcc_equipment_id" msgid="6731077083927000108">"Ekipoaren IDa"</string>
+    <string name="fcc_equipment_id" msgid="6731077083927000108">"Ekipo-identifikatzailea"</string>
     <string name="baseband_version" msgid="5618116741093274294">"Oinarri-bandaren bertsioa"</string>
     <string name="kernel_version" msgid="7265509054070001542">"Kernel bertsioa"</string>
     <string name="status_unavailable" msgid="2033933928980193334">"Ez dago erabilgarri"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Interneteko konexioa"</string>
     <string name="connected" msgid="4981532275162345997">"Konektatuta"</string>
     <string name="not_connected" msgid="475810896484271663">"Konektatu gabe"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Ez dago Interneteko konexiorik"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Gordetakoak"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Pasahitza ez da zuzena"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wifi-sareko pasahitza laburregia da"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Saioa hasi behar da"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Beste aukera batzuk"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Ikusi guztiak"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Ikusi gutxiago"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Murrizketa pertsonalizatuak"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Unetxo bat…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Aldatu PINa"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Profil murriztua sortu nahi duzu?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Sortu da jada"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Saltatu"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Sortu PINa"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Profil murriztua sartu nahi duzu?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Ez dago profil murrizturik"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Sartu da jada"</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">"Aplikazio honek zure kontuak atzi ditzake. <xliff:g id="APP">%1$s</xliff:g> aplikazioak kontrolatzen du."</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Kanal hau ikusi nahi baduzu, idatzi PINa."</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Grabatutako mikrofonoak"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Ezin izan da hasi audioa grabatzen."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Ezin izan da grabatu audioa."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Datu-aurreztailea"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Doitu automatikoki bideoen kalitatea datu-konexioa gutxiago erabiltzeko"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Datu-konexioaren erabilera eta alertak"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Wifi edo Ethernet bidez, nahiz telefonoaren konexioa partekatuta konekta zaitezke Internetera."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Bluetooth bidezko beste gailu batzuen aurrean ikusgai egotea nahi duzu?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Aplikazio batek telebista Bluetooth bidezko beste gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%1$d</xliff:g> segundoz."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Ezarpen horiek gailua erabiltzen ari ez denean izango dute eragina"</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_mode_eco_hint" msgid="5280058011809503514">"Telebistan gaitzen duzun eginbide kopuruaren arabera, baliteke energia-kontsumoa areagotzea."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Gaitu <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Bilatu urruneko kontrolagailua"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Erreproduzitu soinu bat Google TV-ren urruneko kontrolagailua aurkitzeko hura galtzen baduzu"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Sakatu Google TV-ren atzealdeko botoia, urruneko kontrolagailuan 30 segundoz soinu bat erreproduzitzeko. Google TV-ren urruneko kontrolagailu bateragarriekin soilik funtzionatzen du horrek.\n\nSoinua erreproduzitzeari uzteko, sakatu urruneko kontrolagailuaren edozein botoi."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Google TV-ak daukan botoi jakin bat sakatzen baduzu, urruneko kontrolagailuan soinu bat erreproduzituko da 30 segundoz. Google TV-ren urruneko kontrolagailu bateragarriekin soilik funtzionatzen du horrek.\n\nSoinua erreproduzitzeari uzteko, sakatu urruneko kontrolagailuaren edozein botoi."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"\"Bilatu urruneko kontrolagailua\" gaituta dagoenean, soinu bat erreproduzi dezakezu Google TV-ren urruneko kontrolagailua aurkitzeko, betiko tokian ez badago."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Erreproduzitu soinua"</string>
 </resources>
diff --git a/Settings/res/values-fa/energy-modes.xml b/Settings/res/values-fa/energy-modes.xml
index 317272a..5545750 100644
--- a/Settings/res/values-fa/energy-modes.xml
+++ b/Settings/res/values-fa/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"حالت کم‌انرژی"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"با ویژگی‌های ضروری شبکه"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"وقتی از تلویزیون استفاده نمی‌شود (درحالت آماده‌به‌کار باشد) اتصال شبکه خاموش می‌شود."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"کم"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"آماده‌به‌کار"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"آماده‌به‌کار — هنگام عدم استفاده از تلویزیون، اتصال شبکه را خاموش می‌کند"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"عملکردها و به‌روزرسانی‌های بسیار مهم"</item>
+    <item msgid="4002284890471636101">"[درج ویژگی ۱]"</item>
+    <item msgid="7072772341455731040">"[درج ویژگی ۲]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"حالت انرژی بهینه‌سازی‌شده"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"با ویژگی‌های توصیه‌شده شبکه"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"ویژگی‌هایی را مجاز می‌کند که تلویزیون را ازطریق شبکه بیدار می‌کند (حالت آماده‌به‌کار شبکه‌ای)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"همه ویژگی‌های ضروری"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"بهینه‌سازی‌شده"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"آماده‌به‌کار شبکه‌ای"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"آماده‌به‌کار شبکه‌ای — ویژگی‌ها را برای بیدار کردن تلویزیون ازطریق شبکه فعال می‌کند"</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="6636328986387241066">"حالت انرژی افزایش‌یافته"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"با ویژگی‌های اضافی شبکه"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"حتی وقتی از تلویزیون استفاده نمی‌شود، ویژگی‌های بیشتری را امکان‌پذیر می‌کند."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"همه ویژگی‌های توصیه‌شده"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"افزایش‌یافته"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"همیشه متصل"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"همیشه متصل — ویژگی‌های شبکه را هنگام عدم استفاده از تلویزیون فعال می‌کند"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[درج ویژگی ۱]"</item>
     <item msgid="170760143032597722">"[درج ویژگی ۲]"</item>
diff --git a/Settings/res/values-fa/strings.xml b/Settings/res/values-fa/strings.xml
index 55d9784..c5ce4e9 100644
--- a/Settings/res/values-fa/strings.xml
+++ b/Settings/res/values-fa/strings.xml
@@ -129,10 +129,10 @@
     <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_title" msgid="4892922385727913277">"خودکار: فقط قالب‌هایی که دستگاه خروجی صدا از آن‌ها پشتیبانی می‌کند فعال شود "</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_title" msgid="4935447605070985537">"دستی: قالب‌هایی که این دستگاه از آن‌ها پشتیبانی می‌کند به‌صورت انتخابی فعال یا غیرفعال شود، بدون درنظر گرفتن اینکه دستگاه خروجی صوتی از چه قالبی پشتیبانی می‌کند."</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>
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"شرایط حقوقی Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"داده مجوز در دسترس نیست"</string>
     <string name="about_model" msgid="9164284529291439296">"مدل"</string>
+    <string name="device_mode" msgid="7258350575590118152">"حالت دستگاه"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"نسخه نمایشی فروشگاه"</string>
     <string name="about_version" msgid="6223547403835399861">"نسخه «سیستم‌عامل Android TV»"</string>
     <string name="about_serial" msgid="3432319328808745459">"شماره سریال"</string>
     <string name="about_build" msgid="8467840394761634575">"ساخت «سیستم‌عامل Android TV»"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"اتصال اینترنت"</string>
     <string name="connected" msgid="4981532275162345997">"متصل"</string>
     <string name="not_connected" msgid="475810896484271663">"متصل نیست"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"اتصال اینترنت وجود ندارد"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"ذخیره‌شده"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"گذرواژه اشتباه است"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"گذرواژه Wi-Fi خیلی کوتاه است"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"ورود به سیستم الزامی است"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"گزینه‌های دیگر"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"مشاهده همه"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"مشاهده موارد کمتر"</string>
@@ -750,7 +757,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>
@@ -902,6 +909,13 @@
     <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>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"نمایه محدودشده ایجاد شود؟"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"قبلاً ایجاد شده است"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"رد شدن"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"ایجاد پین"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"به نمایه محدودشده وارد شوید؟"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"نمایه محدودشده‌ای وجود ندارد"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"قبلاً وارد شده است"</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="pin_enter_unlock_channel" msgid="243855138978654080">"برای مشاهده این کانال، پین را وارد کنید"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"میکروفون(های) ضبط‌شده"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"ضبط صدا شروع نشد."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"ضبط صدا انجام نشد."</string>
-    <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="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>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"این تنظیمات، هنگام عدم استفاده از دستگاه، بر آن اعمال می‌شود"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"این حالت را فعال می‌کند:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"توجه داشته باشید که ممکن است این حالت مصرف برق دستگاه را افزایش دهد."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"ممکن است باتوجه‌به تعداد ویژگی‌های تلویزیون که فعال می‌کنید، مصرف برق افزایش یابد."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"فعال کردن «<xliff:g id="ENERGYMODENAME">%s</xliff:g>»"</string>
-    <string name="settings_find_my_remote_title" msgid="4586368268611622848">"پیدا کردن کنترل از دور"</string>
+    <string name="settings_find_my_remote_title" msgid="4586368268611622848">"پیدا کردن کنترل از راه دور"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"اگر کنترل از دور Google TV در جای خودش نباشد، برای پیدا کردن آن، صدایی پخش می‌شود"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"دکمه پشت Google TV را فشار دهید تا صدایی به‌مدت ۳۰ ثانیه در کنترل از دور پخش شود. این روش فقط در کنترل از دورهای پشتیبانی‌شده Google TV کار می‌کند.\n\nبرای متوقف کردن صدا، یکی از دکمه‌های روی کنترل از دور را فشار دهید."</string>
-    <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"وقتی «پیدا کردن کنترل از دور» فعال باشد، اگر کنترل از دور Google TV در جای خودش نباشد، می‌توانید با پخش صدا آن را پیدا کنید."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"دکمه‌ای روی Google TV قرار دارد که می‌توانید فشار دهید تا صدایی به‌مدت ۳۰ ثانیه در کنترل از دور پخش شود. این روش فقط در کنترل از دورهای پشتیبانی‌شده Google TV کار می‌کند.\n\nبرای متوقف کردن صدا، یکی از دکمه‌های روی کنترل از دور را فشار دهید."</string>
+    <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"وقتی «پیدا کردن کنترل از راه دور» فعال باشد، اگر کنترل از راه دور Google TV در جای خودش نباشد، می‌توانید با پخش صدا آن را پیدا کنید."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"پخش صدا"</string>
 </resources>
diff --git a/Settings/res/values-fi/energy-modes.xml b/Settings/res/values-fi/energy-modes.xml
index e10aec9..234c093 100644
--- a/Settings/res/values-fi/energy-modes.xml
+++ b/Settings/res/values-fi/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Alhaisen energian"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"tärkeitä verkko-ominaisuuksia"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Katkaise verkkoyhteys, kun TV ei ole käytössä (lepotila)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Pieni"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Virransäästötila"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Virransäästötila — Verkkoyhteys on pois päältä, 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>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Optimoitu energiatila"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"suositeltuja verkko-ominaisuuksia"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Sallii ominaisuudet, jotka aktivoivat TV:n verkon kautta (kauko-ohjattava säästötila)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Tärkeimmät ominaisuudet"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimoitu"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Kauko-ohjattava säästötila"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Kauko-ohjattava säästötila — Ominaisuudet voivat käynnistää TV:n verkon kautta"</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="6636328986387241066">"Tehostettu energiatila"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"lisää verkko-ominaisuuksia"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Sallii lisäominaisuudet, vaikka TV ei ole käytössä."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Suositellut ominaisuudet"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Kasvanut"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Aina yhteydessä"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Aina yhteydessä — Ottaa käyttöön verkko-ominaisuudet, 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>
diff --git a/Settings/res/values-fi/strings.xml b/Settings/res/values-fi/strings.xml
index 327dff6..428b1e5 100644
--- a/Settings/res/values-fi/strings.xml
+++ b/Settings/res/values-fi/strings.xml
@@ -219,7 +219,7 @@
     <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_hdr_description_info" msgid="2408761621976850238">"Tämä tila tukee: %1$s\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_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>
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Googlen lakiasiat"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Käyttölupatietoja ei ole saatavilla"</string>
     <string name="about_model" msgid="9164284529291439296">"Malli"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Laitetila"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Kaupan demo"</string>
     <string name="about_version" msgid="6223547403835399861">"Android TV ‑käyttöjärjestelmän versio"</string>
     <string name="about_serial" msgid="3432319328808745459">"Sarjanumero"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV ‑käyttöjärjestelmän koontiversio"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Internetyhteys"</string>
     <string name="connected" msgid="4981532275162345997">"Yhdistetty"</string>
     <string name="not_connected" msgid="475810896484271663">"Ei yhdistetty"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Ei internetyhteyttä"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Tallennettu"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Väärä salasana"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi-verkon salasana on liian lyhyt"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Kirjautuminen vaaditaan"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Muut vaihtoehdot"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Näytä kaikki"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Näytä vähemmän"</string>
@@ -625,7 +632,7 @@
   </string-array>
     <string name="sensor_toggle_description" msgid="7415801459994303159">"Kaikki sovellukset ja palvelut"</string>
     <string name="recently_accessed_by_category" msgid="6841705864715653428">"Käyttänyt äskettäin:"</string>
-    <string name="no_recent_sensor_accesses" msgid="3498112970658050800">"Ei viimeaikaista käyttöä"</string>
+    <string name="no_recent_sensor_accesses" msgid="3498112970658050800">"Ei viimeaikaista pääsyä"</string>
     <string name="recently_accessed_show_all" msgid="5234849189704717855">"Näytä kaikki"</string>
     <string name="microphone" msgid="7893752847683941214">"Mikrofoni"</string>
     <string name="mic_toggle_title" msgid="7193417007060235665">"Pääsy mikrofoniin"</string>
@@ -672,7 +679,7 @@
     <string name="accessibility_screen_readers_category_title" msgid="7742526514873922018">"Näytönlukuohjelmat"</string>
     <string name="accessibility_display_category_title" msgid="593444602101558017">"Näyttö"</string>
     <string name="accessibility_interaction_controls_category_title" msgid="5290687835178852745">"Laitteen käyttöapu"</string>
-    <string name="accessibility_audio_and_onscreen_text_category_title" msgid="113841605896486212">"Ääni ja näyttöteksti"</string>
+    <string name="accessibility_audio_and_onscreen_text_category_title" msgid="113841605896486212">"Audio ja näyttöteksti"</string>
     <string name="accessibility_experimental_category_title" msgid="3401773834179170206">"Kokeellinen"</string>
     <string name="accessibility_services_category_title" msgid="8813843874978910442">"Palvelut"</string>
     <string name="accessibility_service_settings" msgid="3251334786870932423">"Palveluasetukset"</string>
@@ -700,7 +707,7 @@
     <string name="accessibility_shortcut" msgid="5856158637840030531">"Saavutettavuustilan pikanäppäin"</string>
     <string name="accessibility_shortcut_enable" msgid="6603542432267329986">"Ota saavutettavuustilan pikanäppäin käyttöön"</string>
     <string name="accessibility_shortcut_service" msgid="2053250146891420311">"Pikanäppäinpalvelu"</string>
-    <string name="accessibility_shortcut_description" msgid="2050424178481510046">"Kun pikanäppäin on käytössä, voit käynnistää saavutettavuusominaisuuden pitämällä Takaisin- ja Alas-näppäimiä painettuina kolmen sekunnin ajan."</string>
+    <string name="accessibility_shortcut_description" msgid="2050424178481510046">"Kun pikanäppäin on päällä, voit käynnistää saavutettavuusominaisuuden pitämällä Takaisin- ja Alas-näppäimiä painettuina kolmen sekunnin ajan."</string>
     <string name="accessibility_captions" msgid="3411554568812306549">"Tekstitykset"</string>
     <string name="accessibility_captions_description" msgid="3827820027578548160">"Videon päällä näytettävän tekstityksen asetukset"</string>
     <string name="captions_display" msgid="2598662495450633375">"Näyttö"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Muokkaa rajoituksia"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Hetkinen…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Vaihda PIN-koodi"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Luodaanko rajoitettu profiili?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Luotu aiemmin"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Ohita"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Luo PIN-koodi"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Siirry rajoitettuun profiiliin"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Ei rajoitettua profiilia"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Lisätty aiemmin"</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">"Tämä sovellus voi käyttää tilejäsi. Hallinnoija: <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Anna PIN-koodi, jotta voit katsella tätä kanavaa"</string>
@@ -963,7 +977,7 @@
     <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_sleep_timeout_dialog_title" msgid="6588352532253294558">"Laita pois päältä automaattisesti kun laite on ei-aktiivisena"</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_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>
@@ -996,7 +1010,7 @@
     <string name="device_rename_title" msgid="9070021379000499270">"Anna uusi nimi laitteelle <xliff:g id="DEVICEMODEL">%1$s</xliff:g>"</string>
     <string name="device_rename_description" msgid="1973894029492915135">"<xliff:g id="DEVICEMODEL">%1$s</xliff:g> on tällä hetkellä nimeltään <xliff:g id="DEVICENAME">%2$s</xliff:g>"</string>
     <string name="device_name_suggestion_title" msgid="3986220212759193742">"Anna laitteelle nimi"</string>
-    <string name="device_name_suggestion_summary" msgid="4582691399302362938">"Käytä tätä nimeä kuvien, videoiden ja muun sisällön suoratoistoon puhelimella."</string>
+    <string name="device_name_suggestion_summary" msgid="4582691399302362938">"Käytä tätä nimeä kuvien, videoiden ja muun sisällön striimaamiseen puhelimella"</string>
     <string name="change_setting" msgid="7211706374208138343">"Vaihda"</string>
     <string name="keep_settings" msgid="703474489210093961">"Älä vaihda"</string>
     <string name="apps_permissions" msgid="7876407267050498394">"Luvat"</string>
@@ -1014,15 +1028,15 @@
     <string name="manage_keyboards" msgid="7983890675377321912">"Näppäimistöjen hallinnointi"</string>
     <string name="app_permission_summary_allowed" msgid="5359622119044147500">"Sallittu"</string>
     <string name="app_permission_summary_not_allowed" msgid="5131611341738385303">"Ei sallittu"</string>
-    <string name="usage_access" msgid="8402350645248312782">"Pääsyoikeus käyttötietoihin"</string>
-    <string name="usage_access_description" msgid="3276026988575551587">"Pääsyoikeus käyttötietoihin antaa sovellukselle luvan seurata, mitä muita sovelluksia käytät ja kuinka usein, sekä nähdä operaattorisi, kieliasetuksesi ja muita tietoja."</string>
+    <string name="usage_access" msgid="8402350645248312782">"Pääsy käyttötietoihin"</string>
+    <string name="usage_access_description" msgid="3276026988575551587">"Pääsy käyttötietoihin antaa sovellukselle luvan seurata, mitä muita sovelluksia käytät ja kuinka usein, sekä nähdä operaattorisi, kieliasetuksesi ja muita tietoja."</string>
     <string name="high_power_apps" msgid="5841073958519976562">"Virrankäytön optimointi"</string>
     <string name="high_power_apps_description" msgid="8651692364795060525">"Optimoi sovellusten virrankäyttö"</string>
     <string name="high_power_apps_empty" msgid="3084512758421482051">"Ei optimointia tarvitsevia sovelluksia"</string>
     <string name="high_power_on" msgid="3120162683093360951">"Ei optimoida"</string>
     <string name="high_power_off" msgid="3588854600942236231">"Virrankäyttöä optimoidaan"</string>
     <string name="high_power_system" msgid="6263052626979462255">"Virrankäytön optimointi ei käytettävissä"</string>
-    <string name="manage_notification_access_title" msgid="8659254371564990084">"Pääsyoikeus ilmoituksiin"</string>
+    <string name="manage_notification_access_title" msgid="8659254371564990084">"Pääsy ilmoituksiin"</string>
     <string name="no_notification_listeners" msgid="5119406452675724448">"Yksikään asennettu sovellus ei ole pyytänyt ilmoituksien käyttöoikeutta."</string>
     <string name="notification_listener_security_warning_summary" msgid="8602907284276088658">"Nämä sovellukset voivat lukea kaikki ilmoitukset ja niiden sisältämät henkilökohtaiset tiedot, kuten yhteystietojen nimet ja viestien sisällön. Ne voivat myös hylätä ilmoituksia ja käyttää niiden toimintopainikkeita."</string>
     <string name="default_notification_access_package_summary" msgid="1354775994781420222">"Järjestelmän edellytys"</string>
@@ -1033,7 +1047,7 @@
     <string name="permit_draw_overlay" msgid="5312730681030266735">"Salli näkyminen muiden päällä"</string>
     <string name="allow_overlay_description" msgid="5152329837278240259">"Anna sovelluksen näkyä muiden avoimien sovellusten päällä. Se voi häiritä muiden sovellusten käyttöä tai muuttaa niiden ulkoasua tai käyttäytymistä."</string>
     <string name="write_system_settings" msgid="4284654265954461890">"Järjestelmäasetusten muokkaus"</string>
-    <string name="write_settings_title" msgid="2361816483383105754">"Järjestelmäasetusten muokkaus"</string>
+    <string name="write_settings_title" msgid="2361816483383105754">"Voi muokata järjestelmäasetuksia"</string>
     <string name="write_settings_description" msgid="7382397926674265937">"Tämä käyttöoikeus antaa sovelluksen muokata järjestelmäasetuksia."</string>
     <string name="write_settings_on" msgid="71675710746513956">"Kyllä"</string>
     <string name="write_settings_off" msgid="6730113471695092167">"Ei"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Tallennetut mikrofonit"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Äänen tallennuksen aloittaminen epäonnistui."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Äänen tallennus epäonnistui."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Data Saver"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Säädä videoiden laatua automaattisesti mobiilidatan käytön vähentämiseksi"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Datan käyttö ja ilmoitukset"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Voit yhdistää verkkoon langattomasti, Ethernetillä tai puhelimesi hotspotilla."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Näytetäänkö laite muille Bluetooth-laitteille?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Sovellus haluaa määrittää, että TV:si on muiden Bluetooth-laitteiden löydettävissä <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajan."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Nämä asetukset vaikuttavat laitteeseen, kun se 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_mode_eco_hint" msgid="5280058011809503514">"Virrankulutus voi kasvaa käyttöönotettujen TV-ominaisuuksien myötä."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Ota <xliff:g id="ENERGYMODENAME">%s</xliff:g> käyttöön"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Etsi kaukosäädin"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Jos et löydä Google TV ‑kaukosäädintä, etsi se toistamalla äänimerkki"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Toista ääntä 30 sekunnin ajan painamalla Google TV ‑kaukosäätimen takaosassa olevaa painiketta. Tämä toimii vain tuetuilla Google TV ‑kaukosäätimillä.\n\nLopeta äänen toistaminen painamalla kaukosäätimestä mitä tahansa painiketta."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Google TV:ssä on painike, jota painamalla kaukosäädin toistaa äänen 30 sekunnin ajan. Tämä toimii vain tuetuilla Google TV ‑kaukosäätimillä.\n\nLopeta äänen toistaminen painamalla kaukosäätimestä mitä tahansa painiketta."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Kun Etsi kaukosäätimeni on käytössä, voit etsiä Google TV ‑kaukosäätimen toistamalla äänimerkin."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Toista äänimerkki"</string>
 </resources>
diff --git a/Settings/res/values-fr-rCA/energy-modes.xml b/Settings/res/values-fr-rCA/energy-modes.xml
index 99aa705..8dc06d8 100644
--- a/Settings/res/values-fr-rCA/energy-modes.xml
+++ b/Settings/res/values-fr-rCA/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Mode énergétique faible"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"avec des fonctionnalités de réseau essentielles"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Désactivez la connexion réseau lorsque le téléviseur n\'est pas en cours d\'utilisation (mode Veille)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Faible"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Veille"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Veille – la connexion réseau est désactivée lorsque le téléviseur n\'est pas utilisé"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Mises à jour et fonctionnalités essentielles"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Mode énergétique optimisé"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"avec des fonctionnalités de réseau recommandées"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Permet aux fonctionnalités d\'activer le téléviseur par le biais du réseau (mode Veille en réseau)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Fonctionnalités essentielles"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimisée"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Mode Veille en réseau"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Mode Veille en réseau – active les fonctionnalités permettant d\'activer le téléviseur par l\'intermédiaire du 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="6636328986387241066">"Mode énergétique accru"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"avec des fonctionnalités de réseau supplémentaires"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Permet l\'utilisation de fonctionnalités supplémentaires même lorsque le téléviseur n\'est pas en cours d\'utilisation."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Fonctionnalités recommandées"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Accrue"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Toujours connecté"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Toujours connecté – active les fonctionnalités de réseau lorsque le téléviseur n\'est pas utilisé"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-fr-rCA/strings.xml b/Settings/res/values-fr-rCA/strings.xml
index 1502d85..8a07394 100644
--- a/Settings/res/values-fr-rCA/strings.xml
+++ b/Settings/res/values-fr-rCA/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Renseignements juridiques Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Les données concernant les licences ne sont pas accessibles."</string>
     <string name="about_model" msgid="9164284529291439296">"Modèle"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Mode de l\'appareil"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Démo en magasin"</string>
     <string name="about_version" msgid="6223547403835399861">"Version du SE d\'Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Numéro de série"</string>
     <string name="about_build" msgid="8467840394761634575">"Version d\'Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Connexion Internet"</string>
     <string name="connected" msgid="4981532275162345997">"Connecté"</string>
     <string name="not_connected" msgid="475810896484271663">"Non connecté"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Aucune connexion Internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Enregistré"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Mot de passe incorrect"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Le mot de passe Wi-Fi est trop court"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Connexion obligatoire"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Autres options"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Tout afficher"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Moins de résultats"</string>
@@ -750,7 +757,7 @@
     <string name="system_accessibility_tts_engine_config" msgid="4757760652785865532">"Configuration du moteur"</string>
     <string name="system_speak_passwords" msgid="8556036524146404052">"Énoncer les mots de passe"</string>
     <string name="system_preferred_engine" msgid="3545505072652708443">"Moteur préféré"</string>
-    <string name="system_speech_rate" msgid="6553204071403872669">"Cadence de parole"</string>
+    <string name="system_speech_rate" msgid="6553204071403872669">"Débit"</string>
     <string name="system_play_sample" msgid="3934369914309865584">"Écouter un extrait"</string>
     <string name="system_install_voice_data" msgid="8016395777968958673">"Installer les données vocales"</string>
     <string name="system_general" msgid="687760148454147771">"Général"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Personnaliser les restrictions"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Veuillez patienter…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Modifier le NIP"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Créer un profil limité"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Déjà créé"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Ignorer"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Créer un NIP"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Activer le profil limité?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Aucun profil limité"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Déjà saisi"</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">"Cette application peut accéder à vos comptes. Contrôlée par <xliff:g id="APP">%1$s</xliff:g>."</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Entrez le NIP pour regarder cette chaîne"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Microphone(s) d\'enregistrement"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Impossible de démarrer l\'enregistrement audio."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Échec de l\'enregistrement audio."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Économiseur de données"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Ajuster automatiquement la qualité vidéo pour utiliser moins de données cellulaires"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Consommation des données et alertes"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Connectez-vous à Internet par Wi-Fi ou Ethernet, ou au moyen du point d\'accès sans fil de votre téléphone."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Rendre visible pour les autres appareils Bluetooth?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Une application souhaite rendre votre télévision visible pour les autres appareils Bluetooth pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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éliorez l\'efficacité énergétique lorsque le téléviseur n\'est pas en cours d\'utilisation"</string>
+    <string name="energy_modes_summary" msgid="2324906343309484649">"Ces paramètres ont une incidence sur l\'appareil lorsqu\'il n\'est pas utilisé"</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_mode_eco_hint" msgid="5280058011809503514">"La consommation d\'énergie peut augmenter en fonction du nombre de fonctionnalités du téléviseur que vous activez."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Activer « <xliff:g id="ENERGYMODENAME">%s</xliff:g> »"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Localiser ma télécommande"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Faites jouer un son pour localiser votre télécommande Google TV si elle est égarée"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Appuyez sur le bouton à l\'arrière de votre Google TV pour faire jouer un son sur votre télécommande pendant 30 secondes. Cette action ne fonctionne qu\'avec les télécommandes prises en charge par Google TV.\n\nPour couper le son, appuyez sur n\'importe quel bouton de votre télécommande."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Un bouton sur votre Google TV vous permet d\'émettre un son sur votre télécommande pendant 30 secondes. Cette action ne fonctionne qu\'avec les télécommandes prises en charge par Google TV.\n\nPour couper le son, appuyez sur n\'importe quel bouton de votre télécommande."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Quand la fonctionnalité Localiser ma télécommande est activée, vous pouvez faire jouer un son pour localiser votre télécommande Google TV si elle est égarée."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Faire jouer un son"</string>
 </resources>
diff --git a/Settings/res/values-fr/energy-modes.xml b/Settings/res/values-fr/energy-modes.xml
index feffcad..9249c87 100644
--- a/Settings/res/values-fr/energy-modes.xml
+++ b/Settings/res/values-fr/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Mode basse consommation"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"avec des fonctionnalités réseau essentielles"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Désactive la connexion réseau lorsque le téléviseur n\'est pas utilisé (mode veille)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Faible"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"En veille"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"En veille — Connexion réseau désactivée lorsque la TV n\'est pas utilisée"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Mises à jour et fonctions essentielles"</item>
+    <item msgid="4002284890471636101">"[Insérer la fonctionnalité 1]"</item>
+    <item msgid="7072772341455731040">"[Insérer la fonctionnalité 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Mode économie d\'énergie"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"avec des fonctionnalités réseau recommandées"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Autorise les fonctionnalités à réveiller le téléviseur via le réseau (veille avec maintien de la connexion réseau)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Toutes les fonctionnalités essentielles"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimisée"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Veille avec maintien de la connexion réseau"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Veille avec maintien de la connexion réseau — Permet aux fonctionnalités d\'activer la TV via le 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="6636328986387241066">"Mode consommation élevée"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"avec des fonctionnalités réseau supplémentaires"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Autoriser les fonctionnalités supplémentaires même lorsque le téléviseur n\'est pas utilisé."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Toutes les fonctionnalités recommandées"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Élevée"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Connexion permanente"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Connexion permanente — Active les fonctionnalités réseau lorsque la TV n\'est pas utilisée"</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>
diff --git a/Settings/res/values-fr/strings.xml b/Settings/res/values-fr/strings.xml
index 1879a80..44dcca4 100644
--- a/Settings/res/values-fr/strings.xml
+++ b/Settings/res/values-fr/strings.xml
@@ -368,12 +368,14 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Informations légales Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Informations de licence indisponibles."</string>
     <string name="about_model" msgid="9164284529291439296">"Modèle"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Mode Appareil"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Démo pour le magasin"</string>
     <string name="about_version" msgid="6223547403835399861">"Version d\'Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Numéro de série"</string>
     <string name="about_build" msgid="8467840394761634575">"Build Android TV"</string>
     <string name="show_dev_countdown" msgid="4064986225625409361">"{count,plural, =1{Plus que # étape pour devenir développeur}one{Plus que # étape pour devenir développeur}other{Plus que # étapes pour devenir développeur}}"</string>
     <string name="about_ads" msgid="7662896442040086522">"Annonces"</string>
-    <string name="ads_description" msgid="8081069475265061074">"Gérez paramètres annonces, modifiez identifiant publicitaire."</string>
+    <string name="ads_description" msgid="8081069475265061074">"Gérez les paramètres des annonces, modifiez votre identifiant publicitaire."</string>
     <string name="ads_content_description" msgid="1006489792324920289">"Annonces, Gérez les paramètres des annonces, modifiez par exemple votre identifiant publicitaire."</string>
     <string name="show_dev_on" msgid="612741433124106067">"Vous êtes désormais développeur !"</string>
     <string name="show_dev_already" msgid="1522591284776449818">"Inutile, vous êtes déjà développeur."</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Connexion Internet"</string>
     <string name="connected" msgid="4981532275162345997">"Connecté"</string>
     <string name="not_connected" msgid="475810896484271663">"Non connecté"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Aucun accès à Internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Enregistré"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Mot de passe incorrect"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Le mot de passe Wi-Fi est trop court"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Veuillez vous connecter"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Autres options"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Tout afficher"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Moins"</string>
@@ -700,7 +707,7 @@
     <string name="accessibility_shortcut" msgid="5856158637840030531">"Raccourci d\'accessibilité"</string>
     <string name="accessibility_shortcut_enable" msgid="6603542432267329986">"Activer le raccourci d\'accessibilité"</string>
     <string name="accessibility_shortcut_service" msgid="2053250146891420311">"Service associé au raccourci"</string>
-    <string name="accessibility_shortcut_description" msgid="2050424178481510046">"Lorsque le raccourci est activé, vous pouvez appuyer sur le bouton \"Précédent\" et le bouton \"Volume -\" pendant trois secondes pour lancer une fonctionnalité d\'accessibilité."</string>
+    <string name="accessibility_shortcut_description" msgid="2050424178481510046">"Lorsque le raccourci est activé, vous pouvez appuyer sur le bouton Retour et le bouton Bas pendant trois secondes pour lancer une fonctionnalité d\'accessibilité."</string>
     <string name="accessibility_captions" msgid="3411554568812306549">"Sous-titres"</string>
     <string name="accessibility_captions_description" msgid="3827820027578548160">"Paramètres de superposition du texte des sous-titres sur la vidéo"</string>
     <string name="captions_display" msgid="2598662495450633375">"Afficher"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Personnaliser les restrictions"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Veuillez patienter…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Modifier le code d\'accès"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Créer un profil limité ?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Déjà créé"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Passer"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Créer un code"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Saisir le profil limité ?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Aucun profil limité"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Déjà saisi"</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">"Cette application peut accéder à vos comptes. Contrôlée par <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Saisir le code d\'accès pour regarder cette chaîne"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Micro(s) enregistré(s)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Échec du démarrage de l\'enregistrement audio."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Échec de l\'enregistrement audio."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Économiseur de données"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Ajuster automatiquement la qualité vidéo pour utiliser moins de données mobiles"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Consommation des données et alertes"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Vous pouvez vous connecter à Internet via le Wi-Fi, Ethernet ou le point d\'accès du téléphone."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Rendre visible pour les autres appareils Bluetooth ?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Une appli nécessite que d\'autres appareils Bluetooth puissent détecter votre TV pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Ces paramètres affectent l\'appareil lorsqu\'il n\'est pas utilisé"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"Fonctionnalités activées :"</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_mode_eco_hint" msgid="5280058011809503514">"La consommation d\'énergie peut augmenter selon le nombre de fonctionnalités TV que vous activez."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Activer \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
-    <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Localiser ma télécommande"</string>
+    <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Trouver ma télécommande"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Émettre un son pour localiser votre télécommande Google TV si vous l\'avez égarée"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Appuyez sur le bouton à l\'arrière de votre Google TV pour que votre télécommande émette un son pendant 30 secondes. Cela ne fonctionne que sur les télécommandes Google TV compatibles.\n\nPour arrêter le son, appuyez sur n\'importe quel bouton de la télécommande."</string>
-    <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Lorsque Localiser ma télécommande est activé, vous pouvez émettre un son pour localiser votre télécommande Google TV si vous l\'avez égarée."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Votre Google TV comporte un bouton sur lequel appuyer pour que votre télécommande émette un son pendant 30 secondes. Cela ne fonctionne que sur les télécommandes Google TV compatibles.\n\nPour arrêter le son, appuyez sur n\'importe quel bouton de la télécommande."</string>
+    <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Lorsque \"Trouver ma télécommande\" est activé, vous pouvez émettre un son pour localiser votre télécommande Google TV si vous l\'avez égarée."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Émettre un son"</string>
 </resources>
diff --git a/Settings/res/values-gl/energy-modes.xml b/Settings/res/values-gl/energy-modes.xml
index 4a38ac4..1b73eda 100644
--- a/Settings/res/values-gl/energy-modes.xml
+++ b/Settings/res/values-gl/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Modo de baixo consumo"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"con funcións esenciais de rede"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Desactiva a conexión de rede cando a televisión non estea en uso (modo de espera)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Menos consumo"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"En espera"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"En espera: A conexión de rede está desactivada cando non se usa a televisión"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Actualizacións e funcións esenciais"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Modo de consumo optimizado"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"con funcións recomendadas de rede"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Permite funcións que activan a televisión a través da rede (modo de espera con conexión de rede)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Todas as funcións esenciais"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimizado"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Modo de espera con conexión de rede"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Modo de espera con conexión de rede: Habilítanse funcións para reactivar a televisión a través da 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="6636328986387241066">"Modo de alto consumo"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"con funcións adicionais de rede"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Permite funcións adicionais aínda que non se estea usando a televisión."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Todas as funcións recomendadas"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Máis consumo"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Conexión permanente"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Conexión permanente: Habilítanse funcións de rede cando non se usa a televisión"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-gl/strings.xml b/Settings/res/values-gl/strings.xml
index 8fbf5b6..d4371e3 100644
--- a/Settings/res/values-gl/strings.xml
+++ b/Settings/res/values-gl/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Información legal de Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Os datos da licenza non están dispoñibles"</string>
     <string name="about_model" msgid="9164284529291439296">"Modelo"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Modo do dispositivo"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Modo de demostración para tendas"</string>
     <string name="about_version" msgid="6223547403835399861">"Versión do sistema operativo de Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Número de serie"</string>
     <string name="about_build" msgid="8467840394761634575">"Compilación do sistema operativo de Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Conexión a Internet"</string>
     <string name="connected" msgid="4981532275162345997">"Conectado"</string>
     <string name="not_connected" msgid="475810896484271663">"Non conectado"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Non hai conexión a Internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Gardouse"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Contrasinal incorrecto"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"O contrasinal da wifi é demasiado curto"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Inicio de sesión obrigatorio"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Outras opcións"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Ver todo"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Ver menos"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Personalizar restricións"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Un momento..."</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Cambiar PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Crear perfil restrinxido?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Xa se creou"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Omitir"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Crear PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Acceder ao perfil restrinxido?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Perfil restrinxido non atopado"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Xa se accedeu"</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">"Esta aplicación pode acceder ás túas contas. Está controlada por <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Introduce o PIN para ver esta canle"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Micrófonos gravados"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Produciuse un erro ao iniciar a gravación de audio."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Produciuse un erro ao gravar o audio."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Aforro de datos"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Axusta automaticamente a calidade dos vídeos para utilizar menos datos móbiles"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Alertas e uso de datos"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Podes conectarte a Internet utilizando unha rede wifi, un cable Ethernet ou a zona wifi do teu teléfono."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Queres que outros dispositivos Bluetooth poidan ver o teu?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Unha aplicación require que a túa televisión estea visible para outros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Estas opcións de configuración aféctanlle ao dispositivo aínda que non se estea usando"</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_mode_eco_hint" msgid="5280058011809503514">"O consumo de enerxía pode aumentar dependendo da cantidade de funcións da televisión que actives."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Activar o modo <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
-    <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Localizar mando a distancia"</string>
+    <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Localizar o mando a distancia"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Se non dás atopado o mando a distancia de Google TV, fai que emita un son para localizalo"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Preme o botón situado na parte traseira do dispositivo Google TV para que se reproduza un son no mando a distancia durante 30 segundos. Esta acción só se pode levar a cabo con mandos a distancia de Google TV que admitan esta opción.\n\nPreme calquera botón do mando para que deixe de soar."</string>
-    <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Cando está activada a opción Localizar mando a distancia, podes facer que se reproduza un son para atopar o mando a distancia de Google TV se non sabes onde está."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"En Google TV tes un botón que podes premer para reproducir un son no mando a distancia durante 30 segundos. Esta acción só se pode levar a cabo con mandos a distancia de Google TV que admitan esta opción.\n\nPreme calquera botón do mando para que deixe de soar."</string>
+    <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Cando está activada a opción Localizar o mando a distancia, podes facer que se reproduza un son para atopar o mando a distancia de Google TV se non sabes onde está."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Reproducir son"</string>
 </resources>
diff --git a/Settings/res/values-gu/energy-modes.xml b/Settings/res/values-gu/energy-modes.xml
index 66a8ac2..f535c2d 100644
--- a/Settings/res/values-gu/energy-modes.xml
+++ b/Settings/res/values-gu/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"ઓછી ઊર્જાનો મોડ"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"નેટવર્કની આવશ્યક સુવિધાઓ સાથે"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"જ્યારે ટીવી ઉપયોગમાં ન હોય, ત્યારે નેટવર્ક કનેક્શન બંધ કરો (સ્ટેન્ડબાય મોડ)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"ઓછું"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"સ્ટૅન્ડબાય"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"સ્ટૅન્ડબાય — જ્યારે ટીવી ઉપયોગમાં ન હોય ત્યારે નેટવર્ક કનેક્શન બંધ હોય છે"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"મહત્ત્વપૂર્ણ અપડેટ અને કાર્યો"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"ઑપ્ટિમાઇઝ કરેલો ઊર્જાનો મોડ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"નેટવર્કની સુઝાવ આપેલી સુવિધાઓ સાથે"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"સુવિધાઓને નેટવર્ક પર ટીવી સક્રિય કરવાની મંજૂરી આપે છે (નેટવર્ક સ્ટેન્ડબાય પર છે)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"તમામ આવશ્યક સુવિધાઓ"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"ઑપ્ટિમાઇઝ કરેલી બૅટરી"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"નેટવર્ક સ્ટેન્ડબાય"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"નેટવર્ક સ્ટેન્ડબાય — નેટવર્ક પર ટીવીને સક્રિય કરવા માટે સુવિધાઓને ચાલુ કરે છે"</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="6636328986387241066">"વધુ ઊર્જાનો મોડ"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"નેટવર્કની વધારાની સુવિધાઓ સાથે"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"ટીવી ઉપયોગમાં ન હોય ત્યારે પણ વધારાની સુવિધાઓને મંજૂરી આપે છે."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"સુઝાવ આપેલી તમામ સુવિધાઓ"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"વધારો કર્યો"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"હંમેશા કનેક્ટેડ"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"હંમેશા કનેક્ટેડ — જ્યારે ટીવી ઉપયોગમાં ન હોય ત્યારે નેટવર્ક સુવિધાઓને ચાલુ કરે છે"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[સુવિધા 1 દાખલ કરો]"</item>
     <item msgid="170760143032597722">"[સુવિધા 2 દાખલ કરો]"</item>
diff --git a/Settings/res/values-gu/strings.xml b/Settings/res/values-gu/strings.xml
index f53070e..8b26b81 100644
--- a/Settings/res/values-gu/strings.xml
+++ b/Settings/res/values-gu/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google કાનૂની"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"લાઇસન્સ ડેટા અનુપલબ્ધ છે"</string>
     <string name="about_model" msgid="9164284529291439296">"મૉડલ"</string>
+    <string name="device_mode" msgid="7258350575590118152">"ડિવાઇસ મોડ"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"સ્ટોરનો ડેમો"</string>
     <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>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"ઇન્ટરનેટ કનેક્શન"</string>
     <string name="connected" msgid="4981532275162345997">"કનેક્ટ કર્યુ"</string>
     <string name="not_connected" msgid="475810896484271663">"કનેક્ટ થયેલ નથી"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"ઇન્ટરનેટ ઍક્સેસ નથી"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"સાચવેલું"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"ખોટો પાસવર્ડ"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"વાઇ-ફાઇનો પાસવર્ડ ખૂબ ટૂંકો છે"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"સાઇન ઇન આવશ્યક છે"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"અન્ય વિકલ્પો"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"બધું જુઓ"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"ઓછી જુઓ"</string>
@@ -902,6 +909,13 @@
     <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>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"પ્રતિબંધિત પ્રોફાઇલ બનાવીએ?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"પહેલેથી બનાવેલી છે"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"છોડો"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"પિન બનાવો"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"પ્રતિબંધિત પ્રોફાઇલ દાખલ કરીએ?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"કોઈ પ્રતિબંધિત પ્રોફાઇલ નથી"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"પહેલેથી જ દાખલ કરી છે"</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="pin_enter_unlock_channel" msgid="243855138978654080">"આ ચેનલ જોવા માટે પિન દાખલ કરો"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"રેકોર્ડેડ માઇક્રોફોન"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"ઑડિયો રેકોર્ડિંગ શરૂ કરવાનું નિષ્ફળ રહ્યું."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"ઑડિયો રેકોર્ડ કરવાનું નિષ્ફળ રહ્યું."</string>
-    <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">"તમે વાઇ-ફાઇ, ઇથરનેટ કેબલ અથવા તમારા ફોનના હૉટસ્પૉટ વડે ઇન્ટરનેટ સાથે કનેક્ટ કરી શકો છો."</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>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"જ્યારે ડિવાઇસ ઉપયોગમાં ન હોય ત્યારે આ સેટિંગ તેને અસર કરે છે"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"આ ચાલુ કરે છે:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"નોંધ કરો કે આ મોડ ડિવાઇસના પાવર વપરાશમાં વધારો કરી શકે છે."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"તમે ચાલુ કરો છો તે ટીવી સુવિધાઓની સંખ્યા સાથે પાવરનો વપરાશ વધી શકે છે."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" ચાલુ કરો"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"મારું રિમોટ શોધો"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"જો Google TVનું તમારું રિમોટ ખોવાઈ ગયું હોય, તો તેને શોધવા માટે સાઉન્ડ વગાડો"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"તમારા રિમોટ પર 30 સેકન્ડ સુધી સાઉન્ડ વગાડવા માટે, તમારા Google TVની પાછળનું બટન દબાવો. આ Google TVના માત્ર સપોર્ટેડ રિમોટ કન્ટ્રોલ સાથે કામ કરે છે.\n\nસાઉન્ડ બંધ કરવા માટે, તમારા રિમોટ પરનું કોઈપણ બટન દબાવો."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"તમારા Google TV પર એક બટન છે જેને તમે તમારા રિમોટ પર 30 સેકન્ડ માટે સાઉન્ડ ચલાવવા માટે પુશ કરી શકો છો. આ Google TVના માત્ર સપોર્ટેડ રિમોટ કન્ટ્રોલ સાથે કામ કરે છે.\n\nસાઉન્ડ બંધ કરવા માટે, તમારા રિમોટ પરનું કોઈપણ બટન દબાવો."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"\'મારું રિમોટ શોધો\' સુવિધા ચાલુ કરેલી હોય, ત્યારે જો Google TVનું તમારું રિમોટ ખોવાઈ ગયું હોય, તો તમે તેને શોધવા માટે કોઈ સાઉન્ડ વગાડી શકો છો."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"સાઉન્ડ વગાડો"</string>
 </resources>
diff --git a/Settings/res/values-hi/energy-modes.xml b/Settings/res/values-hi/energy-modes.xml
index fbfe8f6..1bd5e10 100644
--- a/Settings/res/values-hi/energy-modes.xml
+++ b/Settings/res/values-hi/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"कम ऊर्जा वाला मोड"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"इसमें नेटवर्क से जुड़ी ज़रूरी सुविधाएं शामिल हैं"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"जब टीवी का इस्तेमाल न किया जा रहा हो, तो इंटरनेट बंद कर दें (स्टैंडबाय मोड)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"कम"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"स्टैंडबाय"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"स्टैंडबाय — यह सेटिंग चालू होने पर, जब टीवी इस्तेमाल न किया जा रहा हो, तब इंटरनेट बंद रहता है"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"गड़बड़ियों से जुड़ी सूचनाएं और फ़ंक्शन"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"ऑप्टिमाइज़ की गई ऊर्जा वाला मोड"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"इसमें नेटवर्क की सुझाई गई सुविधाएं शामिल हैं"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"नेटवर्क (नेटवर्क कनेक्शन से जुड़ने पर ऐक्टिव होने वाला स्टैंडबाय डिवाइस) पर टीवी की स्क्रीन को चालू करने वाली सुविधा की अनुमति दें."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"सभी ज़रूरी सुविधाएं"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"ऑप्टिमाइज़ किया गया"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"नेटवर्क से जुड़ने पर ऐक्टिव होने वाला स्टैंडबाय मोड"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"नेटवर्क से जुड़ने पर ऐक्टिव होने वाला स्टैंडबाय मोड — यह सेटिंग चालू होने पर, नेटवर्क मौजूद होने की स्थिति में टीवी चालू करने की सुविधाएं उपलब्ध होती हैं"</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="6636328986387241066">"ज़्यादा ऊर्जा वाला मोड"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"इसमें नेटवर्क से जुड़ी अन्य सुविधाएं शामिल हैं"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"जब टीवी का इस्तेमाल न किया जा रहा हो, तब अन्य सुविधाओं को इस्तेमाल करने की अनुमति दें."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"सुझाई गई सभी सुविधाएं"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"ज़्यादा"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"हमेशा उपलब्ध रहने वाला नेटवर्क कनेक्शन"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"हमेशा उपलब्ध रहने वाला नेटवर्क कनेक्शन — यह सेटिंग चालू होने पर, टीवी के बंद होने पर भी नेटवर्क की सुविधाएं उपलब्ध होती हैं"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-hi/strings.xml b/Settings/res/values-hi/strings.xml
index 1f5c8a2..aff7adc 100644
--- a/Settings/res/values-hi/strings.xml
+++ b/Settings/res/values-hi/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google से जुड़ी कानूनी जानकारी"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"लाइसेंस डेटा अनुपलब्ध है"</string>
     <string name="about_model" msgid="9164284529291439296">"मॉडल"</string>
+    <string name="device_mode" msgid="7258350575590118152">"डिवाइस मोड"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"स्टोर डेमो"</string>
     <string name="about_version" msgid="6223547403835399861">"Android TV का ओएस वर्शन"</string>
     <string name="about_serial" msgid="3432319328808745459">"सीरियल नंबर"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV के ओएस बिल्ड का वर्शन"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"इंटरनेट कनेक्शन"</string>
     <string name="connected" msgid="4981532275162345997">"कनेक्ट है"</string>
     <string name="not_connected" msgid="475810896484271663">"कनेक्ट नहीं है"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"इंटरनेट नहीं है"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"सेव किया गया"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"गलत पासवर्ड"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"वाई-फ़ाई पासवर्ड बहुत छोटा है"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"साइन-इन करने की ज़रूरत है"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"दूसरे विकल्प"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"सभी देखें"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"कम देखें"</string>
@@ -773,7 +780,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">"वाई-फ़ाई अत्यधिक शब्द प्रवेश"</string>
@@ -902,6 +909,13 @@
     <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>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"प्रतिबंधित प्रोफ़ाइल बनाएं?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"पहले से बनी हुई है"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"अभी नहीं"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"पिन बनाएं"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"प्रतिबंधित प्रोफ़ाइल पर जाएं?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"प्रतिबंधित प्रोफ़ाइल नहीं मिली"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"पहले से मौजूद है"</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="pin_enter_unlock_channel" msgid="243855138978654080">"यह चैनल देखने के लिए पिन डालें"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"रिकॉर्डिंग में इस्तेमाल माइक्रोफ़ोन"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"ऑडियो की रिकॉर्डिंग शुरू नहीं हो पाई."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"ऑडियो की रिकॉर्डिंग नहीं हो पाई."</string>
-    <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">"वाई-फ़ाई, ईथरनेट या फ़ोन के हॉटस्पॉट का इस्तेमाल करके, इंटरनेट से कनेक्ट किया जा सकता है."</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>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"डिवाइस का इस्तेमाल न होने पर, ये सेटिंग डिवाइस पर असर डालती हैं"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"चालू करता है:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ध्यान दें कि यह मोड डिवाइस की बिजली खपत बढ़ा सकता है."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"टीवी की ज़्यादा सुविधाएं चालू होने पर बिजली की खपत बढ़ सकती है."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" को चालू करें"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"मेरा रिमोट ढूंढें"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Google TV रिमोट खो जाने पर, उसका पता लगाने के लिए साउंड चलाएं"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"रिमोट पर 30 सेकंड तक साउंड चलाने के लिए, Google TV के पीछे मौजूद बटन को दबाएं. ऐसा सिर्फ़ सपोर्ट किए जाने वाले Google TV के रिमोट कंट्रोल पर किया जा सकता है.\n\nसाउंड बंद करने के लिए, रिमोट के किसी भी बटन को दबाएं."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"आपके Google TV पर एक ऐसा बटन होता है जिसे दबाने से रिमोट पर 30 सेकंड के लिए आवाज़ चलाई जा सकती है. ऐसा सिर्फ़ उन Google TV के रिमोट कंट्रोल पर किया जा सकता है जिन पर यह सुविधा काम करती है.\n\nसाउंड बंद करने के लिए, रिमोट के किसी भी बटन को दबाएं."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"अगर \'मेरा रिमोट ढूंढें\' सुविधा चालू है, तो Google TV रिमोट खो जाने पर उसका पता लगाने के लिए साउंड चलाया जा सकता है."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"साउंड चलाएं"</string>
 </resources>
diff --git a/Settings/res/values-hr/energy-modes.xml b/Settings/res/values-hr/energy-modes.xml
index dcb1972..47f99af 100644
--- a/Settings/res/values-hr/energy-modes.xml
+++ b/Settings/res/values-hr/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Niski način energije"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"s osnovnim značajkama mreže"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Isključi mrežnu vezu kad se TV ne upotrebljava (stanje mirovanja)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Niska potrošnja energije"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Stanje mirovanja"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Stanje mirovanja – mrežna veza isključena je kada se TV ne upotrebljava"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Kritična ažuriranja i funkcije"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Optimizirani način energije"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"s preporučenim značajkama mreže"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Dopušta značajke koje aktiviraju TV putem mreže (na čekanju za mrežu)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Sve neophodne značajke"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimizirano"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Na čekanju za mrežu"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Na čekanju za mrežu – omogućuje da značajke aktiviraju TV putem mreže"</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="6636328986387241066">"Povećani način energije"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"s dodatnim značajkama mreže"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Dopušta dodatne značajke čak i kad se TV ne koristi."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Sve preporučene značajke"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Povećana potrošnja energije"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Uvijek povezano"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Uvijek povezano – omogućuje značajke mreže kada se TV ne upotrebljava"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-hr/strings.xml b/Settings/res/values-hr/strings.xml
index 86023d9..0d2748e 100644
--- a/Settings/res/values-hr/strings.xml
+++ b/Settings/res/values-hr/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Googleove pravne informacije"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Podaci o licenci nisu dostupni"</string>
     <string name="about_model" msgid="9164284529291439296">"Model"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Način rada uređaja"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Demo način za trgovine"</string>
     <string name="about_version" msgid="6223547403835399861">"Verzija OS-a Android TV-a"</string>
     <string name="about_serial" msgid="3432319328808745459">"Serijski broj"</string>
     <string name="about_build" msgid="8467840394761634575">"Međuverzija OS-a Android TV-a"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Internetska veza"</string>
     <string name="connected" msgid="4981532275162345997">"Povezano"</string>
     <string name="not_connected" msgid="475810896484271663">"Nije povezano"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Nema interneta"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Spremljeno"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Pogrešna zaporka"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Zaporka Wi-Fi mreže je prekratka"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Potrebna je prijava"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Ostale opcije"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Pokaži sve"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Prikaži manje"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Prilagodi ograničenja"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Trenutak…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Promjena PIN-a"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Želite li izraditi ograničeni profil?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Već izrađeno"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Preskoči"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Izradi PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Želite li se prebaciti na ograničeni profil?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Nema ograničenog profila"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Već je uneseno"</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">"Aplikacija može pristupiti vašim računima. Upravlja aplikacija <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Unesite PIN da biste gledali ovaj kanal"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Mikrofoni za snimanje"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Pokretanje snimanja zvuka nije uspjelo."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Snimanje zvuka nije uspjelo."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Štednja podatkovnog prometa"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Automatski prilagodi kvalitetu videozapisa radi uštede mobilnih podataka"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Potrošnja podatakovnog prometa i upozorenja"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"S internetom se možete povezati putem Wi-Fija, etherneta ili žarišne točke telefona."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Učiniti vidljivim drugim Bluetooth uređajima?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Aplikacija želi učiniti vaš TV vidljivim drugim Bluetooth uređajima na <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Te postavke utječu na uređaj kada se 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_mode_eco_hint" msgid="5280058011809503514">"Potrošnja energije može se povećati s obzirom na broj značajki TV-a koje omogućite."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Omogućite <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Pronađi moj daljinski upravljač"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Reproducirajte zvuk da biste locirali daljinski upravljač za Google TV ako ste ga zametnuli"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Pritisnite gumb sa stražnje strane Google TV-a za reprodukciju zvuka na daljinskom upravljaču u trajanju od 30 sekundi. To funkcionira samo s podržanim daljinskim upravljačima Google TV-a.\n\nDa biste isključili zvuk, pritisnite bilo koji gumb na daljinskom upravljaču."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Na Google TV-u se nalazi gumb koji možete pritisnuti da biste reproducirali zvuk na daljinskom upravljaču u trajanju od 30 sekundi. To funkcionira samo s podržanim daljinskim upravljačima Google TV-a.\n\nDa biste isključili zvuk, pritisnite bilo koji gumb na daljinskom upravljaču."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Kada je omogućena značajka Pronađi moj daljinski upravljač, možete reproducirati zvuk da biste locirali daljinski upravljač za Google TV ako ste ga zametnuli."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Reproduciraj zvuk"</string>
 </resources>
diff --git a/Settings/res/values-hu/energy-modes.xml b/Settings/res/values-hu/energy-modes.xml
index 11b68d9..2a103de 100644
--- a/Settings/res/values-hu/energy-modes.xml
+++ b/Settings/res/values-hu/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Alacsony energiafelhasználás mód"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"alapvető hálózati funkciókkal"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Hálózati kapcsolat kikapcsolása, amikor a TV nincs használatban (készenléti mód)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Alacsony"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Készenléti mód"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Készenlét — A hálózati kapcsolat ki van kapcsolva, amikor nincs használatban a tévé"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Kritikus frissítések és funkciók"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Optimalizált energiafelhasználás mód"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"ajánlott hálózati funkciókkal"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Engedélyezi azokat a funkciókat, amelyek felébresztik a tévét a hálózaton keresztül (hálózatvezérelt készenlét)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Minden alapvető funkció"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimalizált"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Hálózatvezérelt készenlét"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Hálózatvezérelt készenlét — Engedélyezi az ahhoz szükséges funkciókat, hogy hálózaton keresztül fel lehessen ébreszteni a tévét"</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="6636328986387241066">"Nagyobb energiafelhasználás mód"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"további hálózati funkciókkal"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Akkor is engedélyezi az extra funkciókat, amikor a TV nincs használatban."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Minden ajánlott funkció"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Magas"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Mindig csatlakoztatva"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Mindig csatlakoztatva — Engedélyezi a hálózati funkciókat, 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>
diff --git a/Settings/res/values-hu/strings.xml b/Settings/res/values-hu/strings.xml
index 6db7558..fc379af 100644
--- a/Settings/res/values-hu/strings.xml
+++ b/Settings/res/values-hu/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google – jogi szabályozás"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"A licencadatok nem érhetők el"</string>
     <string name="about_model" msgid="9164284529291439296">"Modell"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Eszközmód"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Demó mód üzletben"</string>
     <string name="about_version" msgid="6223547403835399861">"Android TV OS-verzió"</string>
     <string name="about_serial" msgid="3432319328808745459">"Sorozatszám"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV OS-build"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Internetkapcsolat"</string>
     <string name="connected" msgid="4981532275162345997">"Kapcsolódva"</string>
     <string name="not_connected" msgid="475810896484271663">"Nincs csatlakozva"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Nincs internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Mentve"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Helytelen jelszó"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"A Wi-Fi-jelszó túl rövid"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Bejelentkezés szükséges"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Egyéb beállítások"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Az összes megjelenítése"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Kevesebb megjelenítése"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Korlátozások személyre szabása"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Egy pillanat…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"A PIN-kód módosítása"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Létrehoz korlátozott profilt?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Már létrehozva"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Kihagyás"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"PIN-kód létrehozása"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Belép a korlátozott profilba?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Nincs korlátozott profil"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Már megadta"</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">"Ez az alkalmazás hozzáfér az Ön fiókjaihoz; a kezelője pedig a következő: <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"A csatorna megtekintéséhez PIN-kód szükséges"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Rögzített mikrofonok"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Nem sikerült elindítani a hangfelvételt."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Sikertelen hangfelvétel."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Adatforgalom-csökkentő"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Videó minőségének automatikus beállítása a kevesebb mobiladat-használathoz"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Adathasználat és értesítések"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Az internethez Wi-Fi, Ethernet-kábel vagy telefonja hotspotja segítségével csatlakozhat."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Láthatóvá teszi más Bluetooth-eszközök számára?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Az egyik alkalmazás láthatóvá szeretné tenni a tévét más Bluetooth-eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Ezek a beállítások hatással vannak az eszközre, amikor nincs használatban"</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_mode_eco_hint" msgid="5280058011809503514">"Minél több tévéfunkciót engedélyez, annál nagyobb lehet az energiafogyasztás."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"A következő engedélyezése: „<xliff:g id="ENERGYMODENAME">%s</xliff:g>”"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Távirányító-kereső"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Hang lejátszásával megkeresheti a Google TV távirányítóját, ha nem találja"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"A Google TV Streamer hátoldalán lévő gombot lenyomva 30 másodpercen át hangot ad ki a távirányító. Ez csak a támogatott Google TV-távirányítóknál működik.\n\nA hanglejátszás leállításához nyomja meg bármelyik gombot a távirányítón."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Van egy gomb a Google TV-n, amelyet megnyomva 30 másodpercen át lejátszhat egy hangjelzést a távirányítón. Ez csak a támogatott Google TV-távirányítóknál működik.\n\nA hanglejátszás leállításához nyomja meg bármelyik gombot a távirányítón."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Amikor engedélyezve van a Távirányító-kereső, és nem találja a Google TV-távirányítót, az eszközön való hanglejátszással megkeresheti."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Hang lejátszása"</string>
 </resources>
diff --git a/Settings/res/values-hy/energy-modes.xml b/Settings/res/values-hy/energy-modes.xml
index cddc226..5f0af3b 100644
--- a/Settings/res/values-hy/energy-modes.xml
+++ b/Settings/res/values-hy/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Էներգիայի ցածր սպառման ռեժիմ"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"ցանցի կարևոր գործառույթներով"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Անջատել կապը, երբ հեռուստացույցը չի օգտագործվում (սպասման ռեժիմ)։"</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Ցածր"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Սպասման ռեժիմ"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Սպասման ռեժիմ․ ցանցի հետ կապն անջատվում է, երբ հեռուստացույցը չի օգտագործվում"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Կարևոր թարմացումներ և գործառույթներ"</item>
+    <item msgid="4002284890471636101">"[Ներմուծել գործառույթ 1-ը]"</item>
+    <item msgid="7072772341455731040">"[Ներմուծել գործառույթ 2-ը]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Էներգիայի օպտիմալ սպառման ռեժիմ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"ցանցի խորհուրդ տրվող գործառույթներով"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Թույլ է տալիս միացնել գործառույթները, որոնք արթնացնում են հեռուստացույցը ցանցի միջոցով (ցանցային միացումով սպասման ռեժիմ)։"</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Բոլոր կարևոր գործառույթները"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Օպտիմալացված"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Ցանցային միացումով սպասման ռեժիմ"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Ցանցային միացումով սպասման ռեժիմ․ միացնում է գործառույթները, որոնք արթնացնում են հեռուստացույցը ցանցի միջոցով"</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="6636328986387241066">"Էներգիայի բարձր սպառման ռեժիմ"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"ցանցի լրացուցիչ գործառույթներով"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Թույլ է տալիս միացնել լրացուցիչ գործառույթները, անգամ երբ հեռուստացույցը չի օգտագործվում։"</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Բոլոր առաջարկվող գործառույթները"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Բարձր"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Միշտ միացած"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Միշտ միացած․ միացնում է ցանցային գործառույթները, երբ հեռուստացույցը չի օգտագործվում"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Ներմուծել գործառույթ 1-ը]"</item>
     <item msgid="170760143032597722">"[Ներմուծել գործառույթ 2-ը]"</item>
diff --git a/Settings/res/values-hy/strings.xml b/Settings/res/values-hy/strings.xml
index cf56fa3..ca00c47 100644
--- a/Settings/res/values-hy/strings.xml
+++ b/Settings/res/values-hy/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google-ի իրավական տեղեկություններ"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Արտոնագրի տվյալներն անհասանելի են"</string>
     <string name="about_model" msgid="9164284529291439296">"Մոդելը"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Սարքի ռեժիմը"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Խանութի դեմո"</string>
     <string name="about_version" msgid="6223547403835399861">"Android TV-ի օպերացիոն համակարգի տարբերակ"</string>
     <string name="about_serial" msgid="3432319328808745459">"Սերիական համարը"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV-ի օպերացիոն համակարգի կառուցում"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Ինտերնետ կապ"</string>
     <string name="connected" msgid="4981532275162345997">"Միացված է"</string>
     <string name="not_connected" msgid="475810896484271663">"Միացված չէ"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Ինտերնետ կապ չկա"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Պահված է"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Գաղտնաբառը սխալ է"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi-ի գաղտնաբառը չափազանց կարճ է"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Մուտք գործելը պարտադիր է"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Այլ ընտրանքներ"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Տեսնել բոլորը"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Տեսնել ավելի քիչ"</string>
@@ -592,7 +599,7 @@
     <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_action" msgid="5609631662522950596">"Մոռանալ"</string>
-    <string name="storage_new_title" msgid="4768955281180255038">"USB սարքավարը միացված է"</string>
+    <string name="storage_new_title" msgid="4768955281180255038">"USB կրիչը միացված է"</string>
     <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>
@@ -902,6 +909,13 @@
     <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">"Փոխել pin-ը"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Ստեղծե՞լ սահմանափակված պրոֆիլ"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Արդեն ստեղծված է"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Բաց թողնել"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Ստեղծել PIN կոդ"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Մտնե՞լ սահմանափակված պրոֆիլ"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Սահմանափակված պրոֆիլ չի գտնվել"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Արդեն մուտքագրված է"</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="pin_enter_unlock_channel" msgid="243855138978654080">"Այս կապուղին դիտելու համար մուտքագրեք PIN-ը"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Աուդիոն ձայնագրած խոսափող(ներ)ը"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Չհաջողվեց սկսել ձայնագրումը:"</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Չհաջողվեց ձայնագրել:"</string>
-    <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-ի, Ethernet-ի կամ հեռախոսի թեժ կետի միջոցով։"</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Տեսանելի դարձնե՞լ այլ Bluetooth սարքերի համար"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Հավելվածն ուզում է ձեր հեռուստացույցը <xliff:g id="TIMEOUT">%1$d</xliff:g> վայրկյանով տեսանելի դարձնել այլ Bluetooth սարքերի համար։"</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Այս գործառույթներն ազդում են սարքի վրա, երբ այն չի օգտագործվում"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"Միացնում է՝"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Նկատի ունեցեք, որ այս ռեժիմը կարող է մեծացնել սարքի կողմից էներգիայի ծախսը։"</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"Էներգիայի սպառումը կարող է ավելանալ՝ կախված նրանից, թե հեռուստացույցի քանի գործառույթ եք միացրել։"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Միացնել «<xliff:g id="ENERGYMODENAME">%s</xliff:g>» ռեժիմը"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Գտնել իմ հեռակառավարիչը"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Եթե չեք գտնում ձեր Google TV հեռակառավարիչը, նվագարկեք ազդանշան՝ այն տեղորոշելու համար։"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Սեղմեք Google TV-ի հետևի կոճակը՝ հեռակառավարիչում 30 վայրկյան տևողությամբ ձայնային ազդանշան նվագարկելու համար։ Սա աշխատում է միայն Google TV-ի աջակցվող հեռակառավարիչների հետ։\n\nԱզդանշանը կանգնեցնելու համար սեղմեք հեռակառավարիչի ցանկացած կոճակ։"</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Ձեր Google TV սարքի վրա կա կոճակ, որը սեղմելու դեպքում հեռակառավարման վահանակում ազդանշան կհնչի 30 վայրկյան շարունակ։ Սա աշխատում է միայն Google TV-ի աջակցվող հեռակառավարիչների հետ։\n\nԱզդանշանը կանգնեցնելու համար սեղմեք հեռակառավարիչի ցանկացած կոճակ։"</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Երբ «Գտնել իմ հեռակառավարիչը» գործառույթը միացված է, դուք կարող եք նվագարկել ազդանշան՝ ձեր Google TV-ի հեռակառավարիչը գտնելու համար։"</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Նվագարկել ազդանշանը"</string>
 </resources>
diff --git a/Settings/res/values-in/energy-modes.xml b/Settings/res/values-in/energy-modes.xml
index 8803f5a..1fc09be 100644
--- a/Settings/res/values-in/energy-modes.xml
+++ b/Settings/res/values-in/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Mode energi rendah"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"dengan fitur jaringan penting"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Menonaktifkan koneksi jaringan saat TV sedang tidak digunakan (mode standby)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Rendah"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Standby"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Standby — Koneksi jaringan dinonaktifkan saat TV tidak digunakan"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Update dan fungsi penting"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Mode energi dioptimalkan"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"dengan fitur jaringan yang direkomendasikan"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Mengizinkan fitur mengaktifkan TV melalui jaringan (mode standby berjaringan)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Semua fitur penting"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Dioptimalkan"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Mode Standby Berjaringan"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Mode standby berjaringan — Mengaktifkan fitur untuk menyalakan TV melalui jaringan"</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="6636328986387241066">"Mode energi ditingkatkan"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"dengan fitur jaringan tambahan"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Mengizinkan fitur tambahan bahkan saat TV sedang tidak digunakan."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Semua fitur yang disarankan"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Meningkat"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Selalu terhubung"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Selalu terhubung — Mengaktifkan fitur jaringan saat TV tidak digunakan"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-in/strings.xml b/Settings/res/values-in/strings.xml
index a845ec8..d7ae972 100644
--- a/Settings/res/values-in/strings.xml
+++ b/Settings/res/values-in/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Info hukum Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Data lisensi tidak tersedia"</string>
     <string name="about_model" msgid="9164284529291439296">"Model"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Mode Perangkat"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Demo Store"</string>
     <string name="about_version" msgid="6223547403835399861">"Versi OS Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Nomor seri"</string>
     <string name="about_build" msgid="8467840394761634575">"Versi OS Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Koneksi internet"</string>
     <string name="connected" msgid="4981532275162345997">"Terhubung"</string>
     <string name="not_connected" msgid="475810896484271663">"Tidak terhubung"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Tidak ada internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Disimpan"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Sandi salah"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Sandi Wi-Fi terlalu pendek"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Perlu login"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Opsi lain"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Lihat semua"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Lihat lebih sedikit"</string>
@@ -750,7 +757,7 @@
     <string name="system_accessibility_tts_engine_config" msgid="4757760652785865532">"Konfigurasi mesin"</string>
     <string name="system_speak_passwords" msgid="8556036524146404052">"Ucapkan sandi"</string>
     <string name="system_preferred_engine" msgid="3545505072652708443">"Mesin yang dipilih"</string>
-    <string name="system_speech_rate" msgid="6553204071403872669">"Kecepatan ucapan"</string>
+    <string name="system_speech_rate" msgid="6553204071403872669">"Kecepatan bicara"</string>
     <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>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Sesuaikan pembatasan"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Tunggu sebentar..."</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Ubah pin"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Buat profil yang dibatasi?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Telah Dibuat"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Lewati"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Buat PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Masuk ke profil yang dibatasi?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Tidak ada profil yang dibatasi"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Sudah dimasukkan"</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">"Aplikasi ini dapat mengakses akun Anda. Dikontrol oleh <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Masukkan PIN untuk menonton saluran ini"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Mikrofon yang direkam"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Gagal memulai perekaman audio."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Perekaman audio gagal."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Penghemat Data"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Otomatis menyesuaikan kualitas video agar menggunakan lebih sedikit data seluler"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Penggunaan data dan notifikasi"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Anda dapat terhubung ke internet menggunakan Wi-Fi, Ethernet, atau hotspot ponsel Anda."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Tampilkan untuk perangkat Bluetooth lain?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Aplikasi ingin menampilkan TV Anda untuk perangkat Bluetooth lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Setelan ini memengaruhi perangkat saat 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_mode_eco_hint" msgid="5280058011809503514">"Penggunaan daya dapat bertambah seiring dengan jumlah fitur TV yang Anda aktifkan."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Aktifkan \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Temukan remote saya"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Memutar suara untuk menemukan lokasi remote Google TV jika Anda lupa tempat menaruhnya"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Tekan tombol di bagian belakang Google TV untuk memutar suara di remote selama 30 detik. Fitur ini hanya berfungsi pada remote control Google TV yang didukung.\n\nUntuk mematikan suara, tekan tombol apa pun di remote."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Terdapat tombol di Google TV yang dapat Anda tekan untuk memutar suara di remote Anda selama 30 detik. Fitur ini hanya berfungsi pada remote control Google TV yang didukung.\n\nUntuk mematikan suara, tekan tombol apa pun di remote."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Saat Temukan remote saya diaktifkan, Anda dapat memutar suara untuk menemukan lokasi remote Google TV jika Anda lupa tempat menaruhnya."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Putar suara"</string>
 </resources>
diff --git a/Settings/res/values-is/energy-modes.xml b/Settings/res/values-is/energy-modes.xml
index 6ae46e0..e7f73ff 100644
--- a/Settings/res/values-is/energy-modes.xml
+++ b/Settings/res/values-is/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Stilling fyrir litla orku"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"með nauðsynlegum neteiginleikum"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Slökkva á nettengingu þegar sjónvarpið er ekki í notkun (biðstaða)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Lágt"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Biðstaða"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Biðstaða — Slökkt er á 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>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Stilling fyrir fínstillta orku"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"með ráðlögðum neteiginleikum"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Leyfir eiginleikum að vekja sjónvarpið yfir netið (nettengd biðstaða)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Allir nauðsynlegir eiginleikar"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Fínstillt"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Nettengd biðstaða"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Nettengd biðstaða — Virkjar eiginleika til að vekja sjónvarpið yfir netið"</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="6636328986387241066">"Stilling fyrir aukna orku"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"með fleiri neteiginleikum"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Leyfir viðbótareiginleika þegar sjónvarpið er ekki í notkun."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Allir ráðlagðir eiginleikar"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Aukið"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Alltaf tengt"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Alltaf tengt — Virkjar neteiginleika þegar sjónvarpið er ekki í notkun"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-is/strings.xml b/Settings/res/values-is/strings.xml
index cde7d76..bfe17d5 100644
--- a/Settings/res/values-is/strings.xml
+++ b/Settings/res/values-is/strings.xml
@@ -60,7 +60,7 @@
     <string name="privacy_category_title" msgid="8552430590908463601">"Persónuvernd"</string>
     <string name="privacy_device_settings_category" msgid="5018334603278648524">"Stillingar tækis"</string>
     <string name="privacy_account_settings_category" msgid="5786591549945777400">"Reikningsstillingar"</string>
-    <string name="privacy_assistant_settings_title" msgid="4524957824712623680">"Google hjálpari"</string>
+    <string name="privacy_assistant_settings_title" msgid="4524957824712623680">"Google-hjálpari"</string>
     <string name="privacy_purchases_settings_title" msgid="6490965297061569673">"Greiðsla og kaup"</string>
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Forritsstillingar"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Staðsetning, notkun og greining, auglýsingar"</string>
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Lagalegt efni Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Leyfisgögn eru óaðgengileg"</string>
     <string name="about_model" msgid="9164284529291439296">"Gerð"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Tækjastilling"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Verslunarprufuútgáfa"</string>
     <string name="about_version" msgid="6223547403835399861">"Útgáfa stýrikerfis Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Raðnúmer"</string>
     <string name="about_build" msgid="8467840394761634575">"Smíði stýrikerfis Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Internettenging"</string>
     <string name="connected" msgid="4981532275162345997">"Tengt"</string>
     <string name="not_connected" msgid="475810896484271663">"Ekki tengt"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Engin nettenging"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Vistað"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Rangt aðgangsorð"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi-aðgangsorðið er of stutt"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Innskráningar krafist"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Aðrir valkostir"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Sjá allt"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Sýna færri"</string>
@@ -668,7 +675,7 @@
     <string name="location_reporting_desc" msgid="1580018652781674608">"Google notar þennan eiginleika í vörum á borð við Google Now og Google-kort. Ef þú kveikir á staðsetningartilkynningum geta allar Google vörur sem nota eiginleikann vistað og notað nýjustu staðsetningargögn tækisins í tengslum við Google reikninginn þinn."</string>
     <string name="location_history_desc" msgid="926674012916014270">"Þegar kveikt er á staðsetningarferli fyrir þennan reikning getur Google vistað staðsetningargögn tækisins og gert þau aðgengileg öðrum forritum.\n\nGoogle-kort geta t.a.m. gefið þér leiðarlýsingu og Google Now getur sagt þér hvernig umferðin er á leiðinni.\n\nÞú getur slökkt á staðsetningarferlinum hvenær sem er en við það er honum ekki eytt. Til að skoða og hafa umsjón með staðsetningarferlinum skaltu fara á maps.google.com/locationhistory."</string>
     <string name="delete_location_history_title" msgid="707559064715633152">"Eyða staðsetningarferli"</string>
-    <string name="delete_location_history_desc" msgid="4035229731487113147">"Þetta eyðir öllum vistuðum staðsetningarferli frá þessu tæki fyrir þennan Google reikning. Ekki er hægt að afturkalla þessa eyðingu. Sum forrit, svo sem Google Now, munu hætta að virka."</string>
+    <string name="delete_location_history_desc" msgid="4035229731487113147">"Þetta eyðir öllum vistuðum staðsetningarferli frá þessu tæki fyrir þennan Google-reikning. Ekki er hægt að afturkalla þessa eyðingu. Sum forrit, svo sem Google Now, munu hætta að virka."</string>
     <string name="accessibility_screen_readers_category_title" msgid="7742526514873922018">"Skjálesarar"</string>
     <string name="accessibility_display_category_title" msgid="593444602101558017">"Skjástilling"</string>
     <string name="accessibility_interaction_controls_category_title" msgid="5290687835178852745">"Gagnvirknistýringar"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Sérsníða takmarkanir"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Augnablik…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Breyta PIN-númeri"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Búa til takmarkaðan prófíl?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Þegar búið til"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Sleppa"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Búa til PIN-númer"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Opna takmarkaðan prófíl?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Enginn takmarkaður prófíll"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Þegar innskráður"</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">"Þetta forrit hefur aðgang að reikningunum þínum. Stjórnað af <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Sláðu inn PIN-númer til að horfa á þessa rás"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Hljóðnemi/hljóðnemar upptöku"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Ekki tókst að hefja hljóðupptöku."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Hljóðupptaka mistókst."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Gagnasparnaður"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Stilla myndgæði sjálfkrafa til að nota minna af farsímagögnum"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Gagnanotkun og tilkynningar"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Þú getur tengst við internetið um Wi-Fi, Ethernet eða heitan reit símans."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Gera sýnilegt öðrum Bluetooth-tækjum?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Forrit vill gera sjónvarpið þitt sýnilegt öðrum Bluetooth-tækjum í <xliff:g id="TIMEOUT">%1$d</xliff:g> sekúndur."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Þessar stillingar hafa áhrif á tækið þegar það 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_mode_eco_hint" msgid="5280058011809503514">"Orkunotkun kann að aukast með fjölda sjónvarpseiginleika sem þú virkjar."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Kveikja á „<xliff:g id="ENERGYMODENAME">%s</xliff:g>“"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Finna fjarstýringuna mína"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Spilaðu hljóð til að finna Google TV-fjarstýringuna ef hún týnist"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Ýttu á hnappinn aftan á Google TV til að spila hljóð í fjarstýringunni í 30 sekúndur. Þetta virkar aðeins í studdum Google TV-fjarstýringum.\n\nÝttu á hvaða hnapp sem er á fjarstýringunni til að stöðva hljóðið."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Það er hnappur á Google TV sem þú getur ýtt á til að spila hljóð á fjarstýringunni þinni í 30 sekúndur. Þetta virkar aðeins í studdum Google TV-fjarstýringum.\n\nÝttu á hvaða hnapp sem er á fjarstýringunni til að stöðva hljóðið."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Þegar kveikt er á „Finna fjarstýringuna mína“ geturðu spilað hljóð til að finna Google TV-fjarstýringuna ef hún týnist."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Spila hljóð"</string>
 </resources>
diff --git a/Settings/res/values-it/energy-modes.xml b/Settings/res/values-it/energy-modes.xml
index 39b3648..6cd8aa3 100644
--- a/Settings/res/values-it/energy-modes.xml
+++ b/Settings/res/values-it/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Modalità a bassa energia"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"con funzionalità di rete essenziali"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Disattiva la connessione di rete quando la TV non è in uso (modalità standby)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Bassa"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Standby"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Standby - La connessione di rete è disattivata quando la TV non è in uso"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Aggiornamenti e funzionalità critiche"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Modalità a energia ottimizzata"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"con funzionalità di rete consigliate"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Consente alle funzionalità di riattivare la TV tramite la rete (standby connesso)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Tutte le funzionalità essenziali"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Ottimizzata"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Standby connesso"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Standby connesso - Abilita le funzionalità per riattivare la TV tramite la 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="6636328986387241066">"Modalità a energia aumentata"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"con funzionalità di rete aggiuntive"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Consenti funzionalità extra anche quando la TV non è in uso."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Tutte le funzionalità consigliate"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Aumentata"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Connessione costante"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Connessione costante - Attiva le funzionalità di rete quando la TV non è in uso"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Inserisci funzionalità 1]"</item>
     <item msgid="170760143032597722">"[Inserisci funzionalità 2]"</item>
diff --git a/Settings/res/values-it/strings.xml b/Settings/res/values-it/strings.xml
index 2d8d043..26bd84a 100644
--- a/Settings/res/values-it/strings.xml
+++ b/Settings/res/values-it/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Note legali Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Dati di licenza non disponibili"</string>
     <string name="about_model" msgid="9164284529291439296">"Modello"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Modalità dispositivo"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Demo in negozio"</string>
     <string name="about_version" msgid="6223547403835399861">"Versione sistema operativo Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Numero di serie"</string>
     <string name="about_build" msgid="8467840394761634575">"Build sistema operativo Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Connessione Internet"</string>
     <string name="connected" msgid="4981532275162345997">"Connesso"</string>
     <string name="not_connected" msgid="475810896484271663">"Non connesso"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Nessuna connessione a internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Salvata"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Password errata"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"La password del Wi-Fi è troppo corta"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Accesso obbligatorio"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Altre opzioni"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Mostra tutte"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Mostra meno"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Personalizza limitazioni"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Un attimo…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Modifica codice PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Creare profilo con limitazioni?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Profilo già creato"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Salta"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Crea PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Accedere al profilo con limitazioni?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Nessun profilo con limitazioni"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Hai già eseguito l\'accesso"</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">"Questa app è controllata da <xliff:g id="APP">%1$s</xliff:g> e può accedere ai tuoi account."</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Inserisci PIN per guardare questo canale"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Microfoni registrati"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Impossibile avviare la registrazione dell\'audio."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Registrazione audio non riuscita."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Risparmio dati"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Regola automaticamente la qualità video per usare meno dati mobili"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Utilizzo dei dati e avvisi"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Puoi connetterti a Internet tramite una rete Wi-Fi, un cavo Ethernet o l\'hotspot del telefono."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Rendere visibile agli altri dispositivi Bluetooth?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Un\'app chiede di rendere la tua TV visibile ad altri dispositivi Bluetooth per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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">"Migliora l\'efficienza energetica quando la TV non è in uso"</string>
+    <string name="energy_modes_summary" msgid="2324906343309484649">"Queste impostazioni incidono sul dispositivo quando 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_mode_eco_hint" msgid="5280058011809503514">"Il consumo energetico può aumentare in base al numero di funzionalità TV che attivi."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Attiva \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
-    <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Trova il mio telecomando"</string>
+    <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Trova il telecomando"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Riproduci un suono per trovare il tuo telecomando di Google TV se non sai dov\'è."</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Premi il pulsante sul retro di Google TV per riprodurre un suono per 30 secondi sul telecomando. Questa opzione è disponibile solo sui telecomandi di Google TV supportati.\n\nPer interrompere il suono, premi qualsiasi pulsante del telecomando."</string>
-    <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Quando l\'opzione Trova il mio telecomando è attivata, puoi riprodurre un suono per trovare il tuo telecomando di Google TV se non sai dov\'è."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Puoi premere un pulsante su Google TV che farà emettere un suono al telecomando per 30 secondi. Questa opzione è disponibile solo sui telecomandi di Google TV supportati.\n\nPer interrompere il suono, premi qualsiasi tasto del telecomando."</string>
+    <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Quando la funzionalità Trova il telecomando è attivata, puoi riprodurre un suono per trovare il tuo telecomando di Google TV se non sai dov\'è."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Riproduci suono"</string>
 </resources>
diff --git a/Settings/res/values-iw/energy-modes.xml b/Settings/res/values-iw/energy-modes.xml
index 807c403..af37608 100644
--- a/Settings/res/values-iw/energy-modes.xml
+++ b/Settings/res/values-iw/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"מצב צריכת אנרגיה נמוכה"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"עם תכונות רשת חיוניות"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"השבתת החיבור לרשת כשהטלוויזיה לא בשימוש (מצב המתנה)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"צריכה נמוכה"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"בהמתנה"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"בהמתנה — החיבור לרשת מושבת כשהטלוויזיה לא בשימוש"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"עדכונים קריטיים ופונקציות"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"מצב צריכת אנרגיה אופטימלית"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"עם תכונות רשת מומלצות"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"הפעלת תכונות שמוציאות את הטלוויזיה ממצב שינה באמצעות הרשת (המתנה להפעלה מהרשת)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"כל התכונות החיוניות"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"צריכה אופטימלית"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"המתנה להפעלה מהרשת"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"המתנה להפעלה מהרשת — מתן הרשאה לתכונות להוציא את הטלוויזיה ממצב שינה דרך הרשת"</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="6636328986387241066">"מצב צריכת אנרגיה מוגברת"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"עם תכונות רשת נוספות"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"הפעלת תכונות נוספות גם כשהטלוויזיה לא בשימוש."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"כל התכונות המומלצות"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"צריכה מוגברת"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"חיבור תמידי"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"חיבור תמידי — תכונות הרשת מופעלות כשהטלוויזיה לא בשימוש"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-iw/strings.xml b/Settings/res/values-iw/strings.xml
index 8f999cf..af31b29 100644
--- a/Settings/res/values-iw/strings.xml
+++ b/Settings/res/values-iw/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"הודעות משפטיות של Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"נתוני רישיון אינם זמינים"</string>
     <string name="about_model" msgid="9164284529291439296">"דגם"</string>
+    <string name="device_mode" msgid="7258350575590118152">"מצב המכשיר"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"הדגמה בחנות"</string>
     <string name="about_version" msgid="6223547403835399861">"גרסת מערכת הפעלה של Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"מספר סידורי"</string>
     <string name="about_build" msgid="8467840394761634575">"Build של מערכת הפעלה של Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"חיבור לאינטרנט"</string>
     <string name="connected" msgid="4981532275162345997">"מחובר"</string>
     <string name="not_connected" msgid="475810896484271663">"לא מחובר"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"אין חיבור לאינטרנט"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"נשמרו"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"הסיסמה שגויה"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"הסיסמה ל-Wi-Fi קצרה מדי"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"צריך להיכנס לחשבון"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"אפשרויות נוספות"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"הצגת הכול"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"הצג פחות"</string>
@@ -902,6 +909,13 @@
     <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">"שנה את מספר ה-PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"ליצור פרופיל מוגבל?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"הפרופיל כבר נוצר"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"דילוג"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"יצירת קוד אימות"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"להיכנס אל הפרופיל המוגבל?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"לא נמצא פרופיל מוגבל"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"כבר נכנסת"</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="pin_enter_unlock_channel" msgid="243855138978654080">"הזן מספר PIN לצפייה בערוץ הזה"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"המיקרופון המקליט"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"ניסיון ההפעלה של הקלטת האודיו נכשל."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"הקלטת האודיו נכשלה."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"חוסך הנתונים (Data Saver)"</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="bluetooth_ask_discovery_title" msgid="4955540555242269694">"רוצה שהמכשיר יהיה גלוי למכשירי Bluetooth נוספים?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"אפליקציה מסוימת רוצה להפוך את הטלפון שלך לגלוי בפני מכשירי Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"ההגדרות האלה משפיעות על המכשיר כשהוא לא בשימוש"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"תכונות מופעלות:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"חשוב לדעת: המצב הזה עשוי להגדיל את צריכת החשמל של המכשיר."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"צריכת החשמל עשויה לעלות ככל שמפעילים יותר תכונות בטלוויזיה."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"הפעלת מצב \'<xliff:g id="ENERGYMODENAME">%s</xliff:g>\'"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"איפה השלט שלי"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"ניתן להשמיע צליל כדי לאתר שלט רחוק של Google TV שאבד"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"לוחצים על הלחצן בחלק האחורי של Google TV כדי להשמיע צליל בשלט הרחוק למשך 30 שניות. הפעולה הזו עובדת רק בשלטים רחוקים נתמכים של Google TV.‏\n\nכדי להפסיק את הצליל, לוחצים על לחצן כלשהו בשלט."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"יש כפתור ב-Google TV שאפשר ללחוץ עליו כדי להשמיע צליל בשלט הרחוק למשך 30 שניות. הפעולה הזו עובדת רק בשלטים רחוקים נתמכים של Google TV.‏\n\nכדי להפסיק את הצליל, צריך ללחוץ על לחצן כלשהו בשלט."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"כשהתכונה \'איפה השלט שלי\' מופעלת, אפשר להשמיע צליל כדי לאתר שלט רחוק של Google TV שאבד."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"השמעת צליל"</string>
 </resources>
diff --git a/Settings/res/values-ja/arrays.xml b/Settings/res/values-ja/arrays.xml
index 36d6277..bfc8c00 100644
--- a/Settings/res/values-ja/arrays.xml
+++ b/Settings/res/values-ja/arrays.xml
@@ -43,7 +43,7 @@
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="890926483922346934">"デフォルト"</item>
     <item msgid="3343022995357433227">"Sans Serif"</item>
-    <item msgid="5638318073828379963">"Sans Serif Condensed"</item>
+    <item msgid="5638318073828379963">"Sans Serif コンデンス"</item>
     <item msgid="7195810992054707804">"Sans Serif 固定幅"</item>
     <item msgid="3746382747920668734">"Serif"</item>
     <item msgid="5506326688955062027">"Serif 固定幅"</item>
diff --git a/Settings/res/values-ja/energy-modes.xml b/Settings/res/values-ja/energy-modes.xml
index d16dad3..30039e3 100644
--- a/Settings/res/values-ja/energy-modes.xml
+++ b/Settings/res/values-ja/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"低エネルギー モード"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"必須のネットワーク機能を使用"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"テレビを使用していないとき（スタンバイ モード時）にネットワーク接続を無効にします。"</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"低"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"スタンバイ"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"スタンバイ — テレビを使用していないときにネットワーク接続を無効にします。"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"重要なアップデートと機能"</item>
+    <item msgid="4002284890471636101">"[機能 1 を挿入]"</item>
+    <item msgid="7072772341455731040">"[機能 2 を挿入]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"エネルギー最適化モード"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"推奨されるネットワーク機能を使用"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"ネットワーク経由でテレビを起動する機能（ネットワーク スタンバイ）を許可します。"</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"すべての必須機能"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"最適化済み"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"ネットワーク スタンバイ"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"ネットワーク スタンバイ — ネットワーク経由でテレビを起動する機能を有効にします"</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="6636328986387241066">"高エネルギー モード"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"追加のネットワーク機能を使用"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"テレビを使用していないときでも追加機能を許可します。"</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"すべての推奨機能"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"増加"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"常時接続"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"常時接続 — テレビを使用していないときにネットワーク機能を有効にします"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[機能 1 を挿入]"</item>
     <item msgid="170760143032597722">"[機能 2 を挿入]"</item>
diff --git a/Settings/res/values-ja/strings.xml b/Settings/res/values-ja/strings.xml
index 7e70626..079a093 100644
--- a/Settings/res/values-ja/strings.xml
+++ b/Settings/res/values-ja/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google 利用規約"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"ライセンスデータは使用できません"</string>
     <string name="about_model" msgid="9164284529291439296">"モデル"</string>
+    <string name="device_mode" msgid="7258350575590118152">"デバイスモード"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"ストアデモ"</string>
     <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>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"インターネット接続"</string>
     <string name="connected" msgid="4981532275162345997">"接続済み"</string>
     <string name="not_connected" msgid="475810896484271663">"未接続"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"インターネットに接続されていません"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"保存しました"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"パスワードが正しくありません"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi パスワードが短すぎます"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"ログインが必要です"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"その他のオプション"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"すべて表示"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"表示数を減らす"</string>
@@ -639,7 +646,7 @@
     <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">"ON にすると、マイクの使用を許可されたすべてのアプリとサービスがマイクにアクセスできるようになります。\n\nOFF にすると、すべてのアプリとサービスがマイクにアクセスできなくなります。ただし、リモコンの Google アシスタント ボタンを押して Google アシスタントに話しかけることはできます。\n\nAudio devices using 独自のプロトコルを使用してテレビと通信するオーディオ機器は、この設定に影響を受けません。"</string>
+    <string name="mic_toggle_info_content" msgid="3187791167208947239">"ON にすると、マイクの使用を許可されたすべてのアプリとサービスがマイクにアクセスできるようになります。\n\nOFF にすると、すべてのアプリとサービスがマイクにアクセスできなくなります。ただし、リモコンの 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 アシスタント ボタンを押してアシスタントに話しかけることができます。"</string>
     <string name="mic_remote_toggle_off_info_title" msgid="4902909833546393713">"リモコンのマイクが無効です"</string>
@@ -902,6 +909,13 @@
     <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">"PIN の変更"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"制限付きプロファイルの作成"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"すでに作成済み"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"スキップ"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"PIN を作成"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"制限付きプロファイルの入力"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"制限付きプロファイルなし"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"すでに入力済み"</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="pin_enter_unlock_channel" msgid="243855138978654080">"PINを入力してこのチャンネルを視聴"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"録音対象のマイク"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"録音を開始できませんでした。"</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"録音に失敗しました。"</string>
-    <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="bluetooth_ask_discovery_title" msgid="4955540555242269694">"他の Bluetooth デバイスに表示されるようにしますか？"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"アプリが <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒間他の Bluetooth デバイスにこのテレビを表示しようとしています。"</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"これらの設定は、使用していないデバイスに影響を与えます"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"有効になる機能:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"このモードにより、デバイスの電力消費量が増える場合があります。"</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"テレビの機能を有効にすると、その数に応じて電力消費量が増える場合があります。"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"「<xliff:g id="ENERGYMODENAME">%s</xliff:g>」の有効化"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"リモコンを探す"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Google TV リモコンの場所がわからなくなったときに、リモコンから音を鳴らして探せるようにします"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Google TV の背面にあるボタンを押すと、リモコンから 30 秒間音が鳴ります。この機能を使用できるのは、対応する Google TV リモコンのみです。\n\n音を止めるには、リモコンのいずれかのボタンを押します。"</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Google TV のこのボタンを押すと、リモコンから 30 秒間音が鳴ります。この機能を使用できるのは、対応する Google TV リモコンのみです。\n\n音を止めるには、リモコンのいずれかのボタンを押します。"</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"「リモコンを探す」機能が有効の場合は、Google TV リモコンの場所がわからなくなったときにリモコンから音を鳴らして探すことができます。"</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"音を鳴らす"</string>
 </resources>
diff --git a/Settings/res/values-ka/energy-modes.xml b/Settings/res/values-ka/energy-modes.xml
index 0c6364f..9c04b40 100644
--- a/Settings/res/values-ka/energy-modes.xml
+++ b/Settings/res/values-ka/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"დაბალი ენერგიის რეჟიმი"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"ქსელის არსებითი ფუნქციებით"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"ქსელთან კავშირის გამორთვა, როცა ტელევიზორს არ იყენებთ (მოლოდინის რეჟიმი)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"დაბალი"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"მოლოდინის რეჟიმი"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"მოლოდინის რეჟიმი — ქსელთან კავშირი გამორთულია, როდესაც ტელევიზორი არ გამოიყენება"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"კრიტიკული განახლებები და ფუნქციები"</item>
+    <item msgid="4002284890471636101">"[ფუნქცია 1-ის ჩასმა]"</item>
+    <item msgid="7072772341455731040">"[ფუნქცია 2-ის ჩასმა]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"ენერგიის ოპტიმიზირებული რეჟიმი"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"ქსელის რეკომენდებული ფუნქციებით"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"საშუალებას აძლევს ფუნქციებს, გააღვიძოს ტელევიზორი ქსელში (ქსელური მოლოდინის რეჟიმი)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"ყველა ძირითადი ფუნქცია"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"ოპტიმიზებული"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"ქსელური მოლოდინის რეჟიმი"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"ქსელური მოლოდინის რეჟიმი — საშუალებას აძლევს ფუნქციებს ქსელის საშუალებით ჩართოს ტელევიზორი"</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="6636328986387241066">"გაზრდილი ენერგიის რეჟიმი"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"ქსელის დამატებითი ფუნქციებით"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"იძლევა დამატებითი ფუნქციების საშუალებას მაშინაც კი, როდესაც ტელევიზორი არ გამოიყენება."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"ყველა რეკომენდებული ფუნქცია"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"გაზრდილი"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"ყოველთვის დაკავშირებული"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"ყოველთვის დაკავშირებული — ირთვება ქსელის ფუნქციები, როდესაც ტელევიზორი არ გამოიყენება"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[ფუნქცია 1-ის ჩასმა]"</item>
     <item msgid="170760143032597722">"[ფუნქცია 2-ის ჩასმა]"</item>
diff --git a/Settings/res/values-ka/strings.xml b/Settings/res/values-ka/strings.xml
index 8d3c196..1df28a8 100644
--- a/Settings/res/values-ka/strings.xml
+++ b/Settings/res/values-ka/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google-ის სამართლებრივი ინფორმაცია"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"სალიცენზიო მონაცემები მიუწვდომელია"</string>
     <string name="about_model" msgid="9164284529291439296">"მოდელი"</string>
+    <string name="device_mode" msgid="7258350575590118152">"მოწყობილობის რეჟიმი"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Store-ის დემო"</string>
     <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 build"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"ინტერნეტ კავშირი"</string>
     <string name="connected" msgid="4981532275162345997">"შეერთებულია"</string>
     <string name="not_connected" msgid="475810896484271663">"არაა კავშირი"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"ინტერნეტთან კავშირი არ არის"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"შენახული"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"პაროლი არასწორია"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi ქსელის პაროლი ზედმეტად მოკლეა"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"აუცილებელია შესვლა"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"სხვა პარამეტრები"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"ყველას ჩვენება"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"ნაკლების ნახვა"</string>
@@ -902,6 +909,13 @@
     <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">"PIN-ის შეცვლა"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"შეიქმნას შეზღუდული პროფილი?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"უკვე შექმნილია"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"გამოტოვება"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"PIN-კოდის შექმნა"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"გსურთ შეზღ. პროფილში შესვლა?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"შეზღუდული პროფილი არ არის"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"უკვე შეყვანილია"</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="pin_enter_unlock_channel" msgid="243855138978654080">"შეიყვანეთ PIN ამ არხის საყურებლად"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"ჩაწერილი მიკროფონ(ებ)ი"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"აუდიოს ჩაწერის დაწყება ვერ მოხერხდა."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"აუდიოს ჩაწერა ვერ მოხერხდა."</string>
-    <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-ის, Ethernet-ის ან თქვენი ტელეფონის უსადენო ქსელის მეშვეობით."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"გსურთ, გახადოთ ის ხილული სხვა Bluetooth მოწყობილობისთვის?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"აპს სურს, გახადოს თქვენი ტაბლეტი ხილვადი სხვა Bluetooth მოწყობილობებისთვის <xliff:g id="TIMEOUT">%1$d</xliff:g> წამით."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"ეს პარამეტრები გავლენას ახდენს მოწყობილობაზე, როდესაც ის არ გამოიყენება"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"ჩაირთვება:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"გახსოვდეთ, რომ ამ რეჟიმმა შესაძლოა გაზარდოს ელექტროენერგიის მოხმარება."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"თქვენ მიერ ჩართული ტელევიზორის ფუნქციების რაოდენობის შესაბამისად შეიძლება გაიზარდოს ენერგომოხმარება."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"ჩაირთოს „<xliff:g id="ENERGYMODENAME">%s</xliff:g>“?"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"იპოვეთ ჩემი დისტანციური მართვის პულტი"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"დაუკარით ხმა Google TV-ის დისტანციური მართვის პულტის მოსაძებნად, თუ ის დაკარგეთ"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"დააჭირეთ ღილაკს Google TV-ის გამშვების უკანა მხარეს, რათა დაუკრათ ხმა დისტანციური მართვის პულტზე 30 წამის განმავლობაში. ეს მუშაობს მხოლოდ Google TV-ს მხარდაჭერილი დისტანციური მართვის პულტის მეშვეობით.\n\nხმის შესაჩერებლად დააჭირეთ ნებისმიერ ღილაკს თქვენი დისტანციუი მართვის პულტზე."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"თქვენს Google TV-ზე არის ღილაკი, რომლის დაჭერითაც შეგიძლიათ თქვენს დისტანციური მართვის პულტზე ხმოვანი სიგნალის დაკვრა 30 წამით. ეს ფუნქცია მუშაობს მხოლოდ Google TV-ის მხარდაჭერილი დისტანციური მართვის პულტის მეშვეობით.\n\nხმოვანი სიგნალის შესაჩერებლად დააჭირეთ ნებისმიერ ღილაკს თქვენს დისტანციურ მართვის პულტზე."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"როდესაც ჩართულია „ჩემი დისტანციური მართვის პულტის პოვნა”, შეგიძლიათ დაუკრათ ხმა თქვენი Google TV დისტანციური მართვის პულტის მდებარეობის დასადგენად, თუ კი მას ვერ პოულობთ."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"ხმის დაკვრა"</string>
 </resources>
diff --git a/Settings/res/values-kk/energy-modes.xml b/Settings/res/values-kk/energy-modes.xml
index c3c66af..5c0855e 100644
--- a/Settings/res/values-kk/energy-modes.xml
+++ b/Settings/res/values-kk/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Төмен қуат режимі"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"маңызды желілік функциялары бар"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Теледидар пайдаланылмаған кезде (күту режимі кезінде), желі байланысын ажыратыңыз."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Төмен"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Күту режимі"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Күту режимі: теледидар өшірулі тұрғанда, желі байланысы да өшеді."</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Аса маңызды жаңартулар мен функциялар"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Оңтайландырылған қуат режимі"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"ұсынылатын желілік функциялары бар"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Функцияларға теледидарды желі арқылы оятуға (желілік күту режимі) мүмкіндік береді."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Барлық маңызды функция"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Оңтайландырылған"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Желілік күту режимі"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Желілік күту режимі: теледидарды желі арқылы ояту үшін функцияларды іске қосады."</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="6636328986387241066">"Жоғары қуат режимі"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"қосымша желілік функциялары бар"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Теледидар пайдаланылмаған кезде де, қосымша функцияларды пайдалануға мүмкіндік береді."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Барлық ұсынылған функция"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Жоғары"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Тұрақты байланыс"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Тұрақты байланыс режимі: теледидар өшірулі тұрғанда, желі функцияларын іске қосады."</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-kk/strings.xml b/Settings/res/values-kk/strings.xml
index 1d3cc5b..04b973c 100644
--- a/Settings/res/values-kk/strings.xml
+++ b/Settings/res/values-kk/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google құқықтық ақпараты"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Лицензия деректері қол жетімді емес"</string>
     <string name="about_model" msgid="9164284529291439296">"Үлгі"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Құрылғы режимі"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Дүкеннің демо нұсқасы"</string>
     <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>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Интернет байланысы"</string>
     <string name="connected" msgid="4981532275162345997">"Қосылды"</string>
     <string name="not_connected" msgid="475810896484271663">"Қосылмаған"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Интернет жоқ."</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Сақталған"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Құпия сөз қате енгізілді."</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi құпия сөзі тым қысқа."</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Есептік жазбаға кіру керек."</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Басқа опциялар"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Барлығын көру"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Азайту"</string>
@@ -750,7 +757,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>
@@ -902,6 +909,13 @@
     <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">"PIN кодын өзгерту"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Шектелген профиль жасалсын ба?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Жасалып қойған"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Өткізіп жіберу"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"PIN кодын жасау"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Шектелген профиль қосылсын ба?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Шектелген профиль жоқ."</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Енгізіліп қойған"</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="pin_enter_unlock_channel" msgid="243855138978654080">"Осы арнаны көру үшін PIN кодын енгізіңіз"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Жазуға арналған микрофондар"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Аудионы жазуды бастау мүмкін болмады."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Аудио жазылмады."</string>
-    <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, Ethernet немесе телефонның хотспоты арқылы интернетке қосыла аласыз."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Басқа Bluetooth құрылғыларына көрінсін бе?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Қолданба теледидарыңызды басқа Bluetooth құрылғыларына <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд көрсетуді сұрайды."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Бұл параметрлер, құрылғыны пайдаланбағанда, әсер етеді."</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"Келесілер қосылады:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Бұл режим құрылғы тұтынатын қуат мөлшерін арттыруы мүмкін екенін ескеріңіз."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"Сіз іске қосқан теледидар функцияларының саны артқан сайын, қуаттың тұтынылуы да артуы мүмкін."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" режимін қосу"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Пультімді табу"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Google TV пультіңіз жоғалып қалса, оны табу үшін дыбысты ойнатыңыз."</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Пультіңізде 30 секундтық дыбыс ойнату үшін Google TV-дің артқы жағындағы түймені басыңыз. Бұл функция қолдау көрсетілетін Google TV пульттерінде ғана жұмыс істейді.\n\nДыбысты тоқтату үшін пульттің кез келген түймесін басыңыз."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Пультіңізде 30 секундтық дыбыс ойнату үшін Google TV қолданбасындағы түймені бассаңыз болады. Бұл функция қолдау көрсетілетін Google TV пульттерінде ғана жұмыс істейді.\n\nДыбысты тоқтату үшін пульттің кез келген түймесін басыңыз."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"\"Пультімді табу\" функциясы қосулы тұрған кезде, жоғалған Google TV пультін оңай табуға көмектесетін дыбысты ойнатуға болады."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Дыбыс ойнату"</string>
 </resources>
diff --git a/Settings/res/values-km/energy-modes.xml b/Settings/res/values-km/energy-modes.xml
index ff0d677..4835233 100644
--- a/Settings/res/values-km/energy-modes.xml
+++ b/Settings/res/values-km/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"មុខងារថាមពលទាប"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"មានមុខងារបណ្ដាញសំខាន់ៗ"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"បិទការតភ្ជាប់បណ្ដាញ នៅពេលមិនប្រើទូរទស្សន៍ (មុខងារ​សម្ងំ)។"</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"ទាប"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"សម្ងំ"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"សម្ងំ — ការតភ្ជាប់​បណ្ដាញ​ត្រូវបានបិទ នៅពេលដែល​ទូរទស្សន៍​មិនស្ថិត​ក្នុងការប្រើប្រាស់"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"ការដំឡើងកំណែ និងមុខងារសំខាន់ខ្លាំង"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"មុខងារថាមពលដែលបានបង្កើនប្រសិទ្ធភាព"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"មានមុខងារបណ្ដាញដែលបានណែនាំ"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"អនុញ្ញាតឱ្យមុខងារដាស់ទូរទស្សន៍នៅលើបណ្តាញ (សម្ងំភ្ជាប់)។"</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"មុខងារសំខាន់ៗទាំងអស់"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"បានបង្កើន​ប្រសិទ្ធភាព"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"សម្ងំ​ភ្ជាប់"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"សម្ងំ​ភ្ជាប់ — បើក​មុខងារ ដើម្បីដាស់​ទូរទស្សន៍​តាមរយៈ​បណ្ដាញ"</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="6636328986387241066">"មុខងារថាមពលដែលបានបង្កើន"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"មានមុខងារបណ្ដាញបន្ថែម"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"អនុញ្ញាត​មុខងារ​បន្ថែម​ សូម្បី​នៅពេលមិនកំពុងប្រើ​ទូរទស្សន៍​ក៏ដោយ។"</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"មុខងារដែលបានណែនាំ​ទាំងអស់"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"បានបង្កើន"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"ភ្ជាប់​ជានិច្ច"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"ភ្ជាប់​ជានិច្ច — បើក​មុខងារ​បណ្ដាញ នៅពេលដែល​ទូរទស្សន៍​មិនស្ថិត​ក្នុងការប្រើប្រាស់"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[បញ្ចូលមុខងារទី 1]"</item>
     <item msgid="170760143032597722">"[បញ្ចូលមុខងារទី 2]"</item>
diff --git a/Settings/res/values-km/strings.xml b/Settings/res/values-km/strings.xml
index 728346d..2e0fb52 100644
--- a/Settings/res/values-km/strings.xml
+++ b/Settings/res/values-km/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"ផ្នែកច្បាប់ Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"មិន​មាន​ទិន្នន័យ​អាជ្ញាប័ណ្ណ​ទេ"</string>
     <string name="about_model" msgid="9164284529291439296">"ម៉ូដែល"</string>
+    <string name="device_mode" msgid="7258350575590118152">"មុខងារឧបករណ៍"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"គំរូបង្ហាញក្នុងហាង"</string>
     <string name="about_version" msgid="6223547403835399861">"កំណែប្រព័ន្ធ​ប្រតិបត្តិការ Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"លេខ​សៀរៀល"</string>
     <string name="about_build" msgid="8467840394761634575">"កំណែបង្កើត​ប្រព័ន្ធប្រតិបត្តិការ Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"ការ​តភ្ជាប់​អ៊ីនធឺណិត"</string>
     <string name="connected" msgid="4981532275162345997">"បាន​ត​ភ្ជាប់"</string>
     <string name="not_connected" msgid="475810896484271663">"មិន​បាន​តភ្ជាប់"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"គ្មាន​អ៊ីនធឺណិត"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"បាន​រក្សាទុក"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"ពាក្យសម្ងាត់មិនត្រឹមត្រូវ"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"ពាក្យសម្ងាត់ Wi-Fi ខ្លីពេក"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"តម្រូវឱ្យ​ចូលគណនី"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"ជម្រើស​ផ្សេង​ៗ"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"​មើល​ទាំង​អស់"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"មើលតិចជាងមុន"</string>
@@ -902,6 +909,13 @@
     <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">"ប្ដូរ​កូដ pin"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"បង្កើតកម្រងព័ត៌មានដែលបានដាក់កំហិតឬ?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"បានបង្កើតរួចហើយ"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"រំលង"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"បង្កើតកូដ PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"បញ្ចូលកម្រងព័ត៌មានដែលបានដាក់កំហិតឬ?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"គ្មានកម្រងព័ត៌មានដែលបានដាក់កំហិតទេ"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"បានបញ្ចូលរួចហើយ"</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="pin_enter_unlock_channel" msgid="243855138978654080">"បញ្ចូល​កូដ PIN ដើម្បី​មើល​ឆានែល​នេះ"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"មីក្រូហ្វូន​ដែល​បានថត"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"មិនអាច​ចាប់ផ្ដើម​ថតសំឡេង​បានទេ។"</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"ការថតសំឡេង​មិនបាន​សម្រេចទេ។"</string>
-    <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="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>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"ការកំណត់​ទាំងនេះ​ប៉ះពាល់ដល់​ឧបករណ៍ នៅពេល​ដែលមិន​ស្ថិតក្នុងការ​ប្រើប្រាស់"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"បើក៖"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"សូមកត់ចំណាំថា មុខងារនេះអាចបង្កើនការប្រើប្រាស់ថាមពលរបស់ឧបករណ៍។"</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"ការប្រើប្រាស់​ថាមពល​អាចកើនឡើង​ដោយសារ​ចំនួន​មុខងារ​ទូរទស្សន៍​ដែលអ្នកបើក។"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"បើក \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"ស្វែងរកឧបករណ៍​បញ្ជាពីចម្ងាយរបស់ខ្ញុំ"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"ចាក់សំឡេងណាមួយ ដើម្បីកំណត់ទីតាំងឧបករណ៍​បញ្ជាពីចម្ងាយសម្រាប់ Google TV របស់អ្នក ប្រសិនបើបាត់ឧបករណ៍នោះ"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"ចុចប៊ូតុងនៅផ្នែកខាងក្រោយនៃ Google TV របស់អ្នក ដើម្បីចាក់សំឡេងនៅលើឧបករណ៍​បញ្ជាពីចម្ងាយរយៈពេល 30 វិនាទី។ សកម្មភាពនេះដំណើរការតែជាមួយនឹងឧបករណ៍​​បញ្ជា​ Google TV ពី​ចម្ងាយដែលអាចប្រើបានប៉ុណ្ណោះ។\n\nដើម្បីបញ្ឈប់សំឡេង សូមចុចប៊ូតុងណាមួយលើឧបករណ៍​បញ្ជាពីចម្ងាយរបស់អ្នក។"</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"មានប៊ូតុង​នៅលើ Google TV របស់អ្នក​ដែលអ្នកអាច​ចុចដើម្បីចាក់​សំឡេង​នៅលើ​ឧបករណ៍​បញ្ជាពីចម្ងាយ​របស់អ្នក​រយៈពេល 30 វិនាទី។ សកម្មភាពនេះដំណើរការតែជាមួយនឹងឧបករណ៍​​បញ្ជា​ Google TV ពី​ចម្ងាយដែលអាចប្រើបានប៉ុណ្ណោះ។\n\nដើម្បីបញ្ឈប់សំឡេង សូមចុចប៊ូតុងណាមួយលើឧបករណ៍​បញ្ជាពីចម្ងាយរបស់អ្នក។"</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"នៅពេលបើក \"រកឧបករណ៍​បញ្ជាពីចម្ងាយរបស់ខ្ញុំ\" អ្នកអាចចាក់សំឡេងណាមួយ ដើម្បីកំណត់ទីតាំងឧបករណ៍​បញ្ជាពីចម្ងាយសម្រាប់ Google TV របស់អ្នក ប្រសិនបើបាត់ឧបករណ៍នោះ។"</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"ចាក់​សំឡេង"</string>
 </resources>
diff --git a/Settings/res/values-kn/energy-modes.xml b/Settings/res/values-kn/energy-modes.xml
index 0a80f29..81825d4 100644
--- a/Settings/res/values-kn/energy-modes.xml
+++ b/Settings/res/values-kn/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"ಕಡಿಮೆ ಶಕ್ತಿಯ ಮೋಡ್"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"ಅವಶ್ಯಕ ನೆಟ್‌ವರ್ಕ್ ಫೀಚರ್‌ಗಳ ಜೊತೆಗೆ"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"ಟಿವಿ ಬಳಕೆಯಲ್ಲಿ ಇಲ್ಲದಿದ್ದಾಗ ನೆಟ್‌ವರ್ಕ್ ಕನೆಕ್ಷನ್ ಅನ್ನು ಆಫ್ ಮಾಡಿ (ಸ್ಟ್ಯಾಂಡ್‌ಬೈ ಮೋಡ್)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"ಕಡಿಮೆ"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"ಸ್ಟ್ಯಾಂಡ್‌ಬೈ"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"ಸ್ಟ್ಯಾಂಡ್‌ಬೈ — ಟಿವಿ ಬಳಕೆಯಲ್ಲಿಲ್ಲದಿದ್ದಾಗ ನೆಟ್‌ವರ್ಕ್ ಕನೆಕ್ಷನ್ ಆಫ್ ಆಗಿರುತ್ತದೆ"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"ಮಹತ್ವದ ಅಪ್‌ಡೇಟ್‌ಗಳು ಹಾಗೂ ಫಂಕ್ಷನ್‌ಗಳು"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾದ ಶಕ್ತಿಯ ಮೋಡ್"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"ಶಿಫಾರಸು ಮಾಡಲಾದ ನೆಟ್‌ವರ್ಕ್ ಫೀಚರ್‌ಗಳ ಜೊತೆಗೆ"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"ನೆಟ್‌ವರ್ಕ್ ಮೂಲಕ ಟಿವಿಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಫೀಚರ್‌ಗಳನ್ನು ಅನುಮತಿಸುತ್ತದೆ (ನೆಟ್‍ವರ್ಕ್‌ಡ್ ಸ್ಟ್ಯಾಂಡ್‌ಬೈ)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"ಅಗತ್ಯವಿರುವ ಎಲ್ಲಾ ಫೀಚರ್‌ಗಳು"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"ನೆಟ್‍ವರ್ಕ್‌ಡ್ ಸ್ಟ್ಯಾಂಡ್‌ಬೈ"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"ನೆಟ್‍ವರ್ಕ್‌ಡ್ ಸ್ಟ್ಯಾಂಡ್‌ಬೈ — ನೆಟ್‌ವರ್ಕ್‌ನಲ್ಲಿ ಟಿವಿಯನ್ನು ಎಚ್ಚರಗೊಳಿಸಲು ಫೀಚರ್‌ಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ"</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="6636328986387241066">"ಅಧಿಕ ಶಕ್ತಿಯ ಮೋಡ್"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"ಹೆಚ್ಚುವರಿ ನೆಟ್‌ವರ್ಕ್ ಫೀಚರ್‌ಗಳ ಜೊತೆಗೆ"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"ಟಿವಿ ಬಳಕೆಯಲ್ಲಿಲ್ಲದಿದ್ದರೂ ಹೆಚ್ಚುವರಿ ಫೀಚರ್‌ಗಳನ್ನು ಅನುಮತಿಸುತ್ತದೆ."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"ಶಿಫಾರಸು ಮಾಡಲಾದ ಎಲ್ಲಾ ಫೀಚರ್‌ಗಳು"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"ಹೆಚ್ಚಿಸಲಾಗಿದೆ"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"ಯಾವಾಗಲೂ ಕನೆಕ್ಟ್ ಆಗಿರುತ್ತದೆ"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"ಯಾವಾಗಲೂ ಕನೆಕ್ಟ್ ಆಗಿರುತ್ತದೆ — ಟಿವಿ ಬಳಕೆಯಲ್ಲಿಲ್ಲದಿದ್ದಾಗ ನೆಟ್‌ವರ್ಕ್ ಫೀಚರ್‌ಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[ಫೀಚರ್ 1 ಸೇರಿಸಿ]"</item>
     <item msgid="170760143032597722">"[ಫೀಚರ್ 2 ಸೇರಿಸಿ]"</item>
diff --git a/Settings/res/values-kn/strings.xml b/Settings/res/values-kn/strings.xml
index 9bd1600..a7874f8 100644
--- a/Settings/res/values-kn/strings.xml
+++ b/Settings/res/values-kn/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google ಕಾನೂನು"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"ಪರವಾನಗಿ ಡೇಟಾ ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="about_model" msgid="9164284529291439296">"ಮಾದರಿ"</string>
+    <string name="device_mode" msgid="7258350575590118152">"ಸಾಧನ ಮೋಡ್‌"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"ಸ್ಟೋರ್ ಡೆಮೋ"</string>
     <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>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕ"</string>
     <string name="connected" msgid="4981532275162345997">"ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
     <string name="not_connected" msgid="475810896484271663">"ಸಂಪರ್ಕಗೊಂಡಿಲ್ಲ"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"ಇಂಟರ್ನೆಟ್ ಇಲ್ಲ"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"ಸೇವ್ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"ತಪ್ಪಾದ ಪಾಸ್‌ವರ್ಡ್‌"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"ವೈ-ಫೈ ಪಾಸ್‌ವರ್ಡ್ ತುಂಬಾ ಚಿಕ್ಕದಾಗಿದೆ"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"ಸೈನ್-ಇನ್ ಅಗತ್ಯವಿದೆ"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"ಇತರ ಆಯ್ಕೆಗಳು"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"ಎಲ್ಲವನ್ನೂ ನೋಡಿ"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"ಸ್ವಲ್ಪ ವೀಕ್ಷಿಸಿ"</string>
@@ -902,6 +909,13 @@
     <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>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"ನಿರ್ಬಂಧಿತ ಪ್ರೊಫೈಲ್ ರಚಿಸಬೇಕೆ?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"ಈಗಾಗಲೇ ರಚಿಸಲಾಗಿದೆ"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"ಸ್ಕಿಪ್ ಮಾಡಿ"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"ಪಿನ್ ಅನ್ನು ರಚಿಸಿ"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"ನಿರ್ಬಂಧಿತ ಪ್ರೊಫೈಲ್ ನಮೂದಿಸಬೇಕೆ?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"ಯಾವುದೇ ನಿರ್ಬಂಧಿತ ಪ್ರೊಫೈಲ್ ಇಲ್ಲ"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"ಈಗಾಗಲೇ ನಮೂದಿಸಲಾಗಿದೆ"</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="pin_enter_unlock_channel" msgid="243855138978654080">"ಈ ಚಾನಲ್ ವೀಕ್ಷಿಸಲು PIN ನಮೂದಿಸಿ"</string>
@@ -917,7 +931,7 @@
     <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>
     <string name="wifi_setup_connection_success" msgid="3301901673876973474">"ಯಶಸ್ವಿಯಾಗಿ ಸಂಪರ್ಕಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="wifi_setup_save_success" msgid="6862510218032734919">"ಯಶಸ್ವಿಯಾಗಿ ಉಳಿಸಲಾಗಿದೆ"</string>
+    <string name="wifi_setup_save_success" msgid="6862510218032734919">"ಯಶಸ್ವಿಯಾಗಿ ಸೇವ್ ಮಾಡಲಾಗಿದೆ"</string>
     <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>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"ರೆಕಾರ್ಡ್ ಮಾಡಲಾದ ಮೈಕ್ರೊಫೋನ್(ಗಳು)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"ಆಡಿಯೋ ರೆಕಾರ್ಡಿಂಗ್ ಪ್ರಾರಂಭಿಸುವಾಗ ವಿಫಲವಾಗಿದೆ"</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"ಆಡಿಯೋ ರೆಕಾರ್ಡಿಂಗ್ ವಿಫಲವಾಗಿದೆ"</string>
-    <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">"ವೈ-ಫೈ, ಇಥರ್ನೆಟ್ ಅಥವಾ ನಿಮ್ಮ ಫೋನ್‌ನ ಹಾಟ್‌ಸ್ಪಾಟ್ ಮೂಲಕ ನೀವು ಇಂಟರ್ನೆಟ್‌ಗೆ ಕನೆಕ್ಟ್ ಮಾಡಬಹುದು."</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>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"ಬಳಕೆಯಲ್ಲಿಲ್ಲದಿದ್ದಾಗ ಈ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಸಾಧನದ ಮೇಲೆ ಪರಿಣಾಮ ಬೀರುತ್ತವೆ"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"ಇವುಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ಈ ಮೋಡ್, ಸಾಧನದ ವಿದ್ಯುತ್ ಬಳಕೆಯನ್ನು ಹೆಚ್ಚಿಸಬಹುದು ಎಂಬುದನ್ನು ಗಮನಿಸಿ."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"ನೀವು ಸಕ್ರಿಯಗೊಳಿಸುವ ಟಿವಿ ಫೀಚರ್‌ಗಳ ಸಂಖ್ಯೆಯ ಮೂಲಕ ವಿದ್ಯುತ್ ಬಳಕೆಯು ಹೆಚ್ಚಾಗಬಹುದು."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"ನನ್ನ ರಿಮೋಟ್ ಅನ್ನು ಹುಡುಕಿ"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"ನಿಮ್ಮ Google TV ರಿಮೋಟ್ ಕಳೆದುಹೋದರೆ ಅದನ್ನು ಪತ್ತೆಹಚ್ಚಲು ಸೌಂಡ್ ಅನ್ನು ಪ್ಲೇ ಮಾಡಿ"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"30 ಸೆಕೆಂಡ್‌ಗಳ ಕಾಲ ನಿಮ್ಮ ರಿಮೋಟ್‌ನಲ್ಲಿ ಸೌಂಡ್ ಅನ್ನು ಪ್ಲೇ ಮಾಡಲು ನಿಮ್ಮ Google TV ಯ ಹಿಂಭಾಗದಲ್ಲಿರುವ ಬಟನ್ ಅನ್ನು ಒತ್ತಿರಿ. ಇದು ಬೆಂಬಲಿತ Google TV ರಿಮೋಟ್ ಕಂಟ್ರೋಲ್‌ಗಳಲ್ಲಿ ಮಾತ್ರ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತದೆ.\n\nಸೌಂಡ್ ಅನ್ನು ನಿಲ್ಲಿಸಲು, ನಿಮ್ಮ ರಿಮೋಟ್‌ನಲ್ಲಿರುವ ಯಾವುದೇ ಬಟನ್ ಅನ್ನು ಒತ್ತಿರಿ."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"ನಿಮ್ಮ Google TV ಯಲ್ಲಿ 30 ಸೆಕೆಂಡ್‌ಗಳ ಕಾಲ ನಿಮ್ಮ ರಿಮೋಟ್‌ನಲ್ಲಿ ಸೌಂಡ್ ಅನ್ನು ಪ್ಲೇ ಮಾಡಲು ನೀವು ಪುಶ್ ಮಾಡಬಹುದಾದ ಬಟನ್ ಇದೆ. ಇದು ಬೆಂಬಲಿತ Google TV ರಿಮೋಟ್ ಕಂಟ್ರೋಲ್‌ಗಳಲ್ಲಿ ಮಾತ್ರ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತದೆ.\n\nಸೌಂಡ್ ಅನ್ನು ನಿಲ್ಲಿಸಲು, ನಿಮ್ಮ ರಿಮೋಟ್‌ನಲ್ಲಿರುವ ಯಾವುದೇ ಬಟನ್ ಅನ್ನು ಒತ್ತಿ."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"ನನ್ನ ರಿಮೋಟ್ ಅನ್ನು ಹುಡುಕಿ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿದಾಗ, ನಿಮ್ಮ Google TV ರಿಮೋಟ್ ಕಳೆದುಹೋದರೆ ಅದನ್ನು ಪತ್ತೆಹಚ್ಚಲು ನೀವು ಸೌಂಡ್ ಅನ್ನು ಪ್ಲೇ ಮಾಡಬಹುದು."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"ಸೌಂಡ್ ಅನ್ನು ಪ್ಲೇ ಮಾಡಿ"</string>
 </resources>
diff --git a/Settings/res/values-ko/energy-modes.xml b/Settings/res/values-ko/energy-modes.xml
index ecc4ce1..75969cb 100644
--- a/Settings/res/values-ko/energy-modes.xml
+++ b/Settings/res/values-ko/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"저전력 모드"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"필수 네트워크 기능 제공"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"TV를 사용하지 않을 때(대기 모드)는 네트워크 연결을 사용 중지합니다."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"낮음"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"대기"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"대기 모드 - TV를 사용하지 않을 때는 네트워크 연결이 끊어집니다."</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"중요 업데이트 및 기능"</item>
+    <item msgid="4002284890471636101">"[기능 1 삽입]"</item>
+    <item msgid="7072772341455731040">"[기능 2 삽입]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"전력 최적화 모드"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"추천 네트워크 기능 제공"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"네트워크를 통해 TV의 절전 모드를 해제하는 기능(네트워크 대기 모드) 사용을 허용합니다."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"모든 필수 기능"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"최적화됨"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"네트워크 대기 모드"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"네트워크 대기 모드 - 네트워크에 연결된 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="6636328986387241066">"고전력 모드"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"추가 네트워크 기능 제공"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"TV를 사용하지 않을 때에도 추가 기능 사용을 허용합니다."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"모든 추천 기능"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"증가함"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"항상 연결됨"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"항상 연결됨 - TV를 사용하지 않을 때에도 네트워크 기능을 사용합니다."</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[기능 1 삽입]"</item>
     <item msgid="170760143032597722">"[기능 2 삽입]"</item>
diff --git a/Settings/res/values-ko/strings.xml b/Settings/res/values-ko/strings.xml
index 7b9cd56..c62f0ac 100644
--- a/Settings/res/values-ko/strings.xml
+++ b/Settings/res/values-ko/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google 법적 고지"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"라이선스 데이터를 사용할 수 없습니다."</string>
     <string name="about_model" msgid="9164284529291439296">"모델"</string>
+    <string name="device_mode" msgid="7258350575590118152">"기기 모드"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"데모 저장"</string>
     <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>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"인터넷 연결"</string>
     <string name="connected" msgid="4981532275162345997">"연결됨"</string>
     <string name="not_connected" msgid="475810896484271663">"연결되지 않음"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"인터넷 연결 없음"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"저장됨"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"잘못된 비밀번호"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi 비밀번호가 너무 짧음"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"로그인 필요"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"기타 옵션"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"모두 보기"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"간략히 보기"</string>
@@ -902,6 +909,13 @@
     <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">"PIN 변경"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"제한된 프로필을 만드시겠습니까?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"이미 생성함"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"건너뛰기"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"PIN 만들기"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"제한된 프로필로 전환하시겠습니까?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"제한된 프로필 없음"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"이미 입력함"</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="pin_enter_unlock_channel" msgid="243855138978654080">"PIN을 입력하여 이 채널 시청"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"녹음된 마이크"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"오디오 녹음을 시작할 수 없습니다."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"오디오를 녹음할 수 없습니다."</string>
-    <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="bluetooth_ask_discovery_title" msgid="4955540555242269694">"다른 블루투스 기기에 표시하시겠습니까?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"앱에서 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 블루투스 기기에 내 TV가 표시되도록 설정하려고 합니다."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"다음 설정은 사용 중이지 않은 기기에 영향을 줍니다"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"사용 설정되는 기능:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"이 모드로 인해 기기의 전력 소비량이 증가할 수 있습니다."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"사용 설정하는 TV 기능의 수에 따라 전력 소비량이 증가할 수 있습니다."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\'<xliff:g id="ENERGYMODENAME">%s</xliff:g>\' 사용 설정"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"내 리모컨 찾기"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Google TV 리모컨을 잃어버린 경우 소리를 재생하여 위치 찾기"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Google TV 뒷면에 있는 버튼을 누르면 리모컨에서 30초 동안 소리가 재생됩니다. 이 기능은 지원되는 Google TV 리모컨에서만 작동합니다.\n\n소리 재생을 중지하려면 리모컨의 아무 버튼이나 누르세요."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Google TV에 있는 버튼을 누르면 리모컨에서 30초 동안 소리가 울립니다. 이 기능은 지원되는 Google TV 리모컨에서만 작동합니다.\n\n소리 재생을 중지하려면 리모컨의 아무 버튼이나 누르세요."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"내 리모컨 찾기를 사용 설정하면 리모컨을 어디 두었는지 찾을 수 없을 때 소리를 재생하여 Google TV 리모컨을 찾을 수 있습니다."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"소리 재생"</string>
 </resources>
diff --git a/Settings/res/values-ky/energy-modes.xml b/Settings/res/values-ky/energy-modes.xml
index d739581..09cf79f 100644
--- a/Settings/res/values-ky/energy-modes.xml
+++ b/Settings/res/values-ky/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Төмөн энергия режими"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"негизги тармактык функциялар менен"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Сыналгы колдонулбай турганда (көшүү режими) тармактан ажыратыңыз."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Төмөн"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Көшүү режими"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Көшүү режими — сыналгы өчүк учурда тармакка туташуу өчүк болот"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Маанилүү жаңыртууларды жана функцияларды"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Оптималдаштырылган энергия режими"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"сунушталган тармактык функциялар менен"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Сыналгыны күтүү режиминен тармак аркылуу чыгарган функцияларды пайдалануу мүмкүнчүлүгүн берет."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Бардык негизги функциялар"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Оптималдаштырылган"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Тармакка кошулган күтүү режими"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Тармакка кошулган күтүү режими — тармак аркылуу сыналгыны ойготот"</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="6636328986387241066">"Жакшыртылган энергия режими"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"кошумча тармактык функциялар менен"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Cыналгы колдонулбай турганда да кошумча функцияларды пайдалануу мүмкүнчүлүгүн берет."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Бардык сунушталган функциялар"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Жогору"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Ар дайым онлайн"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Ар дайым онлайн — cыналгы өчүк учурда да тармак функцияларын иштетет"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-ky/strings.xml b/Settings/res/values-ky/strings.xml
index 2118a29..057d771 100644
--- a/Settings/res/values-ky/strings.xml
+++ b/Settings/res/values-ky/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google юридикалык жобосу"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Уруксаттаманын дайындары жеткиликтүү эмес"</string>
     <string name="about_model" msgid="9164284529291439296">"Үлгүсү"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Түзмөк режими"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Дүкөндөр үчүн демо режими"</string>
     <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>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Интернет"</string>
     <string name="connected" msgid="4981532275162345997">"Туташкан"</string>
     <string name="not_connected" msgid="475810896484271663">"Туташкан жок"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Интернет жок"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Сакталды"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Сырсөз туура эмес"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi сырсөзү өтө эле кыска"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Кирүү керектелет"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Башка параметрлер"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Баарын көрүү"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Азыраак көрүү"</string>
@@ -902,6 +909,13 @@
     <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">"Pin өзгөртүү"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Чектелген профилди түзөсүзбү?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Түзүлгөн"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Өткөрүп жиберүү"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"PIN код түзүү"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Чектелген профилге киресизби?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Чектелген профиль жок"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Киргизилген"</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="pin_enter_unlock_channel" msgid="243855138978654080">"Бул каналды көрүү үчүн PIN киргизиңиз"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Жаздырган микрофон(-дор)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Аудио жаздырылып башталган жок."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Аудио жаздырылган жок."</string>
-    <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, Ethernet же телефонуңуздагы байланыш түйүнү аркылуу туташа аласыз."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Башка Bluetooth түзмөктөрүнө көрcөтүлсүнбү?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Колдонмо сыналгыңызды башка Bluetooth түзмөктөрүнө <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд көрсөткөнү жатат."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Бул параметрлер колдонулбаган учурда түзмөктүн иштешине таасирин тийгизет"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"Иштетет:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Ушул режимден улам түзмөк электр кубатын көбүрөөк керектеши мүмкүн."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"Канчалык көп сыналгы функцияларын күйгүзсөңүз, кубатты керектөө ошончолук көп болушу мүмкүн."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" иштетүү"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Пультумду табуу"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Google TV\'нин пультун табуу үчүн үн чыгарыңыз"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Пультуңузда 30 секунд бою үн чыгаруу үчүн Google TV\'нин артындагы баскычты басыңыз. Бул колдоого алынган Google TV\'нин пультунда гана иштейт.\n\nҮнүн басуу үчүн пульттагы бир баскычты басыңыз."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Google TV\'де баскыч бар, аны бассаңыз, пульттан 30 секунд бою үн ойнотулат. Бул колдоого алынган Google TV\'нин пультунда гана иштейт.\n\nҮнүн басуу үчүн пульттагы бир баскычты басыңыз."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Пультумду табуу функциясы иштетилсе, Google TV\'нин пультун табуу үчүн анын үнүн чыгарууга болот."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Үнүн чыгаруу"</string>
 </resources>
diff --git a/Settings/res/values-lo/energy-modes.xml b/Settings/res/values-lo/energy-modes.xml
index 323b177..2ce3929 100644
--- a/Settings/res/values-lo/energy-modes.xml
+++ b/Settings/res/values-lo/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"ໂໝດໃຊ້ພະລັງງານຕ່ຳ"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"ພ້ອມດ້ວຍຄຸນສົມບັດທີ່ສຳຄັນຂອງເຄືອຂ່າຍ"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"ປິດການເຊື່ອມຕໍ່ເຄືອຂ່າຍເມື່ອບໍ່ໄດ້ໃຊ້ໂທລະທັດ (ໂໝດສະແຕນບາຍ)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"ຕ່ຳ"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"ສະແຕນບາຍ"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"ສະແຕນບາຍ — ການເຊື່ອມຕໍ່ເຄືອຂ່າຍຈະປິດເມື່ອບໍ່ໄດ້ໃຊ້ໂທລະທັດ"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"ການອັບເດດ ແລະ ຟັງຊັນທີ່ສຳຄັນ"</item>
+    <item msgid="4002284890471636101">"[ໃສ່ຄຸນສົມບັດ 1]"</item>
+    <item msgid="7072772341455731040">"[ໃສ່ຄຸນສົມບັດ 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"ໂໝດໃຊ້ພະລັງງານເໝາະສົມ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"ພ້ອມດ້ວຍຄຸນສົມບັດທີ່ແນະນຳຂອງເຄືອຂ່າຍ"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"ອະນຸຍາດຄຸນສົມບັດເພື່ອປຸກລະບົບຂອງໂທລະທັດຜ່ານເຄືອຂ່າຍ (ໂໝດສະແຕນບາຍທີ່ເຊື່ອມຕໍ່ເຄືອຂ່າຍ)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"ຄຸນສົມບັດທີ່ຈຳເປັນທັງໝົດ"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"ປະສິດທິພາບສູງສຸດ"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"ສະແຕນບາຍຖ້າເຄືອຂ່າຍແລ້ວ"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"ສະແຕນບາຍຖ້າເຄືອຂ່າຍແລ້ວ — ເປີດໃຊ້ຄຸນສົມບັດເພື່ອປຸກໂທລະທັດຜ່ານເຄືອຂ່າຍ"</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="6636328986387241066">"ໂໝດໃຊ້ພະລັງງານຫຼາຍຂຶ້ນ"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"ພ້ອມດ້ວຍຄຸນສົມບັດເພີ່ມເຕີມຂອງເຄືອຂ່າຍ"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"ອະນຸຍາດຄຸນສົມບັດເພີ່ມເຕີມເຖິງແມ່ນວ່າບໍ່ໄດ້ນຳໃຊ້ໂທລະທັດຢູ່ກໍຕາມ."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"ຄຸນສົມບັດທີ່ແນະນຳທັງໝົດ"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"ເພີ່ມຂຶ້ນແລ້ວ"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"ເຊື່ອມຕໍ່ສະເໝີ"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"ເຊື່ອມຕໍ່ສະເໝີ — ເປີດການນຳໃຊ້ຄຸນສົມບັດເຄືອຂ່າຍເມື່ອບໍ່ໄດ້ໃຊ້ໂທລະທັດ"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[ໃສ່ຄຸນສົມບັດ 1]"</item>
     <item msgid="170760143032597722">"[ໃສ່ຄຸນສົມບັດ 2]"</item>
diff --git a/Settings/res/values-lo/strings.xml b/Settings/res/values-lo/strings.xml
index 934e959..f1a6632 100644
--- a/Settings/res/values-lo/strings.xml
+++ b/Settings/res/values-lo/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google ຕາມ​ກົດ​ໝາຍ"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"ບໍ່​ມີ​ຂໍ້​ມູນ​ລິ​ຂະ​ສິດ"</string>
     <string name="about_model" msgid="9164284529291439296">"ໂມເດວ"</string>
+    <string name="device_mode" msgid="7258350575590118152">"ໂໝດອຸປະກອນ"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"ເດໂມຢູ່ຮ້ານຄ້າ"</string>
     <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 build"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"​ການ​ເຊື່ອມ​ຕໍ່​ອິນ​ເຕີ​ເນັດ"</string>
     <string name="connected" msgid="4981532275162345997">"ເຊື່ອມ​ຕໍ່ແລ້ວ"</string>
     <string name="not_connected" msgid="475810896484271663">"ບໍ່ໄດ້ເຊື່ອມຕໍ່"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"ບໍ່ມີອິນເຕີເນັດ"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"ບັນທຶກແລ້ວ"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"ລະຫັດຜ່ານບໍ່ຖືກຕ້ອງ"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"ລະຫັດຜ່ານ Wi-Fi ສັ້ນເກີນໄປ"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"ຕ້ອງເຂົ້າສູ່ລະບົບກ່ອນ"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"ໂຕເລືອກ​ອື່ນໆ"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"ເບິ່ງ​ທັງ​ໝົດ"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"ເບິ່ງໜ້ອຍລົງ"</string>
@@ -902,6 +909,13 @@
     <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">"​ປ່ຽນ​ລະ​ຫັດ PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"ສ້າງໂປຣໄຟລ໌ທີ່ຖືກຈຳກັດບໍ?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"ສ້າງແລ້ວ"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"ຂ້າມ"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"ສ້າງ PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"ປ່ຽນໄປໃຊ້ໂປຣໄຟລ໌ທີ່ຖືກຈຳກັດບໍ?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"ບໍ່ມີໂປຣໄຟລ໌ທີ່ຖືກຈຳກັດ"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"ນຳໃຊ້ຢູ່"</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="pin_enter_unlock_channel" msgid="243855138978654080">"ໃສ່​ລະຫັດ PIN ເພື່ອ​ເບິ່ງ​ຊ່ອງ​ນີ້"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"ໄມໂຄຣໂຟນທີ່ບັນທຶກໄວ້"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"ເລີ່ມການບັນທຶກສຽງບໍ່ສຳເລັດ."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"ບັນທຶກສຽງບໍ່ສຳເລັດ."</string>
-    <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, Ethernet ຫຼື ຮັອດສະປອດຂອງໂທລະສັບທ່ານໄດ້."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"ເຮັດໃຫ້ອຸປະກອນ Bluetooth ອື່ນເບິ່ງເຫັນໄດ້ບໍ?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"ມີແອັບຕ້ອງການເຮັດໃຫ້ໂທລະພາບຂອງທ່ານເປີດໃຫ້ອຸປະກອນ Bluetooth ອື່ນເຫັນໄດ້ເປັນເວລາ <xliff:g id="TIMEOUT">%1$d</xliff:g> ວິນາທີ."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"ການຕັ້ງຄ່າເຫຼົ່ານີ້ມີຜົນກະທົບຕໍ່ອຸປະກອນເມື່ອບໍ່ໄດ້ໃຊ້"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"ເປີດການນຳໃຊ້:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ກະລຸນາຮັບຊາບວ່າໂໝດນີ້ອາດເຮັດໃຫ້ອຸປະກອນໃຊ້ພະລັງງານຫຼາຍຂຶ້ນ."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"ການໃຊ້ພະລັງງານອາດຈະເພີ່ມຂຶ້ນຕາມຈໍານວນຄຸນສົມບັດໂທລະທັດທີ່ທ່ານເປີດການນຳໃຊ້."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"ເປີດການນຳໃຊ້ \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"ຊອກຫາຣີໂໝດຂອງຂ້ອຍ"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"ຫຼິ້ນສຽງເພື່ອຊອກຫາຣີໂໝດ Google TV ຂອງທ່ານຫາກວາງໄວ້ຜິດບ່ອນ"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"ກົດປຸ່ມຢູ່ດ້ານຫຼັງຂອງ Google TV ຂອງທ່ານເພື່ອຫຼິ້ນສຽງຢູ່ຣີໂໝດຂອງທ່ານເປັນເວລາ 30 ວິນາທີ. ສິ່ງນີ້ໃຊ້ໄດ້ກັບຣີໂໝດຂອງ Google TV ທີ່ຮອງຮັບເທົ່ານັ້ນ.\n\nເພື່ອຢຸດສຽງ, ໃຫ້ກົດປຸ່ມໃດກໍໄດ້ຢູ່ຣີໂໝດຂອງທ່ານ."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"ມີປຸ່ມຢູ່ Google TV ຂອງທ່ານທີ່ທ່ານສາມາດກົດເພື່ອຫຼິ້ນສຽງຢູ່ຣີໂໝດຂອງທ່ານເປັນເວລາ 30 ວິນາທີ. ສິ່ງນີ້ໃຊ້ໄດ້ກັບຣີໂໝດຂອງ Google TV ທີ່ຮອງຮັບເທົ່ານັ້ນ.\n\nເພື່ອຢຸດສຽງ, ໃຫ້ກົດປຸ່ມໃດກໍໄດ້ຢູ່ຣີໂໝດຂອງທ່ານ."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"ເມື່ອເປີດການນຳໃຊ້ຊອກຫາຣີໂໝດຂອງຂ້ອຍ, ທ່ານສາມາດຫຼິ້ນສຽງເພື່ອຊອກຫາຣີໂໝດ Google TV ຂອງທ່ານໄດ້ຫາກວາງໄວ້ຜິດບ່ອນ."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"ຫຼິ້ນສຽງ"</string>
 </resources>
diff --git a/Settings/res/values-lt/energy-modes.xml b/Settings/res/values-lt/energy-modes.xml
index 8b5bba3..117f5f0 100644
--- a/Settings/res/values-lt/energy-modes.xml
+++ b/Settings/res/values-lt/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Mažai energijos vartojantis režimas"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"su pagrindinėmis tinklo funkcijomis"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Išjunkite tinklo ryšį, kai televizorius nenaudojamas (budėjimo režimas)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Žema"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Budėjimo režimas"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Budėjimo režimas – tinko ryšys išjungtas, kai TV nenaudojamas"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Kritiniai atnaujinimai ir funkcijos"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Optimaliai energiją vartojantis režimas"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"su rekomenduojamomis tinklo funkcijomis"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Leidžiamos funkcijos, kad būtų galima suaktyvinti televizorių per tinklą (tinklo budėjimo režimu)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Visos būtiniausios funkcijos"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimizuota"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Tinklo budėjimo režimas"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Tinklo budėjimo režimas – įgalinamos funkcijos, kad TV būtų pažadintas per tinklą"</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="6636328986387241066">"Daugiau energijos vartojantis režimas"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"su papildomomis tinklo funkcijomis"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Leidžiamos papildomos funkcijos, net kai televizorius nenaudojamas."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Visos rekomenduojamos funkcijos"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Padidinta"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Visada prisijungta"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Visada prisijungta – įgalinamos tinklo funkcijos, kaip TV nenaudojamas"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Įterpti 1 funkciją]"</item>
     <item msgid="170760143032597722">"[Įterpti 2 funkciją]"</item>
diff --git a/Settings/res/values-lt/strings.xml b/Settings/res/values-lt/strings.xml
index 748bceb..0bf05aa 100644
--- a/Settings/res/values-lt/strings.xml
+++ b/Settings/res/values-lt/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Teisinė „Google“ informacija"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Licencijos duomenys negalimi"</string>
     <string name="about_model" msgid="9164284529291439296">"Modelis"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Įrenginio režimas"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Parduotuvės demonstracinė versija"</string>
     <string name="about_version" msgid="6223547403835399861">"„Android TV“ OS versija"</string>
     <string name="about_serial" msgid="3432319328808745459">"Serijos numeris"</string>
     <string name="about_build" msgid="8467840394761634575">"„Android TV“ OS versija"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Interneto ryšys"</string>
     <string name="connected" msgid="4981532275162345997">"Prisijungta"</string>
     <string name="not_connected" msgid="475810896484271663">"Neprisijungta"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Nėra interneto ryšio"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Išsaugota"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Netinkamas slaptažodis"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"„Wi-Fi“ slaptažodis per trumpas."</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Būtina prisijungti"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Kitos parinktys"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Žr. viską"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Žr. mažiau"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Tinkinti apribojimus"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Palaukite…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Keisti PIN kodą"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Kurti ribotą profilį?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Jau sukurta"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Praleisti"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Sukurti PIN kodą"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Įjungti ribotą profilį?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Nėra riboto profilio"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Jau įvesta"</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">"Ši programa gali pasiekti jūsų paskyras. Valdo „<xliff:g id="APP">%1$s</xliff:g>“"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Įveskite PIN kodą, kad galėtumėte žiūrėti kanalą"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Įrašymo mikrofonas (-ai)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Nepavyko pradėti garso įrašo įrašymo."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Nepavyko įrašyti garso įrašo."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Duomenų taupymo priemonė"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Automat. koreg. vaizdo įr. kokybę, kad būtų sunaud. mažiau mob. ryšio duomenų"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Duomenų naudojimas ir įspėjimai"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Prie interneto galite prisijungti naudodami „Wi-Fi“, eternetą ar telefono viešosios interneto prieigos tašką."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Leisti aptikti kitiems „Bluetooth“ įrenginiams?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Programa nori nustatyti, kad televizorių <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. galėtų aptikti kiti „Bluetooth“ įrenginiai."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Šie nustatymai turi įtakos nenaudojamam įrenginiui"</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_mode_eco_hint" msgid="5280058011809503514">"Energijos suvartojimas gali padidėti atsižvelgiant į įgalintų TV funkcijų skaičių."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Įgalinti „<xliff:g id="ENERGYMODENAME">%s</xliff:g>“"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Rasti nuotolinio valdymo pultelį"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Garso leidimas norint rasti netinkamoje vietoje padėtą „Google TV“ nuotolinio valdymo pultelį"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Paspauskite mygtuką „Google TV“ įrenginio užpakalinėje dalyje, kad leistumėte garsą nuotolinio valdymo pultelyje trisdešimt sekundžių. Tai veikia tik su palaikomais „Google TV“ nuotolinio valdymo pulteliais.\n\nJei norite sustabdyti garsą, paspauskite bet kurį nuotolinio valdymo pultelio mygtuką."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"„Google TV“ yra mygtukas, kurį galite paspausti, kad paleistumėte nuotolinio valdymo pultelio garsą trisdešimt sekundžių. Tai veikia tik su palaikomais „Google TV“ nuotolinio valdymo pulteliais.\n\nJei norite sustabdyti garsą, paspauskite bet kurį nuotolinio valdymo pultelio mygtuką."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Kai funkcija „Rasti nuotolinio valdymo pultelį“ įgalinta, galite leisti garsą norėdami rasti netinkamoje vietoje padėtą „Google TV“ nuotolinio valdymo pultelį"</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Leisti garsą"</string>
 </resources>
diff --git a/Settings/res/values-lv/energy-modes.xml b/Settings/res/values-lv/energy-modes.xml
index d35895c..6c40f60 100644
--- a/Settings/res/values-lv/energy-modes.xml
+++ b/Settings/res/values-lv/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Maza enerģijas patēriņa režīms"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"ar svarīgākajām tīkla funkcijām"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Tiek izslēgts tīkla savienojums, kad televizors netiek lietots (gaidstāves režīms)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Zems"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Gaidstāve"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Gaidstāve — tīkla savienojums ir izslēgts, kad televizors netiek izmantots"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Svarīgi atjauninājumi un funkcijas"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Optimizēta enerģijas patēriņa režīms"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"ar ieteicamajām tīkla funkcijām"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Var izmantot funkcijas, kas aktivizē televizoru tīklā (tīkla gaidstāves režīms)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Visas svarīgākās funkcijas"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimizēts"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Tīkla gaidstāve"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Tīkla gaidstāve — iespējo funkcijas televizora aktivizēšanai tīklā"</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="6636328986387241066">"Lielāka enerģijas patēriņa režīms"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"ar papildu tīkla funkcijām"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Var izmantot papildu funkcijas, pat ja televizors netiek lietots."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Visas ieteicamās funkcijas"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Palielināts"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Nepārtraukts savienojums"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Nepārtraukts savienojums — iespējo tīkla funkcijas, kad televizors netiek izmantots"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-lv/strings.xml b/Settings/res/values-lv/strings.xml
index 627ee60..a0a6115 100644
--- a/Settings/res/values-lv/strings.xml
+++ b/Settings/res/values-lv/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google juridiskā informācija"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Dati par licenci nav pieejami."</string>
     <string name="about_model" msgid="9164284529291439296">"Modelis"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Ierīces režīms"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Veikala demonstrācijas režīms"</string>
     <string name="about_version" msgid="6223547403835399861">"Android TV OS versija"</string>
     <string name="about_serial" msgid="3432319328808745459">"Sērijas numurs"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV OS versija"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Interneta savienojums"</string>
     <string name="connected" msgid="4981532275162345997">"Savienots"</string>
     <string name="not_connected" msgid="475810896484271663">"Nav savienojuma"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Nav interneta savienojuma"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Saglabāts"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Nepareiza parole"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi parole ir pārāk īsa."</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Nepieciešama pierakstīšanās"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Citas iespējas"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Skatīt visu"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Skatīt mazāk"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Pielāgot ierobežojumus"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Uzgaidiet…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Mainīt PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Vai izveidot ierobežotu profilu?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Jau izveidots"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Izlaist"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Izveidot PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Vai lietot ierobežotu profilu?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Nav atrasts ierobežots profils"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Jau ievadīts"</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">"Šī lietotne var piekļūt jūsu kontiem. Kontrolē: <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Lai skatītos šo kanālu, ievadiet PIN kodu"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Ierakstīšanai izmantotie mikrofoni"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Neizdevās palaist audio ierakstīšanu."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Neizdevās ierakstīt audio."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Datu lietojuma samazinātājs"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Automātiski pielāgot video kvalitāti, lai izmantotu mazāk mobilo datu"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Datu lietojums un brīdinājumi"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Varat izveidot savienojumu ar internetu, izmantojot Wi-Fi, tīklu Ethernet vai tālruņa tīklāju."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Vai padarīt redzamu citām Bluetooth ierīcēm?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Lietotne mēģina uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm padarīt jūsu televizoru redzamu citām Bluetooth ierīcēm."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Šie iestatījumi ietekmē ierīci, kad tā netiek izmantota"</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_mode_eco_hint" msgid="5280058011809503514">"Enerģijas patēriņš var palielināties, iespējojot vairāk televizora funkciju."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Režīma “<xliff:g id="ENERGYMODENAME">%s</xliff:g>” iespējošana"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Tālvadības ierīces atrašana"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Atskaņojiet signālu, lai atrastu savu Google TV tālvadības ierīci, ja tā ir pazudusi."</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Nospiediet pogu Google TV ierīces aizmugurē, lai 30 sekundes atskaņotu tālvadības ierīces signālu. Tas darbojas tikai atbalstītās Google TV tālvadības ierīcēs.\n\nLai apturētu signāla atskaņošanu, nospiediet jebkuru tālvadības ierīces pogu."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Uz jūsu Google TV ierīces ir poga, ko varat nospiest, lai savā tālvadības ierīcē 30 sekundes atskaņotu signālu. Tas darbojas tikai atbalstītās Google TV tālvadības ierīcēs.\n\nLai apturētu signāla atskaņošanu, nospiediet jebkuru tālvadības ierīces pogu."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Kad ir iespējota funkcija “Atrast tālvadības ierīci”, varat atskaņot signālu, lai atrastu savu Google TV tālvadības ierīci, ja tā ir pazudusi."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Atskaņot signālu"</string>
 </resources>
diff --git a/Settings/res/values-mk/energy-modes.xml b/Settings/res/values-mk/energy-modes.xml
index 3304314..5f5ca00 100644
--- a/Settings/res/values-mk/energy-modes.xml
+++ b/Settings/res/values-mk/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Режим на мала потрошувачка на енергија"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"со неопходни мрежни функции"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Ја исклучува мрежната врска кога телевизорот не се користи (режим на подготвеност)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Режим на ниска потрошувачка на енергија"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Режим на подготвеност"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Режим на подготвеност — мрежната врска е исклучена кога не се користи телевизорот"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Важни ажурирања и функции"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Режим на оптимизирана потрошувачка на енергија"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"со препорачани мрежни функции"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Дозволува функциите да го будат телевизорот преку мрежата (режим на подготвеност преку мрежа)"</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Сите неопходни функции"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Режим на оптимизирана потрошувачка на енергија"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Режим на подготвеност преку мрежа"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Режим на подготвеност преку мрежа — овозможува функциите да го разбудат телевизорот преку мрежа"</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="6636328986387241066">"Режим на зголемена потрошувачка на енергија"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"со дополнителни мрежни функции"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Дозволува дополнителни функции дури и кога телевизорот не се користи."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Сите препорачани функции"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Режим на зголемена потрошувачка на енергија"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Режим „Секогаш поврзано“"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Режим „Секогаш поврзано“ — овозможува мрежни функции кога не се користи телевизорот"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Внесете функција 1]"</item>
     <item msgid="170760143032597722">"[Внесете функција 2]"</item>
diff --git a/Settings/res/values-mk/strings.xml b/Settings/res/values-mk/strings.xml
index 50753b7..0462d82 100644
--- a/Settings/res/values-mk/strings.xml
+++ b/Settings/res/values-mk/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Правни информации на Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Податоците за лиценцата се недостапни"</string>
     <string name="about_model" msgid="9164284529291439296">"Модел"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Режим на уред"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Демо-режим"</string>
     <string name="about_version" msgid="6223547403835399861">"Верзија на OS на Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Сериски број"</string>
     <string name="about_build" msgid="8467840394761634575">"Верзија на OS на Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Интернет врска"</string>
     <string name="connected" msgid="4981532275162345997">"Поврзано"</string>
     <string name="not_connected" msgid="475810896484271663">"Не е поврзано"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Нема интернет"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Зачувано"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Погрешна лозинка"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Лозинката за Wi-Fi е премногу кратка"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Потребно е да се најавите"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Други опции"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Погледни ги сите"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Види помалку"</string>
@@ -902,6 +909,13 @@
     <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">"Промени PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Да создадеме ограничен профил?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Веќе создадено"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Прескокнете"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Создајте PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Да се влезе во огран. профил?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Нема ограничен профил"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Веќе внесено"</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="pin_enter_unlock_channel" msgid="243855138978654080">"Внесете PIN за да го гледате овој канал"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Снимени микрофони"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Аудиоснимањето не успеа да се стартува."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Аудиоснимањето не успеа."</string>
-    <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="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Да се направи видлив за другите уреди со Bluetooth?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Апликација сака да го направи телевизорот видлив за другите уреди со Bluetooth во траење од <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Поставкиве влијаат на уредот кога не се користи"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"Овозможува:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Имајте предвид дека овој режим може да ја зголеми потрошувачката на енергија на уредот."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"Потрошувачката на енергија може да се зголеми со бројот на функции на телевизорот што ќе ги овозможите."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Да се овозможи „<xliff:g id="ENERGYMODENAME">%s</xliff:g>“?"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Најди го мојот далечински управувач"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Репродуцирајте звук за да го лоцирате далечинскиот управувач на Google TV ако е изгубен"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Притиснете го копчето на задниот дел од вашиот Google TV за да се репродуцира звук на далечинскиот управувач 30 секунди. Ова функционира само со поддржани далечински управувачи на Google TV.\n\nЗа да го сопрете звукот, притиснете некое копче на далечинскиот управувач."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"На вашата Google TV има копче што може да го притиснете за да се пушти звук на далечинскиот управувач 30 секунди. Ова функционира само со поддржани далечински управувачи на Google TV.\n\nЗа да го сопрете звукот, притиснете некое копче на далечинскиот управувач."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Кога е овозможена „Најди го мојот далечински управувач“, може да репродуцирате звук за да го лоцирате далечинскиот управувач на Google TV ако е изгубен."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Репродуцирај звук"</string>
 </resources>
diff --git a/Settings/res/values-ml/energy-modes.xml b/Settings/res/values-ml/energy-modes.xml
index f9df24a..e95c0fa 100644
--- a/Settings/res/values-ml/energy-modes.xml
+++ b/Settings/res/values-ml/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"ഊർജ്ജം കുറഞ്ഞ മോഡ്"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"ആവശ്യമായ നെറ്റ്‌വർക്ക് ഫീച്ചറുകളോടെ"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"ടിവി ഉപയോഗിക്കാത്തപ്പോൾ നെറ്റ്‌വർക്ക് കണക്ഷൻ ഓഫാക്കുക (സ്റ്റാൻഡ്ബൈ മോഡ്)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"കുറവ്"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"സ്‌റ്റാൻഡ്‌ബൈ"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"സ്‌റ്റാൻഡ്‌ബൈ — ടിവി ഉപയോഗത്തിലില്ലാത്തപ്പോൾ നെറ്റ്‌വർക്ക് കണക്ഷൻ ഓഫാണ്"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"നിർണ്ണായക അപ്ഡേറ്റുകളും ഫംഗ്ഷനുകളും"</item>
+    <item msgid="4002284890471636101">"[ഫീച്ചർ 1 ചേർക്കുക]"</item>
+    <item msgid="7072772341455731040">"[ഫീച്ചർ 2 ചേർക്കുക]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"ഊർജ്ജം ഒപ്റ്റിമൈസ് ചെയ്ത മോഡ്"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"നിർദ്ദേശിക്കുന്ന നെറ്റ്‌വർക്ക് ഫീച്ചറുകളോടെ"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"നെറ്റ്‌വർക്കിലൂടെ ടിവിയെ സജീവമാക്കുന്ന ഫീച്ചറുകൾ അനുവദിക്കുന്നു (നെറ്റ്‌വർക്ക് കണക്ഷനിലൂടെ ട്രിഗർ ചെയ്യാവുന്ന സ്റ്റാൻഡ്ബൈ)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"അവശ്യമായ ഫീച്ചറുകൾ എല്ലാം"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"ഒപ്റ്റിമൈസ് ചെയ്‌തത്"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"നെറ്റ്‌വർക്ക് കണക്ഷനിലൂടെ ട്രിഗർ ചെയ്യാവുന്ന സ്റ്റാൻഡ്ബൈ"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"നെറ്റ്‌വർക്ക് കണക്ഷനിലൂടെ ട്രിഗർ ചെയ്യാവുന്ന സ്റ്റാൻഡ്ബൈ — നെറ്റ്‌വർക്കിലൂടെ ടിവിയെ സജീവമാക്കുന്ന ഫീച്ചറുകൾ പ്രവർത്തനക്ഷമമാക്കുന്നു"</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="6636328986387241066">"ഊർജ്ജം കൂടിയ മോഡ്"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"കൂടുതൽ നെറ്റ്‌വർക്ക് ഫീച്ചറുകളോടെ"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"ടിവി ഉപയോഗിക്കാത്തപ്പോൾ പോലും അധിക ഫീച്ചറുകൾ അനുവദിക്കുന്നു."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"നിർദ്ദേശിക്കുന്ന ഫീച്ചറുകൾ എല്ലാം"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"കൂടുതൽ"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"എല്ലായ്‌പ്പോഴും കണക്‌റ്റ് ചെയ്‌തിരിക്കുന്നു"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"എല്ലായ്‌പ്പോഴും കണക്‌റ്റ് ചെയ്‌തിരിക്കുന്നു — ടിവി ഉപയോഗത്തിലില്ലാത്തപ്പോൾ നെറ്റ്‌വർക്ക് ഫീച്ചറുകൾ പ്രവർത്തനക്ഷമമാക്കുന്നു"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[ഫീച്ചർ 1 ചേർക്കുക]"</item>
     <item msgid="170760143032597722">"[ഫീച്ചർ 2 ചേർക്കുക]"</item>
diff --git a/Settings/res/values-ml/strings.xml b/Settings/res/values-ml/strings.xml
index 6e92a50..c94ef28 100644
--- a/Settings/res/values-ml/strings.xml
+++ b/Settings/res/values-ml/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google ലീഗൽ"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"ലൈസൻസ് ഡാറ്റ ലഭ്യമല്ല"</string>
     <string name="about_model" msgid="9164284529291439296">"മോഡല്‍"</string>
+    <string name="device_mode" msgid="7258350575590118152">"ഉപകരണ മോഡ്"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"സ്‌റ്റോർ ഡെമോ"</string>
     <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>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"ഇന്റർനെറ്റ് കണക്ഷൻ"</string>
     <string name="connected" msgid="4981532275162345997">"കണക്‌റ്റുചെയ്‌തു"</string>
     <string name="not_connected" msgid="475810896484271663">"കണ‌ക്റ്റുചെയ്‌തിട്ടില്ല"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"ഇന്റർനെറ്റ് ഇല്ല"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"സംരക്ഷിച്ചു"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"പാസ്‌വേഡ് തെറ്റാണ്"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"വൈഫൈ പാസ്‌വേഡ് വളരെ ചെറുതാണ്"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"സൈൻ-ഇൻ ചെയ്യേണ്ടതുണ്ട്"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"മറ്റ് ഓപ്‌ഷനുകൾ"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"എല്ലാം കാണുക"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"കുറച്ച് കാണുക"</string>
@@ -902,6 +909,13 @@
     <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>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"നിയന്ത്രിത പ്രൊഫൈൽ സൃഷ്ടിക്കണോ?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"ഇതിനകം സൃഷ്ടിച്ചിട്ടുണ്ട്"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"ഒഴിവാക്കുക"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"പിൻ സൃഷ്‌ടിക്കുക"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"നിയന്ത്രിത പ്രൊഫൈലിലേക്ക് കടക്കണോ?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"നിയന്ത്രിത പ്രൊഫൈൽ ഒന്നുമില്ല"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"ഇതിനകം എന്റർ ചെയ്തിട്ടുണ്ട്"</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="pin_enter_unlock_channel" msgid="243855138978654080">"ഈ ചാനൽ കാണാൻ പിൻ നൽകുക"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"റെക്കോർഡ് ചെയ്ത മൈക്രോഫോൺ(കൾ)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"ഓഡിയോ റെക്കോർഡിംഗ് ആരംഭിക്കാനായില്ല."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"ഓഡിയോ റെക്കോർഡിംഗ് ചെയ്യാനായില്ല."</string>
-    <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">"വെെഫെെ, ഇതർനെറ്റ്, അല്ലെങ്കിൽ ഫോണിന്റെ ഹോട്ട്‌സ്‌പോട്ട് ഉപയോഗിച്ച് ഇന്റർനെറ്റിലേക്ക് കണക്റ്റ് ചെയ്യാം."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"മറ്റ് Bluetooth ഉപകരണങ്ങൾക്ക് ദൃശ്യമാക്കണോ?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"ഒരു ആപ്പ് <xliff:g id="TIMEOUT">%1$d</xliff:g> സെക്കൻഡ് സമയത്തേക്ക് നിങ്ങളുടെ ടിവി മറ്റ് Bluetooth ഉപകരണങ്ങൾക്ക് ദൃശ്യമാക്കാൻ താൽപ്പര്യപ്പെടുന്നു."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"ഉപയോഗത്തിലില്ലാത്തപ്പോൾ ഈ ക്രമീകരണങ്ങൾ ഉപകരണത്തെ ബാധിക്കുന്നു"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"പ്രവർത്തനക്ഷമമാക്കുന്നു:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ഉപകരണത്തിന്റെ ഊർജ്ജ ഉപഭോഗം ഈ മോഡ് വർദ്ധിപ്പിച്ചേക്കാമെന്ന കാര്യം ശ്രദ്ധിക്കുക."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"നിങ്ങൾ പ്രവർത്തനക്ഷമമാക്കുന്ന ടിവി ഫീച്ചറുകളുടെ എണ്ണം അനുസരിച്ച് വൈദ്യുതി ഉപഭോഗം വർദ്ധിച്ചേക്കാം."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" പ്രവർത്തനക്ഷമമാക്കുക"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"എന്റെ റിമോട്ട് കണ്ടെത്തൂ"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"നിങ്ങളുടെ Google TV റിമോട്ട് എവിടെയെങ്കിലും വച്ച് മറന്നെങ്കിൽ അത് കണ്ടെത്താൻ ഒരു ശബ്ദം പ്ലേ ചെയ്യുക"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"നിങ്ങളുടെ റിമോട്ടിൽ 30 സെക്കൻഡ് നേരത്തേക്ക് ഒരു ശബ്ദം പ്ലേ ചെയ്യാൻ Google TV-യുടെ പിൻഭാഗത്തുള്ള ബട്ടൺ അമർത്തുക. പിന്തുണയുള്ള Google TV റിമോട്ട് കൺട്രോളുകളിൽ മാത്രമേ ഇത് പ്രവർത്തിക്കൂ.\n\nശബ്ദം നിർത്താൻ, നിങ്ങളുടെ റിമോട്ടിലെ ഏതെങ്കിലും ബട്ടൺ അമർത്തുക."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"നിങ്ങളുടെ റിമോട്ടിൽ 30 സെക്കൻഡ് നേരത്തേക്ക് ശബ്‌ദം പ്ലേ ചെയ്യാൻ നിങ്ങളുടെ Google TV-യിൽ ഒരു ബട്ടൺ ഉണ്ട്. പിന്തുണയുള്ള Google TV റിമോട്ട് കൺട്രോളുകളിൽ മാത്രമേ ഇത് പ്രവർത്തിക്കൂ.\n\nശബ്ദം നിർത്താൻ, നിങ്ങളുടെ റിമോട്ടിലെ ഏതെങ്കിലും ബട്ടൺ അമർത്തുക."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"\'എന്റെ റിമോട്ട് കണ്ടെത്തുക\' പ്രവർത്തനക്ഷമമാക്കിയിരിക്കുമ്പോൾ, Google TV റിമോട്ട് എവിടെയെങ്കിലും വച്ച് മറന്നെങ്കിൽ അത് കണ്ടെത്താൻ ഒരു ശബ്ദം പ്ലേ ചെയ്യാം."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"ശബ്‌ദം പ്ലേ ചെയ്യുക"</string>
 </resources>
diff --git a/Settings/res/values-mn/energy-modes.xml b/Settings/res/values-mn/energy-modes.xml
index e34ec5e..b0600af 100644
--- a/Settings/res/values-mn/energy-modes.xml
+++ b/Settings/res/values-mn/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Бага эрчим хүчний горим"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"сүлжээний чухал онцлогуудтай"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"ТВ-ийг ашиглаагүй үед (зогсолтын горим) сүлжээний холболтыг унтраана уу."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Бага"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Зогсолтын горим"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Зогсолтын горим — ТВ-ийг ашиглаагүй үед сүлжээний холболт унтраалттай байна"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Чухал шинэчлэлт болон ажиллагаа"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Оновчилсон эрчим хүчний горим"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"сүлжээний санал болгосон онцлогуудтай"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"ТВ-ийг сүлжээгээр (сүлжээнд холбогдсон зогсолтын горим) сэрээдэг онцлогуудыг зөвшөөрнө."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Бүх чухал онцлог"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Оновчилсон"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Сүлжээнд холбогдсон зогсолтын горим"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Сүлжээнд холбогдсон зогсолтын горим — ТВ-ийг сүлжээгээр асаах онцлогуудыг идэвхжүүлнэ"</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="6636328986387241066">"Эрчим хүчний нэмэгдэлтэй горим"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"сүлжээний нэмэлт онцлогуудтай"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"ТВ-ийг ашиглаагүй үед ч нэмэлт онцлогуудыг зөвшөөрнө."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Бүх санал болгосон онцлог"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Нэмэгдүүлсэн"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Байнга холбогдсон"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Байнга холбогдсон — ТВ-ийг ашиглаагүй үед сүлжээний онцлогуудыг идэвхжүүлнэ"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-mn/strings.xml b/Settings/res/values-mn/strings.xml
index a5c025c..f1f0507 100644
--- a/Settings/res/values-mn/strings.xml
+++ b/Settings/res/values-mn/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google-ийн хууль эрх зүйн"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Лицензийн мэдээлэл байхгүй байна"</string>
     <string name="about_model" msgid="9164284529291439296">"Модел"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Төхөөрөмжийн горим"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Дэлгүүрийн демо"</string>
     <string name="about_version" msgid="6223547403835399861">"Android TV-н үйлдлийн системийн хувилбар"</string>
     <string name="about_serial" msgid="3432319328808745459">"Сериалын дугаар"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV-н үйлдлийн системийн хийц"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Интернэт холболт"</string>
     <string name="connected" msgid="4981532275162345997">"Холбогдсон"</string>
     <string name="not_connected" msgid="475810896484271663">"Холбогдоогүй"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Интернэт байхгүй"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Хадгалсан"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Нууц үг буруу байна"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi-н нууц үг хэт богино байна"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Нэвтрэх шаардлагатай"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Бусад сонголтууд"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Бүгдийг харах"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Цөөнийг харах"</string>
@@ -902,6 +909,13 @@
     <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>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Хязгаарлагдмал профайл үүсгэх үү?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Аль хэдийн үүсгэсэн"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Алгасах"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"ПИН үүсгэх"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Хязгаарлагдмал профайлд нэвтрэх үү?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Хязгаарласан профайл байхгүй"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Аль хэдийн оруулсан"</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="pin_enter_unlock_channel" msgid="243855138978654080">"Энэ сувгийг үзэхийн тулд ПИН оруулна уу"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Хальсанд хураагдсан микрофон"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Аудио бичихийг эхлүүлж чадсангүй."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Аудио бичлэг хийх амжилтгүй боллоо."</string>
-    <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, Ethernet эсвэл утасныхаа сүлжээний цэгээр дамжуулан интернэтэд холбогдох боломжтой."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Бусад Bluetooth төхөөрөмжид харагддаг болгох уу?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Апп нь таны ТВ-г бусад Bluetooth төхөөрөмжид <xliff:g id="TIMEOUT">%1$d</xliff:g> секундийн турш харуулахыг хүсэж байна."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Эдгээр тохиргоо төхөөрөмжийг ашиглаагүй үед нөлөөлдөг"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"Идэвхжүүлнэ:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Энэ горим нь төхөөрөмжийн эрчим хүч зарцуулалтыг нэмэгдүүлж болохыг анхаарна уу."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"Таны идэвхжүүлсэн ТВ-ийн онцлогийн тоогоор эрчим хүч зарцуулалт нэмэгдэж магадгүй."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\"-г идэвхжүүлэх"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Алсын удирдлагаа олох"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Google TV-н алсын удирдлагаа алдсан бол байршлыг нь тогтоохын тулд дуу чимээ тоглуулна уу"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Алсын удирдлагадаа 30 секундийн турш дуу чимээ тоглуулахын тулд Google TV-ийнхээ ард байх товчлуурыг дарна уу. Энэ нь зөвхөн дэмжигдсэн Google TV-н алсын удирдлагаар ажиллана.\n\nДуу чимээг зогсоохын тулд алсын удирдлагынхаа дурын товчлуурыг дарна уу."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Таны Google TV дээр товчлуур байгаа бөгөөд та үүнийг алсын удирдлагадаа 30 секундийн турш дуу чимээ тоглуулахын тулд дарах боломжтой. Энэ нь зөвхөн дэмжигдсэн Google TV-н алсын удирдлагаар ажиллана.\n\nДуу чимээг зогсоохын тулд алсын удирдлагынхаа дурын товчлуурыг дарна уу."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Алсын удирдлагаа олохыг идэвхжүүлсэн үед та Google TV-н алсын удирдлагаа алга болгосон бол байршлыг нь тогтоохын тулд дуу чимээ тоглуулах боломжтой."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Дуу чимээ тоглуулах"</string>
 </resources>
diff --git a/Settings/res/values-mr/energy-modes.xml b/Settings/res/values-mr/energy-modes.xml
index 5fe8305..8fef839 100644
--- a/Settings/res/values-mr/energy-modes.xml
+++ b/Settings/res/values-mr/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"कमी ऊर्जा मोड"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"आवश्यक नेटवर्क वैशिष्‍ट्यांसह"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"टीव्ही वापरात नसताना नेटवर्क कनेक्शन बंद करा (स्टँडबाय मोड)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"कमी"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"स्टँडबाय"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"स्टँडबाय — टीव्ही वापरात नसताना नेटवर्क कनेक्शन बंद असते"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"महत्त्वाची अपडेट आणि फंक्शन"</item>
+    <item msgid="4002284890471636101">"[वैशिष्ट्य १ घाला]"</item>
+    <item msgid="7072772341455731040">"[वैशिष्ट्य २ घाला]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"ऑप्टिमाइझ केलेला ऊर्जा मोड"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"शिफारस केलेल्या नेटवर्क वैशिष्‍ट्यांसह"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"नेटवर्कशी कनेक्ट झाल्यावर (नेटवर्क्ड स्टॅंडबाय) वैशिष्ट्यांना टीव्ही सुरू करण्याची अनुमती देते."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"आवश्यक असलेली सर्व वैशिष्ट्ये"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"ऑप्टिमाइझ केलेले"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"नेटवर्क्ड स्टॅंडबाय"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"नेटवर्क्ड स्टॅंडबाय — नेटवर्कवर टीव्ही सुरू करण्यासाठी वैशिष्ट्ये सुरू करते"</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="6636328986387241066">"वाढलेल्या ऊर्जेचा मोड"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"अतिरिक्त नेटवर्क वैशिष्‍ट्यांसह"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"टीव्ही वापरात नसतानादेखील अतिरिक्त वैशिष्ट्यांना अनुमती देते."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"शिफारस केलेली सर्व वैशिष्ट्ये"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"वाढलेले"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"नेहमी कनेक्ट केलेले"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"नेहमी कनेक्ट केलेले — टीव्ही वापरात नसताना नेटवर्क वैशिष्ट्ये सुरू करते"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[पहिले वैशिष्‍ट्य घाला]"</item>
     <item msgid="170760143032597722">"[दुसरे वैशिष्‍ट्य घाला]"</item>
diff --git a/Settings/res/values-mr/strings.xml b/Settings/res/values-mr/strings.xml
index 0e05a87..0d87d05 100644
--- a/Settings/res/values-mr/strings.xml
+++ b/Settings/res/values-mr/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google कायदेशीर"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"परवाना डेटा अनुपलब्‍ध आहे"</string>
     <string name="about_model" msgid="9164284529291439296">"मॉडेल"</string>
+    <string name="device_mode" msgid="7258350575590118152">"डिव्हाइस मोड"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"स्टोअर डेमो"</string>
     <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>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"इंटरनेट कनेक्शन"</string>
     <string name="connected" msgid="4981532275162345997">"कनेक्ट केलेले"</string>
     <string name="not_connected" msgid="475810896484271663">"कनेक्ट केले नाही"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"इंटरनेट नाही"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"सेव्ह केलेले"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"चुकीचा पासवर्ड"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"वाय-फाय पासवर्ड खूप लहान आहे"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"साइन-इन करणे आवश्यक आहे"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"इतर पर्याय"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"सर्व पहा"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"थोडे पहा"</string>
@@ -450,12 +457,12 @@
     <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_could_not_save" msgid="7549912968719395764">"<xliff:g id="SSID">%1$s</xliff:g> साठी कॉंफिगरेशन सेव्ह करू शकलो नाही"</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>
     <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>
@@ -473,7 +480,7 @@
     <string name="wifi_action_try_again" msgid="8920677153891141148">"पुन्हा प्रयत्न करा"</string>
     <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_saving" msgid="320653339670641708">"<xliff:g id="SSID">%1$s</xliff:g> साठीचे कॉन्फिगरेशन सेव्ह करत आहे"</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>
@@ -707,7 +714,7 @@
     <string name="captions_display_on" msgid="480438033345455728">"सुरू"</string>
     <string name="captions_display_off" msgid="87881163874948539">"बंद"</string>
     <string name="display_options" msgid="2645282080948371603">"प्रदर्शन पर्याय"</string>
-    <string name="captions_configure" msgid="711991018642931958">"कॉंफिगर करा"</string>
+    <string name="captions_configure" msgid="711991018642931958">"कॉन्फिगर करा"</string>
     <string name="captions_language" msgid="5905918439449912646">"भाषा"</string>
     <string name="captions_language_default" msgid="3894192926725192528">"डीफॉल्ट"</string>
     <string name="captions_textsize" msgid="7161136610669343510">"मजकूर आकार"</string>
@@ -741,13 +748,13 @@
     <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>
+    <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="5426217096813804569">"<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>
-    <string name="system_accessibility_tts_engine_config" msgid="4757760652785865532">"इंजीन कॉंफिगरेशन"</string>
+    <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>
@@ -845,7 +852,7 @@
     <string name="tts_rate_very_fast" msgid="7756663146626103952">"खूप जलद"</string>
     <string name="title_settings" msgid="780933693363320088">"<xliff:g id="NAME">%1$s</xliff:g> सेटिंग्‍ज"</string>
     <string name="title_current_keyboard" msgid="891238509164879851">"वर्तमान कीबोर्ड"</string>
-    <string name="title_configure" msgid="846802387014612210">"कॉंफिगर करा"</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>
@@ -902,6 +909,13 @@
     <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>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"प्रतिबंधित प्रोफाइल तयार करायची?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"आधीच तयार केली आहे"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"वगळा"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"पिन तयार करा"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"प्रतिबंधित प्रोफाइल एंटर करायची?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"प्रतिबंधित प्रोफाइल नाही"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"आधीच एंटर केली आहे"</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="pin_enter_unlock_channel" msgid="243855138978654080">"हे चॅनल पाहण्‍यासाठी पिन प्रविष्‍ट करा"</string>
@@ -956,10 +970,10 @@
     <string name="device_energy_saver_screen_off" msgid="6908468996426629480">"डिस्प्ले बंद करा"</string>
     <!-- no translation found for device_energy_saver_timeout_description (3206609135199137514) -->
     <skip />
-    <string name="device_energy_saver_confirmation_title" msgid="7614859812773584773">"पॉवर आणि ऊर्जेसंबंधित सेटिंग कंफर्म करा"</string>
+    <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_text" msgid="6334963903866002164">"कृपया पाहात असताना डिस्प्ले बंद होण्यापासून रोखण्यासाठी कंफर्म करा, ज्यामध्ये ऊर्जा वापर वाढण्याची शक्यता आहे."</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>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"ऑडिओ रेकॉर्ड केलेला/ले मायक्रोफोन"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"ऑडिओ रेकॉर्ड करणे सुरू करता आले नाही."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"ऑडिओ रेकॉर्ड करता आला नाही."</string>
-    <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">"तुम्ही वाय-फाय, इथरनेट किंवा तुमच्या फोनचे हॉटस्पॉट वापरून इंटरनेटशी कनेक्ट करू शकता."</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>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"डिव्हाइस वापरात नसताना या सेटिंग्जचा त्यावर परिणाम होतो"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"सुरू करते:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"या मोडमुळे डिव्हाइसच्या पॉवरचा वापर वाढू शकतो याची नोंद घ्यावी."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"तुम्ही सुरू केलेल्या टीव्ही वैशिष्ट्यांच्या संख्येनुसार विजेचा वापर वाढू शकतो."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" सुरू करा"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"माझा रिमोट शोधा"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"तुमचा Google TV रिमोट हरवला असल्यास, तो शोधण्यासाठी आवाज प्ले करा"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"तुमच्या रिमोटवर ३० सेकंदांसाठी आवाज प्ले करण्यासाठी तुमच्या Google TV च्या मागील बाजूचे बटण प्रेस करा. हे फक्त सपोर्ट असलेल्या Google TV रिमोट कंट्रोलसह काम करते.\n\nआवाज थांबण्यासाठी, तुमच्या रिमोटवरील कोणतेही बटण प्रेस करा."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"तुमच्या Google TV वर एक बटण आहे, जे तुम्ही तुमच्या रिमोटवर ३० सेकंदांसाठी आवाज प्ले करण्यासाठी प्रेस करू शकता. हे फक्त सपोर्ट असलेल्या Google TV रिमोट कंट्रोलसह काम करते.\n\nआवाज थांबवण्यासाठी, तुमच्या रिमोटवरील कोणतेही बटण प्रेस करा."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"माझा रिमोट शोधा सुरू असते, तेव्हा तुमचा Google TV रिमोट हरवला असल्यास, तो शोधण्यासाठी तुम्ही आवाज प्ले करू शकता."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"आवाज प्ले करा"</string>
 </resources>
diff --git a/Settings/res/values-ms/energy-modes.xml b/Settings/res/values-ms/energy-modes.xml
index 9f97615..0f0ce15 100644
--- a/Settings/res/values-ms/energy-modes.xml
+++ b/Settings/res/values-ms/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Mod tenaga rendah"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"dengan ciri rangkaian penting"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Matikan sambungan rangkaian apabila TV tidak digunakan (mod tunggu sedia)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Rendah"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Tunggu sedia"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Tunggu sedia — Sambungan rangkaian dimatikan apabila TV tidak digunakan"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Kemaskinian dan fungsi yang amat penting"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Mod tenaga dioptimumkan"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"dengan ciri rangkaian yang disyorkan"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Membenarkan ciri untuk membangkitkan TV melalui rangkaian (tunggu sedia sambungan rangkaian)"</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Semua ciri penting"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Dioptimumkan"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Tunggu Sedia Sambungan Rangkaian"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Tunggu sedia sambungan rangkaian — Mendayakan ciri untuk membangkitkan TV melalui rangkaian"</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="6636328986387241066">"Mod tenaga ditingkatkan"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"dengan ciri rangkaian tambahan"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Membenarkan ciri tambahan walaupun ketika TV tidak digunakan."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Semua ciri yang disyorkan"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Ditingkatkan"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Sentiasa disambungkan"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Sentiasa disambungkan — Dayakan ciri rangkaian apabila TV tidak digunakan"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-ms/strings.xml b/Settings/res/values-ms/strings.xml
index b7c7e6c..680ce9c 100644
--- a/Settings/res/values-ms/strings.xml
+++ b/Settings/res/values-ms/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Undang-undang Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Data lesen tidak tersedia"</string>
     <string name="about_model" msgid="9164284529291439296">"Model"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Mod Peranti"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Demo Kedai"</string>
     <string name="about_version" msgid="6223547403835399861">"Versi OS Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Nombor siri"</string>
     <string name="about_build" msgid="8467840394761634575">"Binaan OS Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Sambungan Internet"</string>
     <string name="connected" msgid="4981532275162345997">"Disambungkan"</string>
     <string name="not_connected" msgid="475810896484271663">"Tidak bersambung"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Tiada Internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Disimpan"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Kata laluan salah"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Kata laluan Wi-Fi terlalu pendek"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Log masuk diperlukan"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Pilihan lain"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Lihat semua"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Lihat kurang lagi"</string>
@@ -665,7 +672,7 @@
     <string name="third_party_location_services_title" msgid="2826218400381676508">"Perkhidmatan lokasi pihak ke-3"</string>
     <string name="location_reporting" msgid="3552501333650895634">"Pelaporan Lokasi"</string>
     <string name="location_history" msgid="4055660203090513120">"Sejarah Lokasi"</string>
-    <string name="location_reporting_desc" msgid="1580018652781674608">"Google menggunakan ciri ini dalam produk seperti Google Now dan Google Maps. Menghidupkan Pelaporan Lokasi membolehkan sebarang produk Google yang menggunakan ciri ini menyimpan dan menggunakan data lokasi terbaharu peranti anda berhubung dengan Akaun Google anda."</string>
+    <string name="location_reporting_desc" msgid="1580018652781674608">"Google menggunakan ciri ini dalam produk seperti Google Now dan Google Maps. Menghidupkan Pelaporan Lokasi membolehkan sebarang produk Google yang menggunakan ciri ini menyimpan dan menggunakan data lokasi terbaharu peranti anda berhubung dengan Google Account anda."</string>
     <string name="location_history_desc" msgid="926674012916014270">"Apabila Sejarah Lokasi dihidupkan untuk akaun ini, Google dapat menyimpan data lokasi peranti anda untuk digunakan oleh apl anda.\n\nContohnya, Google Maps dapat memberi anda arah, manakala Google Now dapat memaklumkan anda tentang sebarang trafik pergi dan balik.\n\nAnda boleh mematikan Sejarah Lokasi pada bila-bila masa tetapi tindakan itu tidak memadamkan datanya. Untuk melihat dan mengurus Sejarah Lokasi anda, lawati maps.google.com/locationhistory."</string>
     <string name="delete_location_history_title" msgid="707559064715633152">"Padamkan sejarah lokasi"</string>
     <string name="delete_location_history_desc" msgid="4035229731487113147">"Ini akan memadamkan Sejarah Lokasi dan tidak boleh dibuat asal. Sesetengah aplikasi tidak berfungsi."</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Sesuaikan sekatan"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Tunggu sebentar…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Tukar pin"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Buat profil terhad?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Sudah Dibuat"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Langkau"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Buat PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Masuk ke profil terhad?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Tiada profil terhad"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Sudah dimasukkan"</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">"Apl ini boleh mengakses akaun anda. Dikawal oleh <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Masukkan PIN untuk menonton saluran ini"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Mikrofon dirakam"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Gagal memulakan rakaman audio."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Perakaman audio gagal."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Penjimat Data"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Laraskan kualiti video secara automatik untuk menggunakan kurang data mudah alih"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Penggunaan data dan makluman"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Anda boleh menyambung ke Internet dengan Wi-Fi, Ethernet atau tempat liputan telefon anda."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Perlihatkan kepada peranti Bluetooth yang lain?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Terdapat apl yang mahu memperlihatkan TV anda kepada peranti Bluetooth yang lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> saat."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Tetapan ini mempengaruhi peranti apabila 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_mode_eco_hint" msgid="5280058011809503514">"Penggunaan kuasa mungkin meningkat bergantung pada bilangan ciri TV yang anda dayakan."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Dayakan \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Cari alat kawalan jauh saya"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Mainkan bunyi untuk mengesan alat kawalan jauh Google TV anda sekiranya tersalah letak"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Tekan butang di belakang Google TV anda untuk memainkan bunyi pada alat kawalan jauh anda selama 30 saat. Kaedah ini hanya berfungsi dengan alat kawalan jauh Google TV yang disokong.\n\nUntuk menghentikan bunyi, tekan mana-mana butang pada alat kawalan jauh anda."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Terdapat butang pada Google TV anda yang anda boleh tekan untuk memainkan bunyi pada alat kawalan jauh anda selama 30 saat. Kaedah ini hanya berfungsi dengan alat kawalan jauh Google TV yang disokong.\n\nUntuk menghentikan bunyi, tekan mana-mana butang pada alat kawalan jauh anda."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Apabila Cari alat kawalan jauh saya dihidupkan, anda boleh memainkan bunyi untuk mengesan alat kawalan jauh Google TV anda sekiranya tersalah letak."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Mainkan bunyi"</string>
 </resources>
diff --git a/Settings/res/values-my/energy-modes.xml b/Settings/res/values-my/energy-modes.xml
index 02fb62e..806a9a3 100644
--- a/Settings/res/values-my/energy-modes.xml
+++ b/Settings/res/values-my/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"စွမ်းအင်ချွေတာမုဒ်"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"မရှိမဖြစ် ကွန်ရက်အင်္ဂါရပ်များဖြင့်"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"TV သုံးမနေပါက (အရန်သင့်မုဒ်တွင် ရှိနေလျှင်) ကွန်ရက်ချိတ်ဆက်မှုကို ပိတ်သည်။"</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"နည်း"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"အသင့်အနေအထား"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"အသင့်အနေအထား — TV မသုံးသည့်အခါ ကွန်ရက်ချိတ်ဆက်မှုကို ပိတ်ထားသည်"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"အရေးကြီးအပ်ဒိတ်နှင့် လုပ်ဆောင်ချက်များ"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"အကောင်းဆုံးချိန်ညှိထားသော စွမ်းအင်မုဒ်"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"အကြံပြုထားသော ကွန်ရက်အင်္ဂါရပ်များဖြင့်"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"ကွန်ရက်မှတစ်ဆင့် TV ကိုနှိုးရန် အင်္ဂါရပ်များအား ခွင့်ပြုသည် (ကွန်ရက်ချိတ်ဆက်မှု အသင့်)။"</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"မရှိမဖြစ် တူးလ်အားလုံး"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"အသင့်အတင့်"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"ကွန်ရက်ချိတ်ဆက်မှု အသင့်"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"ကွန်ရက်ချိတ်ဆက်မှု အသင့် — 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="6636328986387241066">"စွမ်းအင်တိုးမြှင့်မုဒ်"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"ထပ်ဆောင်း ကွန်ရက်အင်္ဂါရပ်များဖြင့်"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"TV သုံးမနေလျှင်ပင် အပိုဆောင်းအင်္ဂါရပ်များအား ခွင့်ပြုသည်။"</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"အကြံပြုထားသော တူးလ်အားလုံး"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"များ"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"အမြဲချိတ်ဆက်ထားသည်"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"အမြဲချိတ်ဆက်ထားသည် — TV မသုံးသည့်အခါ ကွန်ရက်ဝန်ဆောင်မှုများကို ဖွင့်သည်"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-my/strings.xml b/Settings/res/values-my/strings.xml
index 50fa92e..b1dd2b1 100644
--- a/Settings/res/values-my/strings.xml
+++ b/Settings/res/values-my/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google၏ ဥပဒေရေးရာ"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"လိုင်စင် ဒေတာကို ရှာမရ"</string>
     <string name="about_model" msgid="9164284529291439296">"မော်ဒယ်"</string>
+    <string name="device_mode" msgid="7258350575590118152">"စက်ပစ္စည်းမုဒ်"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"သရုပ်ပြဆိုင်"</string>
     <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>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"အင်တာနက် ချိတ်ဆက်မှု"</string>
     <string name="connected" msgid="4981532275162345997">"ချိတ်ဆက်ထား"</string>
     <string name="not_connected" msgid="475810896484271663">"ချိတ်ဆက် မထား"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"အင်တာနက် မရှိပါ"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"သိမ်းထားသည်"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"စကားဝှက် မှားနေသည်"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi စကားဝှက် တိုလွန်းသည်"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"လက်မှတ်ထိုးဝင်ရန် လိုအပ်သည်"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"အခြား ရွှေးစရာများ"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"အားလုံးကို ကြည့်ရန်"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"လျှော့ကြည့်ရန်"</string>
@@ -902,6 +909,13 @@
     <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">"pin ကို ပြောင်းရန်"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"ကန့်သတ်ပရိုဖိုင် ပြုလုပ်မလား။"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"ပြုလုပ်ပြီးဖြစ်သည်"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"ကျော်ရန်"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"ပင်နံပါတ် ပြုလုပ်ပါ"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"ကန့်သတ်ပရိုဖိုင်သို့ ဝင်မလား။"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"ကန့်သတ်ပရိုဖိုင်မရှိပါ"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"ဝင်ပြီးဖြစ်သည်"</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="pin_enter_unlock_channel" msgid="243855138978654080">"ဤချာနယ် ကြည့်ရန် PIN ရိုက်ထည့်ပါ"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"သွင်းယူထားသော မိုက်ခရိုဖုန်း(များ)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"အသံသွင်းခြင်း စတင်၍ မရပါ။"</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"အသံသွင်းခြင်း မအောင်မြင်ပါ။"</string>
-    <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="bluetooth_ask_discovery_title" msgid="4955540555242269694">"အခြားဘလူးတုသ်သုံးစက်များကို မြင်စေမလား။"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"အက်ပ်တစ်ခုသည် အခြားဘလူးတုသ်သုံးစက်များကို သင့် TV အား <xliff:g id="TIMEOUT">%1$d</xliff:g> စက္ကန့်ကြာ မြင်စေလိုသည်။"</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"စက်ကိုသုံးမနေသောအခါ ဤဆက်တင်များက ၎င်းအပေါ် သက်ရောက်မှုရှိသည်"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"ဖွင့်ထားသည်များ-"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ဤမုဒ်သည် စက်ပစ္စည်း၏ စွမ်းအင်အသုံးပြုမှုကို မြင့်တက်စေနိုင်ကြောင်း သတိပြုပါ။"</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"သင်ဖွင့်ထားသော TV ဝန်ဆောင်မှုအရေအတွက်အရ စွမ်းအင်အသုံးပြုမှု တိုးလာနိုင်သည်။"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"“<xliff:g id="ENERGYMODENAME">%s</xliff:g>” ဖွင့်ခြင်း"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"ကျွန်ုပ်၏ အဝေးထိန်းခလုတ်ရှာခြင်း"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"သင့် Google TV အဝေးထိန်းခလုတ်ကို နေရာမှားထားမိပါက ရှာတွေ့ရန် အသံဖွင့်နိုင်သည်"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"အဝေးထိန်းခလုတ်တွင် စက္ကန့် ၃၀ ကြာ အသံမြည်ရန် Google TV နောက်ရှိ ခလုတ်ကိုနှိပ်ပါ။ ၎င်းသည် ပံ့ပိုးထားသော Google TV အဝေးထိန်းခလုတ်များတွင်သာ အလုပ်လုပ်သည်။\n\nအသံပိတ်ရန် အဝေးထိန်းခလုတ်ပေါ်ရှိ ခလုတ်တစ်ခုခု နှိပ်ပါ။"</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"သင့် Google TV တွင် ခလုတ်တစ်ခုရှိပြီး ၎င်းကိုနှိပ်ခြင်းဖြင့် အဝေးထိန်းခလုတ်တွင် စက္ကန့် ၃၀ ကြာ အသံမည်သည်။ ၎င်းသည် ပံ့ပိုးထားသော Google TV အဝေးထိန်းခလုတ်များတွင်သာ အလုပ်လုပ်သည်။\n\nအသံပိတ်ရန် အဝေးထိန်းခလုတ်ပေါ်ရှိ ခလုတ်တစ်ခုခု နှိပ်ပါ။"</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"‘ကျွန်ုပ်၏ အဝေးထိန်းခလုတ်ရှာခြင်း’ ဖွင့်ထားသောအခါ သင့် Google TV အဝေးထိန်းခလုတ်ကို နေရာမှားထားမိပါက ရှာတွေ့ရန် အသံဖွင့်နိုင်သည်။"</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"အသံဖွင့်ရန်"</string>
 </resources>
diff --git a/Settings/res/values-nb/energy-modes.xml b/Settings/res/values-nb/energy-modes.xml
index d8bbdb7..6e3ecbc 100644
--- a/Settings/res/values-nb/energy-modes.xml
+++ b/Settings/res/values-nb/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Lav energi-modus"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"med viktige nettverksfunksjoner"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Slå av nettverkstilkoblingen når TV-en ikke er i bruk (hvilemodus)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Lav"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Ventemodus"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Ventemodus: Nettverkstilkoblingen er av når TV-en ikke er i bruk"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Kritiske oppdateringer og funksjoner"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Optimalisert energi-modus"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"med anbefalte nettverksfunksjoner"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Tillater at funksjoner vekker TV-en over nettverket (nettverkstilkoblet hvilemodus)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Alle nødvendige funksjoner"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimalisert"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Ventemodus med nettverk"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Ventemodus med nettverk: Funksjoner kan vekke TV-en via nettverket"</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="6636328986387241066">"Økt energi-modus"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"med flere nettverksfunksjoner"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Tillater ekstra funksjoner selv når TV-en ikke er i bruk."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Alle anbefalte funksjoner"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Økt"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Alltid tilkoblet"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Alltid tilkoblet: Nettverksfunksjoner kan brukes når TV-en ikke er i bruk"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-nb/strings.xml b/Settings/res/values-nb/strings.xml
index f65eb8e..cad4b82 100644
--- a/Settings/res/values-nb/strings.xml
+++ b/Settings/res/values-nb/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Informasjon fra Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Lisensdata er utilgjengelige"</string>
     <string name="about_model" msgid="9164284529291439296">"Modell"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Enhetsmodus"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Butikkdemo"</string>
     <string name="about_version" msgid="6223547403835399861">"Android TV OS-versjon"</string>
     <string name="about_serial" msgid="3432319328808745459">"Serienummer"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV OS-delversjon"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Internett-forbindelse"</string>
     <string name="connected" msgid="4981532275162345997">"Tilkoblet"</string>
     <string name="not_connected" msgid="475810896484271663">"Ikke tilkoblet"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Ingen internettilkobling"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Lagret"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Feil passord"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wifi-passordet er for kort"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Du må logge på"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Andre alternativer"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Se alle"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Se færre"</string>
@@ -852,7 +859,7 @@
     <string name="autofill_none" msgid="1615056985649424207">"Ingen"</string>
     <string name="autofill_confirmation_message" msgid="3840267789160192558">"&lt;b&gt;Stoler du på dennne appen?&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Passordtjeneste&gt;%1$s&lt;/xliff:g&gt; bruker det som er på skjermen, til å fastslå hva som kan fylles ut automatisk."</string>
     <string name="computing_size" msgid="8623916230485437579">"Beregner ..."</string>
-    <string name="title_select_wifi_network" msgid="935820896444071617">"Velg Wifi-nettverk"</string>
+    <string name="title_select_wifi_network" msgid="935820896444071617">"Velg wifi-nettverk"</string>
     <string name="accessories_wifi_display_rename_device" msgid="8803397194143132061">"Gi nytt navn"</string>
     <string name="accessories_wifi_display_enable" msgid="2385467074170316302">"Wifi-skjerm"</string>
     <string name="accessories_wifi_display_pin_required" msgid="5434960694140426664">"PIN-kode kreves"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Tilpass begrensninger"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Et øyeblikk …"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Endre PIN-kode"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Opprette en begrenset profil?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Allerede opprettet"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Hopp over"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Opprett en PIN-kode"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Åpne den begrensede profilen?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Ingen begrenset profil"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Allerede åpnet"</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">"Denne appen har tilgang til kontoene dine. Kontrollert av <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Skriv inn PIN-koden for å se på denne kanalen"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Mikrofon(er) brukt til opptak"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Kunne ikke starte lydopptaket."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Lydopptaket mislyktes."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Datasparing"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Juster videokvalitet automatisk for å bruke mindre mobildata"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Databruk og -varsler"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Du kan koble til internett med wifi, Ethernet eller telefonens wifi-sone."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Vil du gjøre enheten synlig for andre Bluetooth-enheter?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"En app ber om å gjøre nettbrettet ditt synlig for andre Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Disse innstillingene påvirker enheten når den 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_mode_eco_hint" msgid="5280058011809503514">"Strømforbruket kan øke basert på hvor mange TV-funksjoner du aktiverer."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Slå på «<xliff:g id="ENERGYMODENAME">%s</xliff:g>»"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Finn fjernkontrollen min"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Spill av en lyd for å finne Google TV-fjernkontrollen hvis du ikke finner den"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Trykk på knappen på baksiden av Google TV for å spille av en lyd på fjernkontrollen i 30 sekunder. Dette fungerer bare med støttede Google TV-fjernkontroller.\n\nFor å stoppe lyden, trykk på en knapp på fjernkontrollen."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Google TV har en knapp du kan trykke på for å spille av en lyd på fjernkontrollen i 30 sekunder. Dette fungerer bare med støttede Google TV-fjernkontroller.\n\nFor å stoppe lyden, trykk på en knapp på fjernkontrollen."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Når Finn fjernkontrollen min er slått på, kan du spille av en lyd for å finne Google TV-fjernkontrollen din hvis du ikke finner den."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Spill av lyd"</string>
 </resources>
diff --git a/Settings/res/values-ne/energy-modes.xml b/Settings/res/values-ne/energy-modes.xml
index 9104003..cf785f7 100644
--- a/Settings/res/values-ne/energy-modes.xml
+++ b/Settings/res/values-ne/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"कम ऊर्जा खपत गर्ने मोड"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"नेटवर्कसम्बन्धी अत्यावश्यक सुविधाहरू समावेश गरिएको"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"टिभी प्रयोग नगरिएका बेला (स्ट्यान्डबाइ मोड) नेटवर्क कनेक्सन अफ गर्नुहोस्।"</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"कम"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"स्ट्यान्डबाइ"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"स्ट्यान्डबाइ — टिभी प्रयोग नगरिएका बेलामा नेटवर्क कनेक्सन अफ हुन्छ"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"महत्त्वपूर्ण अपडेट तथा सुविधाहरू"</item>
+    <item msgid="4002284890471636101">"[सुविधा १ हाल्नुहोस्]"</item>
+    <item msgid="7072772341455731040">"[सुविधा २ हाल्नुहोस्]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"अप्टिमाइज गरिएको ऊर्जा खपत गर्ने मोड"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"सिफारिस गरिएका नेटवर्कसम्बन्धी सुविधाहरू समावेश गरिएको"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"नेटवर्क (नेटवर्क स्ट्यान्डबाइ) मार्फत टिभी चालू गर्ने सुविधाहरू अन हुन्छन्।"</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"अत्यावश्यक सबै सुविधाहरू"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"अप्टिमाइज गरिएको"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"नेटवर्क स्ट्यान्डबाइ"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"नेटवर्क स्ट्यान्डबाइ — यसले नेटवर्कका माध्यमबाट टिभी सक्रिय गर्ने सुविधा अन गर्छ"</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="6636328986387241066">"बढी ऊर्जा खपत गर्ने मोड"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"नेटवर्कसम्बन्धी अतिरिक्त सुविधाहरू समावेश गरिएको"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"टिभी प्रयोग नगरिएको अवस्थामा पनि अतिरिक्त सुविधाहरू अन हुन्छन्।"</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"सिफारिस गरिएका सबै सुविधाहरू"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"बढी"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"सधैँ कनेक्ट गरिने"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"सधैँ कनेक्ट गरिने — यसले टिभी प्रयोग नगरिएका बेलामा पनि नेटवर्कसम्बन्धी सुविधाहरू अन राख्छ"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[सुविधा १ थप्नुहोस्]"</item>
     <item msgid="170760143032597722">"[सुविधा २ थप्नुहोस्]"</item>
diff --git a/Settings/res/values-ne/strings.xml b/Settings/res/values-ne/strings.xml
index fd2ffcd..b16dce2 100644
--- a/Settings/res/values-ne/strings.xml
+++ b/Settings/res/values-ne/strings.xml
@@ -239,7 +239,7 @@
     <string name="accessory_unpairing" msgid="2529195578082286563">"उपकरण पेयर विच्छेद गर्दै..."</string>
     <string name="accessory_connected" msgid="5229574480869175180">"जोडिएको"</string>
     <string name="accessory_change_name" msgid="6493717176878500683">"नाम परिवर्तन गर्नुहोस्"</string>
-    <string name="accessory_change_name_title" msgid="451188562035392238">"यस सहायक उपकरणको कुनै नयाँ नाम प्रविष्टि गर्नुहोस्"</string>
+    <string name="accessory_change_name_title" msgid="451188562035392238">"यस सहायक उपकरणको कुनै नयाँ नाम हाल्नुहोस्"</string>
     <string name="accessories_add_accessibility_title" msgid="1300294413423909579">"ब्लुटुथबाट सहायक उपकरणसँग जोडा बनाउने प्रक्रिया।"</string>
     <string name="accessories_add_title" msgid="7704824893011194433">"चीजहरूको लागि खोजिँदै छ..."</string>
     <string name="accessories_add_bluetooth_inst" msgid="2508151218328384366">"ब्लुटुथ चल्ने यन्त्रहरूसँग जोडा बनाउनुअघि ती यन्त्रहरूमा जोडा बनाउने मोड अन गरिएको छ भन्ने कुरा सुनिश्चित गर्नुहोस्।"</string>
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google सम्बन्धी कानुनी जानकारी"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"लाइसेन्स डेटा उपलब्ध छैन"</string>
     <string name="about_model" msgid="9164284529291439296">"मोडेल"</string>
+    <string name="device_mode" msgid="7258350575590118152">"डिभाइस मोड"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"स्टोरको डेमो"</string>
     <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>
@@ -431,10 +433,15 @@
     <string name="mac_address_not_available" msgid="2992935344891853369">"उपलब्ध छैन"</string>
     <string name="mac_address_ephemeral_summary" msgid="3284374877361772531">"क्रमरहित MAC"</string>
     <string name="title_ip_address" msgid="705842159484772807">"IP एड्रेस"</string>
-    <string name="title_ssid" msgid="255328048344188682">"Wi-Fi नेटवर्कको नाम प्रविष्टि गर्नुहोस्"</string>
+    <string name="title_ssid" msgid="255328048344188682">"Wi-Fi नेटवर्कको नाम हाल्नुहोस्"</string>
     <string name="title_internet_connection" msgid="7502414094881828069">"इन्टरनेट जडान"</string>
     <string name="connected" msgid="4981532275162345997">"जोडिएको"</string>
     <string name="not_connected" msgid="475810896484271663">"जडित छैन"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"इन्टरनेट छैन"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"सेभ गरिएको"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"पासवर्ड गलत भयो"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi को पासवर्ड अत्यन्तै छोटो भयो"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"साइन इन गर्नु पर्ने हुन्छ"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"अन्य विकल्पहरू"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"सबै हेर्नुहोस्"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"अझ थोरै हेर्नुहोस्"</string>
@@ -871,7 +878,7 @@
     <string name="inputs_game" msgid="4762255172943107070">"खेल कन्सोल"</string>
     <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_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_show" msgid="2937435050499142756">"यो इनपुट देखाउनुहोस्"</string>
     <string name="input_header_names" msgid="5903234218909970550">"नाम"</string>
@@ -902,6 +909,13 @@
     <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">"PIN परिवर्तन गर्नुहोस्"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"प्रतिबन्धित प्रोफाइल सिर्जना गर्ने हो?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"बनाइसकिएको छ"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"स्किप गर्नुहोस्"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"PIN सिर्जना गर्नुहोस्"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"प्रतिबन्धित प्रोफाइल हाल्ने हो?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"प्रतिबन्धित प्रोफाइल भेटिएन"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"हालिसकिएको छ"</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="pin_enter_unlock_channel" msgid="243855138978654080">"यो च्यानल हेर्ने पिन प्रविष्टि गर्नुहोस्"</string>
@@ -992,7 +1006,7 @@
     <item msgid="6448060889026244632">"पारिवारिक कोठाको टिभी"</item>
     <item msgid="3336274213215419228">"सुत्ने कोठाको टिभी"</item>
   </string-array>
-    <string name="custom_room" msgid="6798144004583173563">"आफू अनुकूल नाम प्रविष्टि गर्नुहोस्…"</string>
+    <string name="custom_room" msgid="6798144004583173563">"आफू अनुकूल नाम हाल्नुहोस्…"</string>
     <string name="device_rename_title" msgid="9070021379000499270">"यस <xliff:g id="DEVICEMODEL">%1$s</xliff:g> को पुनः नामाकरण गर्नुहोस्"</string>
     <string name="device_rename_description" msgid="1973894029492915135">"यो <xliff:g id="DEVICEMODEL">%1$s</xliff:g> को हालको नाम \"<xliff:g id="DEVICENAME">%2$s</xliff:g>\" छ"</string>
     <string name="device_name_suggestion_title" msgid="3986220212759193742">"आफ्नो डिभाइसको नाम सेट गर्नुहोस्"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"रेकर्ड गर्न प्रयोग गरिएको माइक्रोफोन (हरू)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"अडियो रेकर्ड गर्ने कार्य सुरु गर्न सकिएन।"</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"अडियो रेकर्ड गर्न सकिएन।"</string>
-    <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="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>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"यी सेटिङ डिभाइस प्रयोग नगरेका बेलामा लागू हुन्छन्"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"निम्न सुविधाहरू सक्षम गर्छ:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"तपाईंले यो मोड प्रयोग गर्नुभयो भने तपाईंको डिभाइसले ऊर्जाको प्रयोग बढाउन सक्छ भन्ने कुरा याद राख्नुहोस्।"</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"तपाईं टिभीमा जति बढी सुविधाहरू अन गर्नुहुन्छ बिजुलीको खपत त्यति नै बढ्न सक्छ।"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" अन गर्नुहोस्"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"मेरो रिमोट भेट्टाइयोस्"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"आफ्नो Google TV रिमोट हराएका खण्डमा उक्त रिमोट भेट्टाउन कुनै साउन्ड प्ले गर्नुहोस्"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"रिमोटमा ३० सेकेन्डसम्म साउन्ड प्ले गर्न Google TV को पछाडिपट्टि रहेको बटन थिच्नुहोस्। यो Google TV का रिमोट कन्ट्रोलहरू प्रयोग गरी मात्र चलाउन मिल्छ।\n\nयो साउन्ड बन्द गर्न आफ्नो रिमोटको कुनै पनि बटन थिच्नुहोस्।"</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"तपाईं आफ्नो रिमोटमा ३० सेकेन्डसम्म साउन्ड बजाउन Google TV मा भएको बटन थिच्न सक्नुहुन्छ। यो Google TV का रिमोट कन्ट्रोलहरू प्रयोग गरी मात्र चलाउन मिल्छ।\n\nयो साउन्ड बन्द गर्न आफ्नो रिमोटको कुनै पनि बटन थिच्नुहोस्।"</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"\"मेरो रिमोट भेट्टाइयोस्\" अन गरिएका बेला तपाईंको Google TV रिमोट हराएका खण्डमा तपाईं उक्त रिमोट भेट्टाउन कुनै साउन्ड प्ले गर्न सक्नुहुन्छ।"</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"साउन्ड प्ले गर्नुहोस्"</string>
 </resources>
diff --git a/Settings/res/values-nl/energy-modes.xml b/Settings/res/values-nl/energy-modes.xml
index cf86490..eda8820 100644
--- a/Settings/res/values-nl/energy-modes.xml
+++ b/Settings/res/values-nl/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Modus voor laag energiegebruik"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"met essentiële netwerkfuncties"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Zet de netwerkverbinding uit als de tv niet wordt gebruikt (stand-bymodus)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Laag"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Stand-by"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Stand-by: netwerkverbinding is uit wanneer de tv niet wordt gebruikt"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Essentiële updates en functies"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Modus voor geoptimaliseerd energiegebruik"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"met aanbevolen netwerkfuncties"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Staat toe dat functies de tv activeren via het netwerk (Wake-on-LAN)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Alle essentiële functies"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Geoptimaliseerd"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Wake-on-LAN"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Wake-on-LAN: zet functies aan om de tv te activeren via het netwerk"</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="6636328986387241066">"Modus voor hoger energiegebruik"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"met aanvullende netwerkfuncties"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Staat extra functies toe, ook als de tv niet wordt gebruikt."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Alle aanbevolen functies"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Verhoogd"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Altijd verbonden"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Altijd verbonden: maakt netwerkfuncties mogelijk als de tv niet wordt gebruikt"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-nl/strings.xml b/Settings/res/values-nl/strings.xml
index b61d71b..c3bef8d 100644
--- a/Settings/res/values-nl/strings.xml
+++ b/Settings/res/values-nl/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Juridische informatie van Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Licentiegegevens zijn niet beschikbaar"</string>
     <string name="about_model" msgid="9164284529291439296">"Model"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Apparaatmodus"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Winkeldemo"</string>
     <string name="about_version" msgid="6223547403835399861">"OS-versie van Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Serienummer"</string>
     <string name="about_build" msgid="8467840394761634575">"OS-build van Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Internetverbinding"</string>
     <string name="connected" msgid="4981532275162345997">"Verbonden"</string>
     <string name="not_connected" msgid="475810896484271663">"Geen verbinding"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Geen internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Opgeslagen"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Onjuist wachtwoord"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wifi-wachtwoord is te kort"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Inloggen vereist"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Andere opties"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Alles weergeven"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Minder tonen"</string>
@@ -746,7 +753,7 @@
     <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> kan je scherm lezen, content bovenop andere apps tonen, je interacties met apps of hardwaresensoren bijhouden en namens jou interactie hebben met apps."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"<xliff:g id="SERVICE">%1$s</xliff:g> beëindigen?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Als je \'OK\' selecteert, wordt <xliff:g id="SERVICE">%1$s</xliff:g> beëindigd."</string>
-    <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Tekst naar spraak"</string>
+    <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Tekst-naar-spraak"</string>
     <string name="system_accessibility_tts_engine_config" msgid="4757760652785865532">"Engine-configuratie"</string>
     <string name="system_speak_passwords" msgid="8556036524146404052">"Wachtwoorden voorlezen"</string>
     <string name="system_preferred_engine" msgid="3545505072652708443">"Voorkeursengine"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Beperkingen aanpassen"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Een ogenblik geduld…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Pincode wijzigen"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Beperkt profiel maken?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Al gemaakt"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Overslaan"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Pincode maken"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Beperkt profiel openen?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Geen beperkt profiel"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Al ingevoerd"</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">"Deze app kan toegang krijgen tot je accounts. Beheerd door <xliff:g id="APP">%1$s</xliff:g>."</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Pincode opgeven om dit kanaal te bekijken"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Opgenomen microfoon(s)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Kan audio-opname niet starten."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Audio-opname mislukt."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Databesparing"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Videokwaliteit automatisch aanpassen om minder mobiele data te gebruiken"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Datagebruik en meldingen"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Je kunt verbinding maken met internet via wifi, ethernet of de hotspot van je telefoon."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Zichtbaar maken voor andere bluetooth-apparaten?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Een app wil je tv <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar maken voor andere bluetooth-apparaten."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Deze instellingen zijn van invloed wanneer het apparaat 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_mode_eco_hint" msgid="5280058011809503514">"Het stroomverbruik kan toenemen met het aantal tv-functies dat je aanzet."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"<xliff:g id="ENERGYMODENAME">%s</xliff:g> aanzetten"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Mijn afstandsbediening vinden"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Speel een geluid af om je Google TV-afstandsbediening te vinden als je deze kwijt bent"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Druk op de knop op de achterkant van je Google TV om 30 seconden een geluid op je afstandsbediening af te spelen. Dit werkt alleen met ondersteunde afstandsbedieningen voor Google TV.\n\nAls je het geluid wilt uitzetten, druk je op een knop op je afstandsbediening."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Je Google TV heeft een knop waarmee je 30 seconden een geluid kunt afspelen op je afstandsbediening. Dit werkt alleen met ondersteunde afstandsbedieningen voor Google TV.\n\nAls je het geluid wilt uitzetten, druk je op een knop op je afstandsbediening."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Als Mijn afstandsbediening vinden aanstaat, kun je een geluid afspelen om je Google TV-afstandsbediening te vinden als je deze kwijt bent."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Geluid afspelen"</string>
 </resources>
diff --git a/Settings/res/values-or/energy-modes.xml b/Settings/res/values-or/energy-modes.xml
index 51d41c5..20bd5c1 100644
--- a/Settings/res/values-or/energy-modes.xml
+++ b/Settings/res/values-or/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"କମ ଏନର୍ଜି ମୋଡ"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"ଅତ୍ୟାବଶ୍ୟକ ନେଟୱାର୍କ ଫିଚର ସହ"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"ଟିଭି ବ୍ୟବହାର କରାଯାଉନଥିବା ବେଳେ ନେଟୱାର୍କ କନେକ୍ସନକୁ ବନ୍ଦ କରନ୍ତୁ (ଷ୍ଟାଣ୍ଡବାଏ ମୋଡ)।"</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"କମ"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"ଷ୍ଟାଣ୍ଡବାଏ"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"ଷ୍ଟାଣ୍ଡବାଏ — ଟିଭି ବ୍ୟବହାର ହେଉନଥିବା ସମୟରେ ନେଟୱାର୍କ କନେକ୍ସନ ବନ୍ଦ ଥାଏ"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"ଗୁରୁତ୍ୱପୂର୍ଣ୍ଣ ଅପଡେଟ ଏବଂ ଫଙ୍କସନଗୁଡ଼ିକ"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"ଅପ୍ଟିମାଇଜ କରାଯାଇଥିବା ଏନର୍ଜି ମୋଡ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"ସୁପାରିଶ କରାଯାଇଥିବା ନେଟୱାର୍କ ଫିଚର ସହ"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"ନେଟୱାର୍କ (ଷ୍ଟାଣ୍ଡବାଏ ମୋଡରେ ରଖାଯାଇଥିବା ନେଟୱାର୍କ) ମାଧ୍ୟମରେ ଟିଭିକୁ ସକ୍ରିୟ କରିବା ପାଇଁ ଫିଚରଗୁଡ଼ିକୁ ଅନୁମତି ଦିଏ।"</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"ସମସ୍ତ ଅତ୍ୟାବଶ୍ୟକ ଫିଚର"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"ଅପ୍ଟିମାଇଜ କରାଯାଇଛି"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"ନେଟୱାର୍କ୍ଡ ଷ୍ଟାଣ୍ଡବାଏ"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"ନେଟୱାର୍କ୍ଡ ଷ୍ଟାଣ୍ଡବାଏ — ନେଟୱାର୍କ ମାଧ୍ୟମରେ ଟିଭିକୁ ସକ୍ରିୟ କରିବା ପାଇଁ ଫିଚରଗୁଡ଼ିକୁ ସକ୍ଷମ କରେ"</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="6636328986387241066">"ଅଧିକ ଏନର୍ଜି ମୋଡ"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"ଅତିରିକ୍ତ ନେଟୱାର୍କ ଫିଚର ସହ"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"ଟିଭି ବ୍ୟବହାର କରାଯାଉନଥିବା ବେଳେ ଅତିରିକ୍ତ ଫିଚରକୁ ଅନୁମତି ଦିଏ।"</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"ସମସ୍ତ ସୁପାରିଶ କରାଯାଇଥିବା ଫିଚର"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"ବୃଦ୍ଧି କରାଯାଇଛି"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"ସର୍ବଦା କନେକ୍ଟ ହୋଇଥାଏ"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"ସର୍ବଦା କନେକ୍ଟ ହୋଇଥାଏ — ଟିଭି ବ୍ୟବହାର ହେଉନଥିବା ସମୟରେ ନେଟୱାର୍କ ଫିଚରଗୁଡ଼ିକୁ ସକ୍ଷମ କରେ"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-or/strings.xml b/Settings/res/values-or/strings.xml
index 5a27b51..5d41567 100644
--- a/Settings/res/values-or/strings.xml
+++ b/Settings/res/values-or/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google ଲିଗାଲ୍‌"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"ଲାଇସେନ୍ସ ଡାଟା ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="about_model" msgid="9164284529291439296">"ମଡେଲ୍‌"</string>
+    <string name="device_mode" msgid="7258350575590118152">"ଡିଭାଇସ ମୋଡ"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"ଷ୍ଟୋର ଡେମୋ"</string>
     <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>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"ଇଣ୍ଟର୍ନେଟ୍‌ ସଂଯୋଗ"</string>
     <string name="connected" msgid="4981532275162345997">"କନେକ୍ଟ କରାଗଲା"</string>
     <string name="not_connected" msgid="475810896484271663">"କନେକ୍ଟ ହୋ‍ଇନାହିଁ"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"ଇଣ୍ଟର୍ନେଟ୍ ସଂଯୋଗ ନାହିଁ"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"ସେଭ କରାଯାଇଛି"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"ଭୁଲ ପାସୱାର୍ଡ"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"ୱାଇ-ଫାଇ ପାସୱାର୍ଡ ବହୁତ ଛୋଟ ଅଟେ"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"ସାଇନ୍-ଇନ୍ ଆବଶ୍ୟକ"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"ଅନ୍ୟ ବିକଲ୍ପଗୁଡ଼ିକ"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"ସବୁ ଦେଖନ୍ତୁ"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"କିଛି ଦେଖନ୍ତୁ"</string>
@@ -902,6 +909,13 @@
     <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>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"ପ୍ରତିବନ୍ଧିତ ପ୍ରୋଫାଇଲ ତିଆରି କରିବେ?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"ପୂର୍ବରୁ ତିଆରି କରାଯାଇଛି"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"ବାଦ ଦିଅନ୍ତୁ"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"PIN ତିଆରି କରନ୍ତୁ"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"ପ୍ରତିବନ୍ଧିତ ପ୍ରୋଫାଇଲକୁ ଯିବେ?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"ପ୍ରତିବନ୍ଧିତ ପ୍ରୋଫାଇଲ ନାହିଁ"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"ପୂର୍ବରୁ ଲେଖାଯାଇଛି"</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="pin_enter_unlock_channel" msgid="243855138978654080">"ଏହି ଚ୍ୟାନେଲ୍‌ ଦେଖିବାକୁ PIN ଏଣ୍ଟର୍‌ କରନ୍ତୁ"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"ରେକର୍ଡ କରାଯାଇଥିବା ମାଇକ୍ରୋଫୋନ(ଗୁଡ଼ିକ)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"ଅଡିଓ ରେକର୍ଡିଂ ଆରମ୍ଭ କରିବାରେ ବିଫଳ ହୋଇଛି।"</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"ଅଡିଓ ରେକର୍ଡିଂ ବିଫଳ ହୋଇଛି।"</string>
-    <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">"ଆପଣ ୱାଇ-ଫାଇ, ଇଥରନେଟ କିମ୍ବା ଆପଣଙ୍କ ଫୋନର ହଟସ୍ପଟ ସହ ଇଣ୍ଟରନେଟକୁ ସଂଯୋଗ କରିପାରିବେ।"</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>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"ବ୍ୟବହାର କରାଯାଉନଥିବା ସମୟରେ ଏହି ସେଟିଂସ ଡିଭାଇସକୁ ପ୍ରଭାବିତ କରେ"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"ସକ୍ଷମ କରେ:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ଧ୍ଯାନ ଦିଅନ୍ତୁ ଯେ ଏହି ମୋଡ ଡିଭାଇସର ପାୱାର ବ୍ୟବହାରକୁ ବୃଦ୍ଧି କରିପାରେ।"</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"ଆପଣ ସକ୍ଷମ କରୁଥିବା ଟିଭି ଫିଚରଗୁଡ଼ିକର ସଂଖ୍ୟା ସହ ପାୱାର ବ୍ୟବହାର ବୃଦ୍ଧି ହୋଇପାରେ।"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\"କୁ ସକ୍ଷମ କରନ୍ତୁ"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"ମୋ ରିମୋଟ ଖୋଜନ୍ତୁ"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"ଯଦି ଆପଣଙ୍କ Google TV ରିମୋଟକୁ ଭୁଲ ସ୍ଥାନରେ ରଖାଯାଇଥାଏ ତେବେ ଏହାକୁ ଖୋଜିବା ପାଇଁ ଏକ ସାଉଣ୍ଡ ପ୍ଲେ କରନ୍ତୁ"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"30 ସେକେଣ୍ଡ ପାଇଁ ଆପଣଙ୍କ ରିମୋଟରେ ଏକ ସାଉଣ୍ଡ ପ୍ଲେ କରିବାକୁ ଆପଣଙ୍କ Google TVର ପଛପଟେ ଥିବା ବଟନ ଦବାନ୍ତୁ। ଏହା କେବଳ ସମର୍ଥିତ Google TV ରିମୋଟ କଣ୍ଟ୍ରୋଲଗୁଡ଼ିକରେ କାର୍ଯ୍ୟ କରେ।\n\nସାଉଣ୍ଡ ବନ୍ଦ କରିବାକୁ ଆପଣଙ୍କ ରିମୋଟରେ ଯେ କୌଣସି ବଟନ ଦବାନ୍ତୁ।"</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"ଆପଣଙ୍କ Google TVରେ ଏକ ବଟନ ଅଛି ଯାହାକୁ ଆପଣ ଆପଣଙ୍କ ରିମୋଟରେ 30 ସେକେଣ୍ଡ ପାଇଁ ଏକ ସାଉଣ୍ଡ ପ୍ଲେ କରିବା ନିମନ୍ତେ ପୁସ କରିପାରିବେ। ଏହା କେବଳ ସମର୍ଥିତ Google TV ରିମୋଟ କଣ୍ଟ୍ରୋଲଗୁଡ଼ିକରେ କାର୍ଯ୍ୟ କରେ।\n\nସାଉଣ୍ଡ ବନ୍ଦ କରିବାକୁ ଆପଣଙ୍କ ରିମୋଟରେ ଯେ କୌଣସି ବଟନ ଦବାନ୍ତୁ।"</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"ଯେତେବେଳେ \'ମୋ ରିମୋଟ ଖୋଜନ୍ତୁ\'କୁ ସକ୍ଷମ କରାଯାଏ, ସେତେବେଳେ ଯଦି ଆପଣଙ୍କ Google TV ରିମୋଟକୁ ଭୁଲ ସ୍ଥାନରେ ରଖାଯାଇଥାଏ ତେବେ ଏହାକୁ ଖୋଜିବା ପାଇଁ ଏକ ସାଉଣ୍ଡ ପ୍ଲେ କରନ୍ତୁ।"</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"ସାଉଣ୍ଡ ପ୍ଲେ କରନ୍ତୁ"</string>
 </resources>
diff --git a/Settings/res/values-pa/energy-modes.xml b/Settings/res/values-pa/energy-modes.xml
index 1eb755a..2f03bb1 100644
--- a/Settings/res/values-pa/energy-modes.xml
+++ b/Settings/res/values-pa/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"ਘੱਟ ਊਰਜਾ ਮੋਡ"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"ਲੋੜੀਂਦੀਆਂ ਨੈੱਟਵਰਕ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨਾਲ"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"ਟੀਵੀ ਦੇ ਵਰਤੋਂ ਵਿੱਚ ਨਾ ਹੋਣ \'ਤੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਬੰਦ ਕਰੋ (ਸਟੈਂਡਬਾਈ ਮੋਡ)।"</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"ਘੱਟ"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"ਸਟੈਂਡਬਾਈ"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"ਸਟੈਂਡਬਾਈ — ਟੀਵੀ ਵਰਤੋਂ ਵਿੱਚ ਨਾ ਹੋਣ \'ਤੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਬੰਦ ਹੋ ਜਾਂਦਾ ਹੈ"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"ਮਹੱਤਵਪੂਰਨ ਅੱਪਡੇਟ ਅਤੇ ਫੰਕਸ਼ਨ"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"ਸੁਯੋਗ ਊਰਜਾ ਮੋਡ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"ਸਿਫ਼ਾਰਸ਼ੀ ਨੈੱਟਵਰਕ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨਾਲ"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"ਨੈੱਟਵਰਕ (ਨੈੱਟਵਰਕਡ ਸਟੈਂਡਬਾਈ) \'ਤੇ ਟੀਵੀ ਨੂੰ ਚਾਲੂ ਕਰਨ ਦੀਆਂ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਦੀ ਆਗਿਆ ਮਿਲਦੀ ਹੈ।"</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"ਸਾਰੀਆਂ ਜ਼ਰੂਰੀ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"ਸੁਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"ਨੈੱਟਵਰਕਡ ਸਟੈਂਡਬਾਈ"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"ਨੈੱਟਵਰਕਡ ਸਟੈਂਡਬਾਈ — ਨੈੱਟਵਰਕ \'ਤੇ ਟੀਵੀ ਕਿਰਿਆਸ਼ੀਲ ਕਰਨ ਦੀਆਂ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਹੁੰਦੀਆਂ ਹਨ"</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="6636328986387241066">"ਵੱਧ ਊਰਜਾ ਮੋਡ"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"ਵਧੀਕ ਨੈੱਟਵਰਕ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨਾਲ"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"ਟੀਵੀ ਦੇ ਵਰਤੋਂ ਵਿੱਚ ਨਾ ਹੋਣ \'ਤੇ ਵੀ ਵਾਧੂ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਦੀ ਆਗਿਆ ਮਿਲਦੀ ਹੈ।"</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"ਸਾਰੀਆਂ ਸਿਫ਼ਾਰਸ਼ੀ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"ਜ਼ਿਆਦਾ"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"ਹਮੇਸ਼ਾਂ ਕਨੈਕਟ ਰਹਿਣ ਵਾਲਾ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"ਹਮੇਸ਼ਾਂ ਕਨੈਕਟ ਰਹਿਣ ਵਾਲਾ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ — ਟੀਵੀ ਵਰਤੋਂ ਵਿੱਚ ਨਾ ਹੋਣ \'ਤੇ ਨੈੱਟਵਰਕ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਹੁੰਦੀਆਂ ਹਨ"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-pa/strings.xml b/Settings/res/values-pa/strings.xml
index 3464d0c..44e99bd 100644
--- a/Settings/res/values-pa/strings.xml
+++ b/Settings/res/values-pa/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google ਕਨੂੰਨੀ"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"ਲਾਇਸੰਸ  ਡਾਟਾ  ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
     <string name="about_model" msgid="9164284529291439296">"ਮਾਡਲ"</string>
+    <string name="device_mode" msgid="7258350575590118152">"ਡੀਵਾਈਸ ਮੋਡ"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"ਸਟੋਰ ਡੈਮੋ"</string>
     <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>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ"</string>
     <string name="connected" msgid="4981532275162345997">"ਕਨੈਕਟ ਕੀਤਾ ਗਿਆ"</string>
     <string name="not_connected" msgid="475810896484271663">"ਕਨੈਕਟ ਨਹੀਂ ਹੈ"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"ਇੰਟਰਨੈੱਟ ਨਹੀਂ ਹੈ"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"ਰੱਖਿਅਤ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"ਗਲਤ ਪਾਸਵਰਡ"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"ਵਾਈ-ਫਾਈ ਪਾਸਵਰਡ ਬਹੁਤ ਛੋਟਾ ਹੈ"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"ਸਾਈਨ-ਇਨ ਲੋੜੀਂਦਾ ਹੈ"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"ਹੋਰ ਚੋਣਾਂ"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"ਸਭ ਦੇਖੋ"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"ਘੱਟ ਵੇਖੋ"</string>
@@ -902,6 +909,13 @@
     <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>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"ਕੀ ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲ ਬਣਾਉਣੀ ਹੈ?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"ਪਹਿਲਾਂ ਹੀ ਬਣਾਈ ਗਈ"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"ਛੱਡੋ"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"ਪਿੰਨ ਬਣਾਓ"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"ਕੀ ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲ ਦਾਖਲ ਕਰਨੀ ਹੈ?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"ਕੋਈ ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲ ਨਹੀਂ"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"ਪਹਿਲਾਂ ਹੀ ਦਾਖਲ ਕੀਤੀ ਗਈ"</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="pin_enter_unlock_channel" msgid="243855138978654080">"ਇਹ ਚੈਨਲ ਦੇਖਣ ਲਈ PIN ਦਾਖਲ ਕਰੋ"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"ਰਿਕਾਰਡਿੰਗ ਲਈ ਵਰਤੇ ਜਾਣ ਵਾਲੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"ਆਡੀਓ ਰਿਕਾਰਡਿੰਗ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ।"</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"ਆਡੀਓ ਰਿਕਾਰਡਿੰਗ ਅਸਫਲ ਰਹੀ।"</string>
-    <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">"ਤੁਸੀਂ ਵਾਈ-ਫਾਈ, ਈਥਰਨੈੱਟ ਜਾਂ ਆਪਣੇ ਫ਼ੋਨ ਦੇ ਹੌਟਸਪੌਟ ਰਾਹੀਂ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਕਰ ਸਕਦੇ ਹੋ।"</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>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"ਡੀਵਾਈਸ ਵਰਤੋਂ ਵਿੱਚ ਨਾ ਹੋਣ \'ਤੇ ਇਹ ਸੈਟਿੰਗਾਂ ਪ੍ਰਭਾਵਿਤ ਕਰਦੀਆਂ ਹਨ"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"ਚਾਲੂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ਨੋਟ ਕਰੋ ਕਿ ਇਹ ਮੋਡ ਡੀਵਾਈਸ ਦੀ ਪਾਵਰ ਖਪਤ ਨੂੰ ਵਧਾ ਸਕਦਾ ਹੈ।"</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਟੀਵੀ ਦੀਆਂ ਜ਼ਿਆਦਾ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਕਰਨ \'ਤੇ ਊਰਜਾ ਦੀ ਖਪਤ ਵੱਧ ਸਕਦੀ ਹੈ।"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"ਮੇਰਾ ਰਿਮੋਟ ਲੱਭੋ"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"ਜੇ ਤੁਹਾਡੇ Google TV ਦਾ ਰਿਮੋਟ ਗੁਆਚ ਗਿਆ ਹੈ, ਤਾਂ ਇਸਨੂੰ ਲੱਭਣ ਲਈ ਕੋਈ ਧੁਨੀ ਵਜਾਓ"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"30 ਸਕਿੰਟਾਂ ਲਈ ਆਪਣੇ ਰਿਮੋਟ \'ਤੇ ਧੁਨੀ ਵਜਾਉਣ ਲਈ ਆਪਣੇ Google TV ਦੇ ਪਿੱਛੇ ਦਿੱਤੇ ਬਟਨ ਨੂੰ ਦਬਾਓ। ਇਹ ਸਿਰਫ਼ ਸਮਰਥਿਤ Google TV ਰਿਮੋਟ ਕੰਟਰੋਲਾਂ ਨਾਲ ਕੰਮ ਕਰਦੀ ਹੈ।\n\nਧੁਨੀ ਨੂੰ ਰੋਕਣ ਲਈ, ਆਪਣੇ ਰਿਮੋਟ \'ਤੇ ਕਿਸੇ ਵੀ ਬਟਨ ਨੂੰ ਦਬਾਓ।"</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"ਤੁਹਾਡੇ Google TV \'ਤੇ ਇੱਕ ਅਜਿਹਾ ਬਟਨ ਹੁੰਦਾ ਹੈ, ਜਿਸਨੂੰ ਦਬਾ ਕੇ ਤੁਸੀਂ ਆਪਣੇ ਰਿਮੋਟ \'ਤੇ 30 ਸਕਿੰਟਾਂ ਲਈ ਧੁਨੀ ਚਲਾ ਸਕਦੇ ਹੋ। ਇਹ ਸਿਰਫ਼ ਸਮਰਥਿਤ Google TV ਰਿਮੋਟ ਕੰਟਰੋਲਾਂ ਨਾਲ ਕੰਮ ਕਰਦੀ ਹੈ।\n\nਧੁਨੀ ਨੂੰ ਰੋਕਣ ਲਈ, ਆਪਣੇ ਰਿਮੋਟ \'ਤੇ ਕਿਸੇ ਵੀ ਬਟਨ ਨੂੰ ਦਬਾਓ।"</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"\'ਮੇਰਾ ਰਿਮੋਟ ਲੱਭੋ\' ਸੁਵਿਧਾ ਚਾਲੂ ਹੋਣ \'ਤੇ, ਜੇ ਤੁਹਾਡੇ Google TV ਦਾ ਰਿਮੋਟ ਗੁਆਚ ਜਾਂਦਾ ਹੈ, ਤਾਂ ਤੁਸੀਂ ਆਪਣੇ ਰਿਮੋਟ ਨੂੰ ਲੱਭਣ ਲਈ ਇੱਕ ਧੁਨੀ ਵਜਾ ਸਕਦੇ ਹੋ।"</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"ਧੁਨੀ ਵਜਾਓ"</string>
 </resources>
diff --git a/Settings/res/values-pl/energy-modes.xml b/Settings/res/values-pl/energy-modes.xml
index b2ed105..f1a49b0 100644
--- a/Settings/res/values-pl/energy-modes.xml
+++ b/Settings/res/values-pl/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Tryb niskiego zużycia energii"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"z podstawowymi funkcjami sieciowymi"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Wyłącz połączenie sieciowe, kiedy nie używasz telewizora (tryb gotowości)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Niskie zużycie"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Tryb gotowości"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Tryb gotowości – połączenie sieciowe jest wyłączone, gdy telewizor nie jest używany"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Kluczowe aktualizacje i funkcje"</item>
+    <item msgid="4002284890471636101">"[Wstawić funkcję 1]"</item>
+    <item msgid="7072772341455731040">"[Wstawić funkcję 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Tryb optymalnego zużycia energii"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"z zalecanymi funkcjami sieciowymi"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Włącza funkcje aktywujące telewizor przez sieć (tryb czuwania przy podłączeniu do sieci)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Wszystkie niezbędne funkcje"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Zoptymalizowane zużycie"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Tryb czuwania przy podłączeniu do sieci"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Tryb czuwania przy podłączeniu do sieci – włącza funkcje wybudzania telewizora przez sieć"</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="6636328986387241066">"Tryb zwiększonego zużycia energii"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"z dodatkowymi funkcjami sieciowymi"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Pozwala korzystać z dodatkowych funkcji, nawet gdy nie używasz telewizora."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Wszystkie zalecane funkcje"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Zwiększone zużycie"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Zawsze połączone"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Zawsze połączone – włącza funkcje sieciowe, gdy telewizor nie jest używany"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Wstawić funkcję 1]"</item>
     <item msgid="170760143032597722">"[Wstawić funkcję 2]"</item>
diff --git a/Settings/res/values-pl/strings.xml b/Settings/res/values-pl/strings.xml
index 26ba356..d26ecea 100644
--- a/Settings/res/values-pl/strings.xml
+++ b/Settings/res/values-pl/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Informacje prawne Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Dane licencji są niedostępne"</string>
     <string name="about_model" msgid="9164284529291439296">"Model"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Tryb urządzenia"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Tryb demonstracyjny (dla sklepów)"</string>
     <string name="about_version" msgid="6223547403835399861">"Wersja systemu operacyjnego Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Numer seryjny"</string>
     <string name="about_build" msgid="8467840394761634575">"Kompilacja systemu operacyjnego Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Połączenie internetowe"</string>
     <string name="connected" msgid="4981532275162345997">"Połączono"</string>
     <string name="not_connected" msgid="475810896484271663">"Nie połączono"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Brak internetu"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Zapisano"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Nieprawidłowe hasło"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Hasło do Wi-Fi jest za krótkie"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Musisz się zalogować"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Inne opcje"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Pokaż wszystkie"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Pokaż mniej"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Dostosuj ograniczenia"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Chwileczkę…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Zmień kod PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Utworzyć profil ograniczony?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Już utworzono"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Pomiń"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Utwórz kod PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Włączyć profil ograniczony?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Brak profilu ograniczonego"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Już włączono"</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">"Ta aplikacja może uzyskiwać dostęp do Twoich kont. Kontrolowane przez: <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Aby oglądać ten kanał, wpisz kod PIN"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Mikrofony"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Nie udało się rozpocząć nagrywania dźwięku."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Nie udało się ponownie nagrać dźwięku."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Oszczędzanie danych"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Automatycznie dostosuj jakość, by ograniczyć mobilną transmisję danych"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Użycie danych i alerty"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Z internetem możesz połączyć się przez Wi-Fi, Ethernet lub hotspot na telefonie."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Ustawić urządzenie jako widoczne dla innych urządzeń Bluetooth?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Aplikacja chce ustawić Twój telewizor jako widoczny dla innych urządzeń Bluetooth przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Te ustawienia wpływają na urządzenie, gdy nie jest używane"</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_mode_eco_hint" msgid="5280058011809503514">"Zużycie energii może wzrosnąć wraz z liczbą włączonych funkcji telewizora."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Włącz tryb „<xliff:g id="ENERGYMODENAME">%s</xliff:g>”"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Znajdź pilota"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Włącz dźwięk, aby znaleźć zgubionego pilota do Google TV"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Naciśnij przycisk z tyłu Google TV, aby na 30 sekund włączyć dźwięk na pilocie. Działa to tylko w przypadku obsługiwanych pilotów do Google TV.\n\nAby wyłączyć dźwięk, naciśnij dowolny przycisk na pilocie."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"W Google TV znajduje się przycisk, który możesz nacisnąć, aby odtwarzać dźwięk na pilocie przez 30 sekund. Działa to tylko w przypadku obsługiwanych pilotów do Google TV.\n\nAby wyłączyć dźwięk, naciśnij dowolny przycisk na pilocie."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Gdy funkcja Znajdź pilota jest włączona, możesz włączyć dźwięk, aby znaleźć zgubionego pilota do Google TV."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Włącz dźwięk"</string>
 </resources>
diff --git a/Settings/res/values-pt-rBR/energy-modes.xml b/Settings/res/values-pt-rBR/energy-modes.xml
index 7b4ef82..0a81021 100644
--- a/Settings/res/values-pt-rBR/energy-modes.xml
+++ b/Settings/res/values-pt-rBR/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Modo de baixa energia"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"com recursos de rede essenciais"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Desativa a conexão de rede quando a TV não estiver em uso (modo de espera)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Baixo consumo"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Em espera"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Em espera: a conexão de rede fica desligada quando a TV não está em uso"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Atualizações e funções importantes"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Modo de energia otimizada"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"com recursos de rede recomendados"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Permite recursos que ligam a TV usando a rede (modo de espera em rede)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Todos os recursos essenciais"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Consumo otimizado"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Modo de espera em rede"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Modo de espera em rede: ativa recursos para ligar a TV pela 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="6636328986387241066">"Modo de alta energia"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"com recursos de rede extras"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Permite recursos extras mesmo quando a TV não está em uso."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Todos os recursos recomendados"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Consumo elevado"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Sempre conectado"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Sempre conectado: ativa recursos de rede quando a TV não está em uso"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-pt-rBR/strings.xml b/Settings/res/values-pt-rBR/strings.xml
index 49c0fca..922c2a9 100644
--- a/Settings/res/values-pt-rBR/strings.xml
+++ b/Settings/res/values-pt-rBR/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Informações legais do Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Os dados de licença estão indisponíveis"</string>
     <string name="about_model" msgid="9164284529291439296">"Modelo"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Modo dispositivo"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Demonstração para lojas"</string>
     <string name="about_version" msgid="6223547403835399861">"Versão do SO do Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Número de série"</string>
     <string name="about_build" msgid="8467840394761634575">"Build do SO do Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Conexão de Internet"</string>
     <string name="connected" msgid="4981532275162345997">"Conectado"</string>
     <string name="not_connected" msgid="475810896484271663">"Não conectado"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Sem Internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Salvo"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Senha incorreta"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"A senha do Wi-Fi é muito curta"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"É necessário fazer login"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Outras opções"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Ver tudo"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Ver menos"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Personalizar restrições"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Um momento…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Alterar PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Criar um perfil restrito?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Já criado"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Pular"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Criar PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Entrar no perfil restrito?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Nenhum perfil restrito"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Já conectado"</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">"Este app pode acessar suas contas. Controlado por <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Digite o PIN para assistir a este canal"</string>
@@ -979,10 +993,10 @@
     <string name="privacy_backup_account" msgid="4527813051841860610">"Conta de backup"</string>
     <string name="privacy_automatic_restore" msgid="7117805818589418118">"Restauração automática"</string>
     <string name="factory_reset_device" msgid="6509900821515094361">"Redefinir dispositivo"</string>
-    <string name="factory_reset_description" msgid="6697396335158766785">"Essa ação restaurará seu dispositivo para as configurações padrão e apagará todos os dados, contas, arquivos e apps transferidos por download."</string>
-    <string name="factory_reset_info_description" msgid="5098454670833183487">"Essa ação restaurará seu dispositivo às configurações padrão e apagará dados, contas, arquivos e apps transferidos por download."</string>
-    <string name="factory_reset_content_description" msgid="1677022688420116803">"Redefinir para a configuração original: essa ação restaurará seu dispositivo para as configurações padrão e apagará todos os dados, contas, arquivos e apps transferidos por download."</string>
-    <string name="confirm_factory_reset_description" msgid="1337483463207721713">"Apagar todas as suas informações pessoais e todos os apps transferidos por download neste dispositivo? Não é possível reverter essa ação."</string>
+    <string name="factory_reset_description" msgid="6697396335158766785">"Essa ação restaurará seu dispositivo para as configurações padrão e apagará todos os dados, contas, arquivos e apps baixados."</string>
+    <string name="factory_reset_info_description" msgid="5098454670833183487">"Essa ação restaurará seu dispositivo às configurações padrão e apagará dados, contas, arquivos e apps baixados."</string>
+    <string name="factory_reset_content_description" msgid="1677022688420116803">"Redefinir para a configuração original: essa ação restaurará seu dispositivo para as configurações padrão e apagará todos os dados, contas, arquivos e apps baixados."</string>
+    <string name="confirm_factory_reset_description" msgid="1337483463207721713">"Apagar todas as suas informações pessoais e todos os apps baixados neste dispositivo? Não é possível reverter essa ação."</string>
     <string name="confirm_factory_reset_device" msgid="4308646529880718465">"Apagar tudo"</string>
     <string name="select_device_name_title" msgid="3045019448327493634">"Escolher um nome para seu <xliff:g id="DEVICEMODEL">%1$s</xliff:g>"</string>
     <string name="select_device_name_description" msgid="8528185095614986580">"Dê um nome ao seu dispositivo para identificá-lo em transmissões ou para se conectar com ele a partir de outros dispositivos."</string>
@@ -1047,7 +1061,7 @@
     <string name="alarms_and_reminders_description" msgid="4063972350154624500">"Permitir que apps definam alarmes e programem ações. Essa opção autoriza a execução de apps em segundo plano, o que pode consumir mais bateria.\n\nSe a permissão for desativada, os alarmes e eventos programados pelo app não funcionarão."</string>
     <string name="turn_screen_on_title" msgid="5293798529284629011">"Ligar tela"</string>
     <string name="allow_turn_screen_on" msgid="4903401106871656521">"Permitir que a tela seja ligada"</string>
-    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Permitir que um app ligue a tela. Se permitido, o app vai poder ligar a tela a qualquer momento sem uma intent explícita."</string>
+    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Permitir que um app ative a tela. Com sua autorização, o app vai poder ligar a tela a qualquer momento, sem você pedir."</string>
     <string name="special_access" msgid="21806055758289916">"Acesso especial para apps"</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">"Áudio"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Microfones gravados"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Falha ao iniciar a gravação de áudio."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Falha na gravação de áudio."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Economia de dados"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Ajusta automaticamente a qualidade de vídeo para usar menos dados móveis"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Alertas e uso de dados"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"É possível se conectar à Internet por Wi-Fi, Ethernet ou pelo ponto de acesso do smartphone."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Ficar visível para outros dispositivos Bluetooth?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Um app quer tornar sua TV visível para outros dispositivos Bluetooth por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Essas configurações afetam o dispositivo quando ele 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_mode_eco_hint" msgid="5280058011809503514">"O consumo de energia pode aumentar com o número de recursos ativados da TV."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Ativar \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Encontrar meu controle remoto"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Toque um som para localizar o controle remoto do Google TV caso ele esteja perdido"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Pressione o botão na parte de trás do Google TV para tocar um som no controle remoto por 30 segundos. Isso só funciona com controles remotos do Google TV compatíveis.\n\nPara interromper o som, pressione qualquer botão no controle."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Há um botão no Google TV que você pode pressionar para tocar um som no controle remoto por 30 segundos. Isso só funciona com controles remotos do Google TV compatíveis.\n\nPara interromper o som, pressione qualquer botão no controle."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Quando o recurso Encontrar meu controle remoto estiver ativado, você poderá tocar um som para localizar o controle remoto do Google TV se ele estiver perdido."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Tocar som"</string>
 </resources>
diff --git a/Settings/res/values-pt-rPT/energy-modes.xml b/Settings/res/values-pt-rPT/energy-modes.xml
index 4019a28..7b8eac8 100644
--- a/Settings/res/values-pt-rPT/energy-modes.xml
+++ b/Settings/res/values-pt-rPT/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Modo de baixo consumo"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"funcionalidades de rede essenciais"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Desligue a ligação de rede quando a TV não estiver a ser usada (modo de espera)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Baixo"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Modo de espera"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Modo de espera: a ligação de rede está desativada quando a TV não está a ser usada"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Funções e atualizações críticas"</item>
+    <item msgid="4002284890471636101">"[Introduzir funcionalidade 1]"</item>
+    <item msgid="7072772341455731040">"[Introduzir funcionalidade 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Modo de energia otimizado"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"com funcionalidades de rede recomendadas"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Permite funcionalidades para ativar a TV através da rede (modo de espera em rede)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Todas as funcionalidades essenciais"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Otimizado"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Espera em rede"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Espera em rede: permite que as funcionalidades ativem a TV através da 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="6636328986387241066">"Modo de maior consumo"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"com funcionalidades de rede adicionais"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Permite funcionalidades adicionais mesmo quando a TV não está a ser usada."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Todas as funcionalidades recomendadas"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Aumentado"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Sempre ligado"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Sempre ligado: permite as funcionalidades de rede quando a TV não está a ser usada"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Introduzir funcionalidade 1]"</item>
     <item msgid="170760143032597722">"[Introduzir funcionalidade 2]"</item>
diff --git a/Settings/res/values-pt-rPT/strings.xml b/Settings/res/values-pt-rPT/strings.xml
index a5529cc..f6df10f 100644
--- a/Settings/res/values-pt-rPT/strings.xml
+++ b/Settings/res/values-pt-rPT/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Informações legais da Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Dados da licença indisponíveis"</string>
     <string name="about_model" msgid="9164284529291439296">"Modelo"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Modo de dispositivo"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Demonstração da loja"</string>
     <string name="about_version" msgid="6223547403835399861">"Versão do SO do Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Número de série"</string>
     <string name="about_build" msgid="8467840394761634575">"Compilação do SO do Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Ligação à Internet"</string>
     <string name="connected" msgid="4981532275162345997">"Ligado"</string>
     <string name="not_connected" msgid="475810896484271663">"Sem ligação"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Sem Internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Guardada"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Palavra-passe incorreta"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"A palavra-passe do Wi-Fi é demasiado curta"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Início de sessão obrigatório"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Outras opções"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Ver tudo"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Ver menos"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Personalizar restrições"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Aguarde..."</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Alterar PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Criar perfil restrito?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Já foi criado"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Ignorar"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Criar PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Entrar no perfil restrito?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Nenhum perfil restrito"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Já entrou"</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">"Esta aplicação pode aceder às suas contas. Controladas por <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Introduzir o PIN para ver este canal"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Microfones gravados"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Falha ao iniciar a gravação de áudio."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Falha na gravação de áudio."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Poupança de dados"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Ajuste automaticamente a qualidade do vídeo para utilizar menos dados móveis."</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Utilização de dados e alertas"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Pode estabelecer ligação à Internet através de uma rede Wi-Fi, Ethernet ou da zona Wi-Fi do seu telemóvel."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Tornar visível para outros dispositivos Bluetooth?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Uma app quer tornar a TV visível para outros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Estas definições afetam o dispositivo quando este não está a ser usado"</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_mode_eco_hint" msgid="5280058011809503514">"O consumo de energia pode aumentar com o número de funcionalidades da TV que ativar."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Ativar \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Localizar o meu comando"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Toque um som para localizar o comando do Google TV se não souber onde este se encontra"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Prima o botão na parte de trás do Google TV para tocar um som no comando durante 30 segundos. Isto só funciona com comandos do Google TV suportados.\n\nPara parar o som, prima qualquer botão no comando."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Existe um botão no seu Google TV que pode premir para emitir um som no comando durante 30 segundos. Isto só funciona com comandos do Google TV suportados.\n\nPara parar o som, prima qualquer botão no comando."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Quando a funcionalidade Localizar o meu comando está ativada, pode tocar um som para localizar o comando do Google TV se não souber onde este se encontra."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Tocar som"</string>
 </resources>
diff --git a/Settings/res/values-pt/energy-modes.xml b/Settings/res/values-pt/energy-modes.xml
index 7b4ef82..0a81021 100644
--- a/Settings/res/values-pt/energy-modes.xml
+++ b/Settings/res/values-pt/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Modo de baixa energia"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"com recursos de rede essenciais"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Desativa a conexão de rede quando a TV não estiver em uso (modo de espera)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Baixo consumo"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Em espera"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Em espera: a conexão de rede fica desligada quando a TV não está em uso"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Atualizações e funções importantes"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Modo de energia otimizada"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"com recursos de rede recomendados"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Permite recursos que ligam a TV usando a rede (modo de espera em rede)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Todos os recursos essenciais"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Consumo otimizado"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Modo de espera em rede"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Modo de espera em rede: ativa recursos para ligar a TV pela 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="6636328986387241066">"Modo de alta energia"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"com recursos de rede extras"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Permite recursos extras mesmo quando a TV não está em uso."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Todos os recursos recomendados"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Consumo elevado"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Sempre conectado"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Sempre conectado: ativa recursos de rede quando a TV não está em uso"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-pt/strings.xml b/Settings/res/values-pt/strings.xml
index 49c0fca..922c2a9 100644
--- a/Settings/res/values-pt/strings.xml
+++ b/Settings/res/values-pt/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Informações legais do Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Os dados de licença estão indisponíveis"</string>
     <string name="about_model" msgid="9164284529291439296">"Modelo"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Modo dispositivo"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Demonstração para lojas"</string>
     <string name="about_version" msgid="6223547403835399861">"Versão do SO do Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Número de série"</string>
     <string name="about_build" msgid="8467840394761634575">"Build do SO do Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Conexão de Internet"</string>
     <string name="connected" msgid="4981532275162345997">"Conectado"</string>
     <string name="not_connected" msgid="475810896484271663">"Não conectado"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Sem Internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Salvo"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Senha incorreta"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"A senha do Wi-Fi é muito curta"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"É necessário fazer login"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Outras opções"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Ver tudo"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Ver menos"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Personalizar restrições"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Um momento…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Alterar PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Criar um perfil restrito?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Já criado"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Pular"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Criar PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Entrar no perfil restrito?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Nenhum perfil restrito"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Já conectado"</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">"Este app pode acessar suas contas. Controlado por <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Digite o PIN para assistir a este canal"</string>
@@ -979,10 +993,10 @@
     <string name="privacy_backup_account" msgid="4527813051841860610">"Conta de backup"</string>
     <string name="privacy_automatic_restore" msgid="7117805818589418118">"Restauração automática"</string>
     <string name="factory_reset_device" msgid="6509900821515094361">"Redefinir dispositivo"</string>
-    <string name="factory_reset_description" msgid="6697396335158766785">"Essa ação restaurará seu dispositivo para as configurações padrão e apagará todos os dados, contas, arquivos e apps transferidos por download."</string>
-    <string name="factory_reset_info_description" msgid="5098454670833183487">"Essa ação restaurará seu dispositivo às configurações padrão e apagará dados, contas, arquivos e apps transferidos por download."</string>
-    <string name="factory_reset_content_description" msgid="1677022688420116803">"Redefinir para a configuração original: essa ação restaurará seu dispositivo para as configurações padrão e apagará todos os dados, contas, arquivos e apps transferidos por download."</string>
-    <string name="confirm_factory_reset_description" msgid="1337483463207721713">"Apagar todas as suas informações pessoais e todos os apps transferidos por download neste dispositivo? Não é possível reverter essa ação."</string>
+    <string name="factory_reset_description" msgid="6697396335158766785">"Essa ação restaurará seu dispositivo para as configurações padrão e apagará todos os dados, contas, arquivos e apps baixados."</string>
+    <string name="factory_reset_info_description" msgid="5098454670833183487">"Essa ação restaurará seu dispositivo às configurações padrão e apagará dados, contas, arquivos e apps baixados."</string>
+    <string name="factory_reset_content_description" msgid="1677022688420116803">"Redefinir para a configuração original: essa ação restaurará seu dispositivo para as configurações padrão e apagará todos os dados, contas, arquivos e apps baixados."</string>
+    <string name="confirm_factory_reset_description" msgid="1337483463207721713">"Apagar todas as suas informações pessoais e todos os apps baixados neste dispositivo? Não é possível reverter essa ação."</string>
     <string name="confirm_factory_reset_device" msgid="4308646529880718465">"Apagar tudo"</string>
     <string name="select_device_name_title" msgid="3045019448327493634">"Escolher um nome para seu <xliff:g id="DEVICEMODEL">%1$s</xliff:g>"</string>
     <string name="select_device_name_description" msgid="8528185095614986580">"Dê um nome ao seu dispositivo para identificá-lo em transmissões ou para se conectar com ele a partir de outros dispositivos."</string>
@@ -1047,7 +1061,7 @@
     <string name="alarms_and_reminders_description" msgid="4063972350154624500">"Permitir que apps definam alarmes e programem ações. Essa opção autoriza a execução de apps em segundo plano, o que pode consumir mais bateria.\n\nSe a permissão for desativada, os alarmes e eventos programados pelo app não funcionarão."</string>
     <string name="turn_screen_on_title" msgid="5293798529284629011">"Ligar tela"</string>
     <string name="allow_turn_screen_on" msgid="4903401106871656521">"Permitir que a tela seja ligada"</string>
-    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Permitir que um app ligue a tela. Se permitido, o app vai poder ligar a tela a qualquer momento sem uma intent explícita."</string>
+    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Permitir que um app ative a tela. Com sua autorização, o app vai poder ligar a tela a qualquer momento, sem você pedir."</string>
     <string name="special_access" msgid="21806055758289916">"Acesso especial para apps"</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">"Áudio"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Microfones gravados"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Falha ao iniciar a gravação de áudio."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Falha na gravação de áudio."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Economia de dados"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Ajusta automaticamente a qualidade de vídeo para usar menos dados móveis"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Alertas e uso de dados"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"É possível se conectar à Internet por Wi-Fi, Ethernet ou pelo ponto de acesso do smartphone."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Ficar visível para outros dispositivos Bluetooth?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Um app quer tornar sua TV visível para outros dispositivos Bluetooth por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Essas configurações afetam o dispositivo quando ele 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_mode_eco_hint" msgid="5280058011809503514">"O consumo de energia pode aumentar com o número de recursos ativados da TV."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Ativar \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Encontrar meu controle remoto"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Toque um som para localizar o controle remoto do Google TV caso ele esteja perdido"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Pressione o botão na parte de trás do Google TV para tocar um som no controle remoto por 30 segundos. Isso só funciona com controles remotos do Google TV compatíveis.\n\nPara interromper o som, pressione qualquer botão no controle."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Há um botão no Google TV que você pode pressionar para tocar um som no controle remoto por 30 segundos. Isso só funciona com controles remotos do Google TV compatíveis.\n\nPara interromper o som, pressione qualquer botão no controle."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Quando o recurso Encontrar meu controle remoto estiver ativado, você poderá tocar um som para localizar o controle remoto do Google TV se ele estiver perdido."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Tocar som"</string>
 </resources>
diff --git a/Settings/res/values-ro/energy-modes.xml b/Settings/res/values-ro/energy-modes.xml
index 5adca08..9b6faad 100644
--- a/Settings/res/values-ro/energy-modes.xml
+++ b/Settings/res/values-ro/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Modul cu consum redus de energie"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"cu funcții esențiale pentru rețea"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Dezactivează conexiunea la rețea când televizorul nu este în uz (modul standby)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Scăzut"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Standby"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Standby — Conexiunea la rețea este dezactivată când televizorul nu este în uz"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Actualizări și funcții esențiale"</item>
+    <item msgid="4002284890471636101">"[Inserează funcția 1]"</item>
+    <item msgid="7072772341455731040">"[Inserează funcția 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Modul cu consum de energie optimizat"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"cu funcții recomandate pentru rețea"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Permite ca funcțiile să activeze televizorul prin rețea (standby prin rețea)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Toate funcțiile esențiale"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimizat"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Standby prin rețea"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Standby prin rețea — Permite funcțiilor să activeze televizorul prin 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="6636328986387241066">"Modul cu consum de energie crescut"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"cu funcții suplimentare pentru rețea"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Permite folosirea unor funcții suplimentare chiar dacă televizorul nu este folosit."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Toate funcțiile recomandate"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Sporit"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Întotdeauna conectat"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Permanent conectat — Activează funcțiile de rețea când televizorul nu este în uz"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Inserează funcția 1]"</item>
     <item msgid="170760143032597722">"[Inserează funcția 2]"</item>
diff --git a/Settings/res/values-ro/strings.xml b/Settings/res/values-ro/strings.xml
index a958af3..dd3c9a2 100644
--- a/Settings/res/values-ro/strings.xml
+++ b/Settings/res/values-ro/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Aspecte juridice Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Datele despre licență nu sunt disponibile"</string>
     <string name="about_model" msgid="9164284529291439296">"Model"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Modul dispozitiv"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Versiune demonstrativă pentru magazin"</string>
     <string name="about_version" msgid="6223547403835399861">"Versiunea SO Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Număr de serie"</string>
     <string name="about_build" msgid="8467840394761634575">"Versiunea SO Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Conexiune de internet"</string>
     <string name="connected" msgid="4981532275162345997">"Conectată"</string>
     <string name="not_connected" msgid="475810896484271663">"Neconectat"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Nu există conexiune la internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Salvată"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Parolă greșită"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Parola rețelei Wi-Fi este prea scurtă"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Trebuie să te conectezi"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Alte opțiuni"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Afișează tot"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Afișează mai puține"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Personalizează restricții"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Un moment…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Schimbă codul PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Creezi un profil limitat?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Deja creat"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Omite"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Creează un PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Intri în profilul limitat?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Niciun profil limitat"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Deja introdus"</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">"Această aplicație îți poate accesa conturile. Este controlată de <xliff:g id="APP">%1$s</xliff:g>."</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Introdu codul PIN pentru a viziona acest canal"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Microfoane înregistrate"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Înregistrarea audio nu a pornit."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Nu s-a înregistrat conținutul audio."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Economizor de date"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Ajustează automat calitatea video pentru a folosi mai puține date mobile"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Utilizarea datelor și alerte"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Poți să te conectezi la internet prin Wi-Fi, Ethernet sau hotspotul telefonului."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Faci dispozitivul vizibil pentru alte dispozitive Bluetooth?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"O aplicație încearcă să facă televizorul vizibil pentru alte dispozitive Bluetooth timp de <xliff:g id="TIMEOUT">%1$d</xliff:g> secunde."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Aceste setări afectează dispozitivul când nu este în uz"</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_mode_eco_hint" msgid="5280058011809503514">"Consumul de energie poate spori cu numărul de funcții TV activate."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Activează <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Găsește-mi telecomanda"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Redă un sunet ca să-ți găsești telecomanda Google TV dacă ai pierdut-o"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Apasă butonul de pe spatele dispozitivului Google TV ca să redai un sunet pe telecomandă timp de 30 de secunde. Opțiunea funcționează numai pentru telecomenzile Google TV acceptate.\n\nCa să oprești sunetul, apasă orice buton de pe telecomandă."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Există un buton pe Google TV pe care îl poți apăsa ca să redai un sunet pe telecomandă timp de 30 de secunde. Opțiunea funcționează numai pentru telecomenzile Google TV acceptate.\n\nCa să oprești sunetul, apasă orice buton de pe telecomandă."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Când se activează funcția Găsește-mi telecomanda, poți reda un sunet ca să-ți găsești telecomanda Google TV dacă ai pierdut-o."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Redă sunetul"</string>
 </resources>
diff --git a/Settings/res/values-ru/energy-modes.xml b/Settings/res/values-ru/energy-modes.xml
index 87f465f..353df8b 100644
--- a/Settings/res/values-ru/energy-modes.xml
+++ b/Settings/res/values-ru/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Режим низкого энергопотребления"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"с поддержкой основных сетевых функций"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Когда телевизор не используется (режим ожидания), сетевое подключение приостанавливается."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Низкое потребление"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Режим ожидания"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Режим ожидания – когда телевизор не используется, он не подключен к интернету"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Важные обновления и функции"</item>
+    <item msgid="4002284890471636101">"[Укажите функцию 1]"</item>
+    <item msgid="7072772341455731040">"[Укажите функцию 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Режим оптимизированного энергопотребления"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"с поддержкой рекомендованных сетевых функций"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Позволяет активировать телевизор по сети (режим ожидания с подключением к сети)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Все основные функции"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Оптимизированное потребление"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Режим ожидания с подключением к сети"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Режим ожидания с подключением к сети – позволяет выводить телевизор из спящего режима через интернет"</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="6636328986387241066">"Режим увеличенного энергопотребления"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"с поддержкой дополнительных сетевых функций"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Позволяет использовать дополнительные возможности, даже если телевизор не работает."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Все рекомендуемые функции"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Повышенное потребление"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Всегда онлайн"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Всегда онлайн – сетевые функции доступны, даже когда телевизор не используется"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-ru/strings.xml b/Settings/res/values-ru/strings.xml
index 2793dea..eb5456c 100644
--- a/Settings/res/values-ru/strings.xml
+++ b/Settings/res/values-ru/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Правовая информация Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Нет данных о лицензии"</string>
     <string name="about_model" msgid="9164284529291439296">"Модель"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Режим устройства"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Деморежим для магазина"</string>
     <string name="about_version" msgid="6223547403835399861">"Версия ОС Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Серийный номер"</string>
     <string name="about_build" msgid="8467840394761634575">"Сборка ОС Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Подключение к Интернету"</string>
     <string name="connected" msgid="4981532275162345997">"Подключено"</string>
     <string name="not_connected" msgid="475810896484271663">"Нет подключения"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Нет подключения к интернету."</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Сеть сохранена."</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Неверный пароль."</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Пароль сети Wi-Fi слишком короткий."</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Необходимо выполнить вход."</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Другие варианты"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Показать все"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Свернуть"</string>
@@ -902,6 +909,13 @@
     <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">"Изменить PIN-код"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Созд. профиль с огр. доступом?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Профиль уже создан"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Пропустить"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Создать PIN-код"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Откр. профиль с огр. доступом?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Нет профилей с огр. доступом"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Вход в профиль уже выполнен"</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="pin_enter_unlock_channel" msgid="243855138978654080">"Введите PIN-код, чтобы включить канал"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Микрофоны для записи"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Не удалось включить запись аудио."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Не удалось записать аудио."</string>
-    <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, сети Ethernet или точки доступа на телефоне"</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Сделать видимым для других устройств Bluetooth?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Одному из приложений требуется, чтобы ваш телевизор был доступен для поиска по Bluetooth на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Эти параметры влияют на работу устройства, когда оно не используется"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"Будут включены:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Обратите внимание, что этот режим может увеличить энергопотребление устройства."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"Чем больше функций телевизора вы включаете, тем выше может быть потребление энергии."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Включить режим \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\"?"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Поиск пульта"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Воспроизводить звуковой сигнал на потерянном пульте Google TV"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Нажмите кнопку на задней панели устройства Google TV, чтобы пульт издал 30-секундный звуковой сигнал. Функция работает только на поддерживаемых пультах для устройств Google TV.\n\nЧтобы прекратить воспроизведение сигнала, нажмите любую кнопку на пульте."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"На вашем устройстве Google TV есть кнопка, которую можно нажать, чтобы в течение 30 секунд на пульте воспроизводился звук. Функция работает только на поддерживаемых пультах для устройств Google TV.\n\nЧтобы прекратить воспроизведение сигнала, нажмите любую кнопку на пульте."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Когда функция \"Поиск пульта\" включена, вы можете находить потерянный пульт Google TV по звуковому сигналу."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Воспроизвести звуковой сигнал"</string>
 </resources>
diff --git a/Settings/res/values-si/energy-modes.xml b/Settings/res/values-si/energy-modes.xml
index c68a918..5e28018 100644
--- a/Settings/res/values-si/energy-modes.xml
+++ b/Settings/res/values-si/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"අඩු බලශක්ති ප්‍රකාරය"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"අත්‍යවශ්‍යාංග ජාල විශේෂාංග සමග"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"රූපවාහිනිය භාවිතයේ නොමැති විට (පොරොත්තු ප්‍රකාරය) ජාල සබැඳුම ක්‍රියා විරහිත කරන්න."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"අඩු"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"පොරොත්තු"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"පොරොත්තු — රූපවාහිනිය භාවිතයේ නොමැති විට ජාල සම්බන්ධතාවය ක්‍රියා විරහිත වේ"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"තීරණාත්මක යාවත්කාලීන සහ කාර්යයන්"</item>
+    <item msgid="4002284890471636101">"[විශේෂාංගය 1 ඇතුළත් කරන්න]"</item>
+    <item msgid="7072772341455731040">"[විශේෂාංගය 2 ඇතුළත් කරන්න]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"ප්‍රශස්ත කළ බලශක්ති ප්‍රකාරය"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"නිර්දේශිත ජාල විශේෂාංග සමග"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"ජාලය හරහා රූපවාහිනිය අවදි කිරීමට විශේෂාංගවලට ඉඩ දෙයි (ජාලගත පොරොත්තුව)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"සියලු අත්‍යවශ්‍ය විශේෂාංග"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"ප්‍රශස්ත කළ"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"ජාලගත පොරොත්තු"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"ජාලගත පොරොත්තු — ජාලය හරහා රූපවාහිනිය අවදි කිරීමට විශේෂාංග සබල කරයි"</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="6636328986387241066">"වැඩි කළ බලශක්ති ප්‍රකාරය"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"අතිරේක ජාල විශේෂාංග සමග"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"රූපවාහිනිය භාවිතයේ නොමැති විට පවා අමතර විශේෂාංගවලට ඉඩ දෙයි."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"සියලු නිර්දේශිත විශේෂාංග"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"වැඩි කළ"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"සැම විට සම්බන්ධයි"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"සැම විට සම්බන්ධයි — රූපවාහිනිය භාවිතයේ නොමැති විට ජාල විශේෂාංග සබල කරයි"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[විශේෂාංගය 1 ඇතුළත් කරන්න]"</item>
     <item msgid="170760143032597722">"[විශේෂාංගය 2 ඇතුළත් කරන්න]"</item>
diff --git a/Settings/res/values-si/strings.xml b/Settings/res/values-si/strings.xml
index 8c9a2d9..1a8d04b 100644
--- a/Settings/res/values-si/strings.xml
+++ b/Settings/res/values-si/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google නීතිමය"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"බලපත්‍ර දත්ත ලබාගත නොහැක"</string>
     <string name="about_model" msgid="9164284529291439296">"අනුකෘතිය"</string>
+    <string name="device_mode" msgid="7258350575590118152">"උපාංග ප්‍රකාරය"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"ගබඩා ආදර්ශනය"</string>
     <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>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"අන්තර්ජාල සබඳතාව"</string>
     <string name="connected" msgid="4981532275162345997">"සම්බන්ධියි"</string>
     <string name="not_connected" msgid="475810896484271663">"සම්බන්ධ වී නොමැත"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"අන්තර්ජාලය නැත"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"සුරැකිණි"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"වැරදි මුරපදයකි"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi මුරපදය කෙටි වැඩියි"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"පුරනු ලැබීම අවශ්‍යය"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"වෙනත් විකල්ප"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"සියල්ල බලන්න"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"අඩුවෙන් බලන්න"</string>
@@ -902,6 +909,13 @@
     <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">"PIN එක වෙනස් කරන්න"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"සීමා කළ පැතිකඩක් තනන්න ද?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"දැනටමත් තනා ඇත"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"මඟ හරින්න"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"PIN එක තනන්න"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"සීමා කළ පැතිකඩ ඇතුළු කරන්න ද?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"සීමා කළ පැතිකඩක් නැත"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"දැනටමත් ඇතුළු කර ඇත"</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="pin_enter_unlock_channel" msgid="243855138978654080">"මෙම නාලිකාව නැරඹිමට PIN එක ඇතුළු කරන්න"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"පටිගත කළ මයික්‍රෆෝනය(න්)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"ශ්‍රව්‍ය පටිගත කිරීම ඇරඹීමට අසමත් විය."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"ශ්‍රව්‍ය පටිගත කිරීම අසමත් විය."</string>
-    <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="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>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"භාවිතයේ නොමැති විට මෙම සැකසීම් උපාංගයට බලපායි"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"සබල කරයි:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"මෙම ප්‍රකාරය උපාංගයෙහි බලශක්ති පරිභෝජනය වැඩි කළ හැකි බව සලකන්න."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"ඔබ සබල කරන රූපවාහිනී විශේෂාංග ගණන සමග බල පරිභෝජනය වැඩි විය හැක."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" සබල කරන්න"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"මගේ දුරස්ථ පාලකය සොයා ගන්න"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"ඔබේ Google TV දුරස්ථ පාලකය අස්ථානගත වී ඇත්නම් එය සොයා ගැනීමට හඬක් වාදනය කරන්න"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"තත්පර 30ක් ඔබේ දුරස්ථ පාලකයේ ශබ්දයක් වාදනය කිරීමට ඔබේ Google TV හි පිටුපස ඇති බොත්තම ඔබන්න. මෙය ක්‍රියා කරන්නේ සහාය දක්වන Google TV දුරස්ථ පාලක සමග පමණි.\n\nශබ්දය නැවැත්වීම සඳහා, ඔබේ දුරස්ථ පාලකයෙහි ඕනෑම බොත්තමක් ඔබන්න."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"ඔබේ දුරස්ථ පාලකයේ තත්පර 30ක් සඳහා ශබ්දයක් වාදනය කිරීමට ඔබට තල්ලු කළ හැකි බොත්තමක් ඔබේ Google TV මත ඇත. මෙය ක්‍රියා කරන්නේ සහාය දක්වන Google TV දුරස්ථ පාලක සමග පමණි.\n\nශබ්දය නැවැත්වීම සඳහා, ඔබේ දුරස්ථ පාලකයෙහි ඕනෑම බොත්තමක් ඔබන්න."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"මගේ දුරස්ථය සොයා ගැනීම සබල කර ඇති විට, ඔබේ Google TV දුරස්ථ පාලකය අස්ථානගත වී ඇත්නම් එය සොයා ගැනීමට ඔබට ශබ්දයක් වාදනය කළ හැක."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"හඩ වාදනය කරන්න"</string>
 </resources>
diff --git a/Settings/res/values-sk/energy-modes.xml b/Settings/res/values-sk/energy-modes.xml
index 048324e..dcaf343 100644
--- a/Settings/res/values-sk/energy-modes.xml
+++ b/Settings/res/values-sk/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Režim nízkej spotreby energie"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"so základnými funkciami siete"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Vypnúť pripojenie k sieti, keď televízor nikto nepoužíva (pohotovostný režim)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Nízka"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Pohotovostný režim"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Pohotovostný režim — keď sa televízor nepoužíva, pripojenie k sieti je vypnuté"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Dôležité aktualizácie a funkcie"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Režim optimalizovanej spotreby energie"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"s odporúčanými funkciami siete"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Ponúka funkcie, ktoré televízor prebudia cez sieť (pohotovostný režim pri pripojení)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Všetky nevyhnutné funkcie"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimalizovaná"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Pohotovostný režim pri pripojení"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Pohotovostný režim pri pripojení — zapne funkcie na prebudenie televízora cez sieť"</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="6636328986387241066">"Režim zvýšenej spotreby energie"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"s ďalšími funkciami siete"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Ponúka ďalšie funkcie, aj keď sa televízor nepoužíva."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Všetky odporúčané funkcie"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Zvýšená"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Vždy pripojené"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Vždy pripojené — zapne funkcie siete, keď sa televízor nepoužíva"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-sk/strings.xml b/Settings/res/values-sk/strings.xml
index a32419e..35b7d1e 100644
--- a/Settings/res/values-sk/strings.xml
+++ b/Settings/res/values-sk/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Právne informácie spoločnosti Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Údaje licencie nie sú dostupné"</string>
     <string name="about_model" msgid="9164284529291439296">"Model"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Režim zariadenia"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Ukážka v obchode"</string>
     <string name="about_version" msgid="6223547403835399861">"Verzia operačného systému Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Sériové číslo"</string>
     <string name="about_build" msgid="8467840394761634575">"Zostava operačného systému Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Internetové pripojenie"</string>
     <string name="connected" msgid="4981532275162345997">"Pripojené"</string>
     <string name="not_connected" msgid="475810896484271663">"Nepripojené"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Bez internetu"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Uložené"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Nesprávne heslo"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Heslo Wi-Fi je príliš krátke"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Vyžaduje sa prihlásenie"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Ďalšie možnosti"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Zobraziť všetko"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Zobraziť menej"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Prispôsobiť obmedzenia"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Moment…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Zmeniť kód PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Vytvoriť obmedzený profil?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Už bol vytvorený"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Preskočiť"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Vytvoriť PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Otvoriť obmedzený profil?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Žiadny obmedzený profil"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Už bol otvorený"</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">"Táto aplikácia má prístup k vašim účtom. Riadené aplikáciou <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Ak chcete sledovať tento kanál, zadajte kód PIN"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Nahrané mikrofóny"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Nahrávanie zvuku sa nepodarilo spustiť."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Nahrávanie zvuku zlyhalo."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Šetrič dát"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Automaticky upravovať kvalitu videí na zníženie spotreby mobilných dát"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Spotreba dát a upozornenia"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"K internetu sa môžete pripojiť cez sieť Wi-Fi, ethernet alebo hotspot telefónu."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Chcete zapnúť jeho viditeľnosť pre iné zariadenia s rozhraním Bluetooth?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Aplikácia chce na <xliff:g id="TIMEOUT">%1$d</xliff:g> s zapnúť viditeľnosť televízora pre iné zariadenia s rozhraním Bluetooth."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Tieto nastavenia ovplyvňujú zariadenie, keď sa 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_mode_eco_hint" msgid="5280058011809503514">"Ak zapnete viac funkcií televízora, spotreba energie sa môže zvýšiť."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Povolenie režimu <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Find my remote"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Prehraním zvuku nájdite stratené diaľkové ovládanie Google TV"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Stlačte tlačidlo na zadnej strane zariadenia Google TV a prehrajte tak 30 sekúnd zvuk na diaľkovom ovládaní. Funguje to len s podporovanými diaľkovými ovládaniami Google TV.\n\nAk chcete zvuk zastaviť, stlačte ľubovoľné tlačidlo na diaľkovom ovládaní."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Na zariadení so službou Google TV je tlačidlo, ktorého stlačením prehráte 30‑sekundový zvuk v diaľkovom ovládaní. Funguje to len s podporovanými diaľkovými ovládaniami Google TV.\n\nAk chcete zvuk zastaviť, stlačte ľubovoľné tlačidlo na diaľkovom ovládaní."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Keď je povolená funkcia Find my remote, môžete prehrať zvuk, ktorý vám pomôže vyhľadať diaľkové ovládanie Google TV, keď ho nebudete vedieť nájsť."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Prehrávanie zvuku"</string>
 </resources>
diff --git a/Settings/res/values-sl/energy-modes.xml b/Settings/res/values-sl/energy-modes.xml
index b11b231..b79fadf 100644
--- a/Settings/res/values-sl/energy-modes.xml
+++ b/Settings/res/values-sl/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Način majhne porabe energije"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"s ključnimi funkcijami omrežja"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Izklopite omrežno povezavo, ko televizor ni v uporabi (način pripravljenosti)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Nizko"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Stanje pripravljenosti"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Stanje pripravljenosti — Omrežna povezava je izklopljena, ko se televizor ne uporablja."</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Nujne posodobitve in funkcije"</item>
+    <item msgid="4002284890471636101">"[Vstavi funkcijo 1]"</item>
+    <item msgid="7072772341455731040">"[Vstavi funkcijo 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Način optimizirane porabe energije"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"s priporočenimi funkcijami omrežja"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Omogoča funkcije za preklop televizorja iz stanja pripravljenosti prek omrežja (omrežno stanje pripravljenosti)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Vse ključne funkcije"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimizirano"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Omrežno stanje pripravljenosti"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Omrežno stanje pripravljenosti — Funkcijam je omogočeno, da prek omrežja televizor preklopijo iz stanja 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="6636328986387241066">"Način povečane porabe energije"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"z dodatnimi funkcijami omrežja"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Omogoča dodatne funkcije tudi, ko televizor ni v uporabi."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Vse priporočene funkcije"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Povečano"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Vedno povezano"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Vedno povezano — Omogočene omrežne funkcije, ko se televizor ne uporablja."</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Vstavi funkcijo 1]"</item>
     <item msgid="170760143032597722">"[Vstavi funkcijo 2]"</item>
diff --git a/Settings/res/values-sl/strings.xml b/Settings/res/values-sl/strings.xml
index ced1f4b..b1ccec2 100644
--- a/Settings/res/values-sl/strings.xml
+++ b/Settings/res/values-sl/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Googlova pravna obvestila"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Podatki o licenci niso na voljo"</string>
     <string name="about_model" msgid="9164284529291439296">"Model"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Način naprave"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Predstavitev v trgovinah"</string>
     <string name="about_version" msgid="6223547403835399861">"Različica operacijskega sistema Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Serijska številka"</string>
     <string name="about_build" msgid="8467840394761634575">"Delovna različica operacijskega sistema Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Internetna povezava"</string>
     <string name="connected" msgid="4981532275162345997">"Povezano"</string>
     <string name="not_connected" msgid="475810896484271663">"Ni povezave"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Ni internetne povezave"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Shranjeno"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Napačno geslo"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Geslo za Wi-Fi je prekratko"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Zahtevana je prijava"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Druge možnosti"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Prikaz vseh"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Prikaži manj"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Prilagoditev omejitev"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Samo trenutek …"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Spreminjanje kode PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Želite ustvariti omejen profil?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Že ustvarjeno"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Preskoči"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Ustvarjanje kode PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Želite preklopiti na omejeni profil?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Ni omejenih profilov"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Že vneseno"</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">"Ta aplikacija lahko dostopa do vaših računov. Upravlja jo aplikacija <xliff:g id="APP">%1$s</xliff:g>."</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Če želite gledati ta kanal, vnesite kodo PIN"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Mikrofoni za posneti zvok"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Ni bilo mogoče začeti snemati zvoka."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Snemanje zvoka ni uspelo."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Varčevanje s podatki"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Samodejno prilagajanje kakovosti videa za manj prenosa podatkov v mob. omrežju"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Prenesena količina podatkov in opozorila"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Z internetom se lahko povežete z omrežjem Wi-Fi, ethernetom ali dostopno točko telefona."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Želite omogočiti, da bo vidna drugim napravam Bluetooth?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Aplikacija želi omogočiti, da bodo lahko druge naprave Bluetooth videle vaš televizor za toliko sekund: <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Te nastavitve vplivajo na napravo, ko se ne uporablja"</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_mode_eco_hint" msgid="5280058011809503514">"Poraba energije se lahko s številom omogočenih funkcij televizorja poveča."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Omogočite »<xliff:g id="ENERGYMODENAME">%s</xliff:g>«"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Poišči moj daljinski upravljalnik"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Predvajajte zvok, da poiščete daljinski upravljalnik za Google TV, če ga založite"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Pritisnite gumb na hrbtni strani naprave Google TV, če želite 30 sekund predvajati zvok prek daljinskega upravljalnika. To deluje samo s podprtimi daljinskimi upravljalniki za Google TV.\n\nČe želite ustaviti zvok, na daljinskem upravljalniku pritisnite kateri koli gumb."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Google TV ima gumb, ki ga lahko pritisnete in tako za 30 sekund sprožite predvajanje zvoka v daljinskem predvajalniku. To deluje samo s podprtimi daljinskimi upravljalniki za Google TV.\n\nČe želite ustaviti zvok, na daljinskem upravljalniku pritisnite kateri koli gumb."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Če je omogočena funkcija Poišči moj daljinski upravljalnik, lahko nastavite, da se predvaja zvok, da najdete založeni daljinski upravljalnik Googla TV."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Predvajaj zvok"</string>
 </resources>
diff --git a/Settings/res/values-sq/energy-modes.xml b/Settings/res/values-sq/energy-modes.xml
index da24167..19a6cef 100644
--- a/Settings/res/values-sq/energy-modes.xml
+++ b/Settings/res/values-sq/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Modaliteti me energji të ulët"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"me veçori rrjeti thelbësore"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Çaktivizo lidhjen e rrjetit kur TV nuk është në përdorim (në modalitet gatishmërie)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"E ulët"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Në gatishmëri"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Në gatishmëri - Lidhja e rrjetit është joaktive kur televizori nuk është në përdorim"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Përditësime dhe funksione kritike"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Modaliteti me energji të optimizuar"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"me veçori rrjeti të rekomanduara"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Lejon veçoritë të zgjojnë televizorin përmes rrjetit (modaliteti i gatishmërisë me lidhje në rrjet)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Të gjitha veçoritë thelbësore"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"E optimizuar"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Në gatishmëri në rrjet"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Në gatishmëri në rrjet - Aktivizon veçoritë për ta zgjuar televizorin nëpërmjet 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="6636328986387241066">"Modaliteti me më shumë energji"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"me veçori rrjeti shtesë"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Lejon veçoritë shtesë edhe kur televizori nuk është në përdorim."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Të gjitha veçoritë e rekomanduara"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"E rritur"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Gjithmonë i lidhur"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Gjithmonë i lidhur - Aktivizon veçoritë e rrjetit kur televizori nuk është në përdorim"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Fut veçorinë 1]"</item>
     <item msgid="170760143032597722">"[Fut veçorinë 2]"</item>
diff --git a/Settings/res/values-sq/strings.xml b/Settings/res/values-sq/strings.xml
index 7c29ee8..b5aa589 100644
--- a/Settings/res/values-sq/strings.xml
+++ b/Settings/res/values-sq/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Informacioni ligjor i Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Të dhënat e licencës nuk ofrohen"</string>
     <string name="about_model" msgid="9164284529291439296">"Modeli"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Modaliteti i pajisjes"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Demonstrimi i dyqanit"</string>
     <string name="about_version" msgid="6223547403835399861">"Versioni i sistemit operativ të Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Numri i serisë"</string>
     <string name="about_build" msgid="8467840394761634575">"Ndërtimi i sistemit operativ të Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Lidhje me internetin"</string>
     <string name="connected" msgid="4981532275162345997">"U lidh"</string>
     <string name="not_connected" msgid="475810896484271663">"Nuk është lidhur"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Nuk ka internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"U ruajt"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Fjalëkalim i gabuar"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Fjalëkalimi i Wi-Fi është shumë i shkurtër"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Kërkohet identifikimi"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Opsione të tjera..."</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Shiko të gjitha"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Shiko më pak"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Personalizo kufizimet"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Një moment..."</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Ndrysho kodin PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Të krijohet profil i kufizuar?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Është krijuar tashmë"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Kapërce"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Krijo kodin PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Të hapet profili i kufizuar?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Nuk ka profil të kufizuar"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Ke hyrë tashmë"</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">"Ky aplikacion mund të qaset te llogaritë e tua. Kontrollohet nga <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Fut kodin PIN për të shikuar këtë kanal"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Mikrofonat për regjistrimin"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Nisja e regjistrimit të audios dështoi."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Regjistrimi i audios dështoi."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Kursyesi i të dhënave"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Rregullo automatikisht cilësinë e videos për të përdorur më pak të dhëna celulare"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Përdorimi i të dhënave dhe sinjalizimet"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Mund të lidhesh me internetin me Wi-Fi, Ethernet ose me zonën e qasjes për internet të telefonit tënd."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Të bëhet e dukshme për pajisjet e tjera me Bluetooth?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Një aplikacion kërkon ta bëjë televizorin tënd të dukshëm ndaj pajisjeve të tjera me Bluetooth për <xliff:g id="TIMEOUT">%1$d</xliff:g> sekonda."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Këto cilësime kanë ndikim te pajisja kur ajo 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_mode_eco_hint" msgid="5280058011809503514">"Konsumi i energjisë mund të rritet me numrin e veçorive të televizorit që aktivizon ti."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Aktivizo \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Gjej telekomandën time"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Luaj një tingull për të gjetur telekomandën e Google TV nëse ke harruar se ku e ke vendosur"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Shtyp butonin në pjesën e pasme të Google TV për të luajtur një tingull në telekomandë për 30 sekonda. Kjo funksionon vetëm me telekomanda të mbështetura të Google TV.\n\nPër të ndaluar tingullin, shtyp cilindo buton në telekomandë."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Ka një buton në Google TV që mund ta shtypësh për të luajtur një tingull në telekomandë për 30 sekonda. Kjo funksionon vetëm me telekomanda të mbështetura të Google TV.\n\nPër të ndaluar tingullin, shtyp cilindo buton në telekomandë."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Kur \"Gjej telekomandën time\" është e aktivizuar, mund të luash një tingull për të gjetur telekomandën e Google TV nëse ke harruar se ku e ke vendosur."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Luaj tingullin"</string>
 </resources>
diff --git a/Settings/res/values-sr/energy-modes.xml b/Settings/res/values-sr/energy-modes.xml
index 3f7bacc..ed9448c 100644
--- a/Settings/res/values-sr/energy-modes.xml
+++ b/Settings/res/values-sr/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Режим ниске потрошње"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"са неопходним мрежним функцијама"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Искључите мрежну везу када се ТВ не користи (режим мировања)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Ниско"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Режим мировања"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Режим мировања – мрежна веза је искључена када се ТВ не користи"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Важна ажурирања и функције"</item>
+    <item msgid="4002284890471636101">"[Уметните функцију 1]"</item>
+    <item msgid="7072772341455731040">"[Уметните функцију 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Режим оптималне потрошње"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"са препорученим мрежним функцијама"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Омогућава функције које буде ТВ преко мреже (режим мировања на мрежи)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Све основне функције"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Оптимизовано"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Режим мировања на мрежи"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Режим мировања на мрежи – омогућава да функције пробуде ТВ преко мреже"</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="6636328986387241066">"Режим повећане потрошње"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"са додатним мрежним функцијама"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Омогућава додатне функције чак и када се ТВ не користи."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Све препоручене функције"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Повећано"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Увек повезано"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Увек повезано – омогућава функције мреже када се ТВ не користи"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Уметните функцију 1]"</item>
     <item msgid="170760143032597722">"[Уметните функцију 2]"</item>
diff --git a/Settings/res/values-sr/strings.xml b/Settings/res/values-sr/strings.xml
index 058a851..cdd3168 100644
--- a/Settings/res/values-sr/strings.xml
+++ b/Settings/res/values-sr/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google правне информације"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Подаци о лиценци нису доступни"</string>
     <string name="about_model" msgid="9164284529291439296">"Модел"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Режим уређаја"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Демонстрација у продавници"</string>
     <string name="about_version" msgid="6223547403835399861">"Верзија оперативног система Android TV-а"</string>
     <string name="about_serial" msgid="3432319328808745459">"Серијски број"</string>
     <string name="about_build" msgid="8467840394761634575">"Верзија оперативног система Android TV-а"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Интернет веза"</string>
     <string name="connected" msgid="4981532275162345997">"Повезано"</string>
     <string name="not_connected" msgid="475810896484271663">"Није повезано"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Нема интернета"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Сачувано"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Погрешна лозинка"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Лозинка за WiFi је прекратка"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Треба да се пријавите"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Друге опције"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Прикажи све"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Прикажи мање"</string>
@@ -902,6 +909,13 @@
     <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">"Промени PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Желите да направите ограничени профил?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Већ је направљено"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Прескочи"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Направите PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Желите да унесете ограничени профил?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Нема ограниченог профила"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Већ је унет"</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="pin_enter_unlock_channel" msgid="243855138978654080">"Унесите PIN да бисте гледали овај канал"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Микрофони за снимање"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Покретање снимања звука није успело."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Снимање звука није успело."</string>
-    <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">"Можете да се повежете на интернет помоћу WiFi-ја, етернета или хотспота на телефону."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Желите да учините видљивим за друге Bluetooth уређаје?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Апликација жели да учини ТВ видљивим за друге Bluetooth уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Ова подешавања утичу на уређај када се не користи"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"Омогућава:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Имајте на уму да овај режим може да повећа потрошњу енергије на уређају."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"Потрошња енергије може да се повећа када омогућите већи број функција ТВ-а."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Омогућите режим <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Пронађи мој даљински"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Пустите звук да бисте лоцирали даљински за Google TV ако сте га затурили"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Притисните дугме на полеђини Google TV-а да бисте на даљинском пустили звук од 30 секунди. То ради само на подржаним даљинским управљачима за Google TV.\n\nДа бисте зауставили овај звук, притисните било које дугме на даљинском."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"На Google TV-у постоји дугме које можете да притиснете како бисте на даљинском пустили звук у трајању од 30 секунди. То функционише само на подржаним даљинским управљачима за Google TV.\n\nДа бисте зауставили овај звук, притисните било које дугме на даљинском."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Када је омогућена функција Пронађи мој даљински, можете да пустите звук да бисте лоцирали даљински управљач за Google TV ако сте га затурили."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Пусти звук"</string>
 </resources>
diff --git a/Settings/res/values-sv/energy-modes.xml b/Settings/res/values-sv/energy-modes.xml
index b94153c..f9d1520 100644
--- a/Settings/res/values-sv/energy-modes.xml
+++ b/Settings/res/values-sv/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Lågenergiläge"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"med viktiga nätverksfunktioner"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Inaktivera nätverksanslutningen när tv:n inte används (viloläge)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Låg"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Standbyläge"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Standbyläge — Nätverksanslutningen är av när tv:n inte används"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Viktiga uppdateringar och funktioner"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Optimerat energiläge"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"med rekommenderade nätverksfunktioner"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Tillåter funktioner att väcka tv:n via nätverket (nätverksanslutet standbyläge)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Alla viktiga funktioner"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimerad"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Nätverksanslutet standbyläge"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Nätverksanslutet standbyläge — Möjliggör funktioner som slår på tv:n via nätverket"</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="6636328986387241066">"Förbättrat energiläge"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"med ytterligare nätverksfunktioner"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Tillåter extra funktioner även när tv:n inte används."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Alla rekommenderade funktioner"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Högre"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Alltid uppkopplad"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Alltid uppkopplad — Möjliggör nätverksfunktioner när tv:n inte används"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-sv/strings.xml b/Settings/res/values-sv/strings.xml
index 40f9d52..b6dbfa8 100644
--- a/Settings/res/values-sv/strings.xml
+++ b/Settings/res/values-sv/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Juridisk information från Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Licensuppgifter saknas"</string>
     <string name="about_model" msgid="9164284529291439296">"Modell"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Enhetsläge"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Butiksdemo"</string>
     <string name="about_version" msgid="6223547403835399861">"Version av Android TV:s operativsystem"</string>
     <string name="about_serial" msgid="3432319328808745459">"Serienummer"</string>
     <string name="about_build" msgid="8467840394761634575">"Underversion av Android TV:s operativsystem"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Internetanslutning"</string>
     <string name="connected" msgid="4981532275162345997">"Ansluten"</string>
     <string name="not_connected" msgid="475810896484271663">"Inte ansluten"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Inget internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Sparat"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Fel lösenord"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wifi-lösenordet är för kort"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Inloggning krävs"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Övriga alternativ"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Visa alla"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Visa färre"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Anpassa begränsingar"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Ett ögonblick ..."</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Ändra pinkoden"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Skapa en begränsad profil?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Redan skapad"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Hoppa över"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Skapa pinkod"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Byta till begränsad profil?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Ingen begränsad profil"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Redan angiven"</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">"Den här appen har inte åtkomst till dina konton. Styrs av <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Ange pinkoden för att titta på den här kanalen"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Mikrofoner för inspelning"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Det gick inte att starta ljudinspelningen."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Ljudinspelningen misslyckades."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Databesparing"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Justera videokvaliteten automatiskt för att använda mindre mobildata"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Dataanvändning och aviseringar"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Du kan ansluta till internet med wifi, Ethernet eller telefonens surfzon."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Vill du göra den synlig för andra Bluetooth-enheter?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"En app vill göra din tv synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Dessa inställningar kan påverka enheten när den 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_mode_eco_hint" msgid="5280058011809503514">"Strömförbrukningen kan öka med antalet aktiverade tv-funktioner."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Aktivera <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Hitta min fjärrkontroll"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Spela upp ett ljud för att hitta Google TV-fjärrkontrollen om den kommer bort"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Tryck på knappen på baksidan av din Google TV för att spela upp ett ljud på din fjärrkontroll under 30 sekunder. Detta fungerar bara med Google TV-fjärrkontroller som stöds.\n\nStäng av ljudet genom att trycka på valfri knapp på fjärrkontrollen."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Det finns en knapp på din Google TV som du kan trycka på för att spela upp ett ljud på fjärrkontrollen under 30 sekunder. Detta fungerar bara med Google TV-fjärrkontroller som stöds.\n\nStäng av ljudet genom att trycka på valfri knapp på fjärrkontrollen."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"När Hitta min fjärrkontroll är aktiverat kan du spela upp ett ljud för att hitta Google TV-fjärrkontrollen om den kommer bort."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Spela upp ljud"</string>
 </resources>
diff --git a/Settings/res/values-sw/energy-modes.xml b/Settings/res/values-sw/energy-modes.xml
index debdbb2..b15544c 100644
--- a/Settings/res/values-sw/energy-modes.xml
+++ b/Settings/res/values-sw/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Hali ya nishati chache"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"na vipengele vya mtandao vya msingi"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Zima muunganisho wa mtandao wakati TV haitumiki (hali tuli)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Chini"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Hali tuli"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Hali tuli huzima muunganisho wa mtandao wakati televisheni haitumiki"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Masasisho na utendaji muhimu"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Hali iliyoboreshwa ya nishati"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"na vipengele vya mtandao vinavyopendekezwa"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Huruhusu vipengele vinavyowasha skrini ya TV kupitia mtandao (hali tuli kwenye mtandao)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Vipengele vyote muhimu"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Imeboreshwa"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Hali tuli kwenye Mtandao"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Hali tuli kwenye mtandao huwasha vipengele ili kuwasha televisheni kupitia 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="6636328986387241066">"Hali ya nishati nyingi"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"na vipengele vya mtandao vya ziada"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Huruhusu vipengele vya ziada hata wakati TV haitumiki."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Vipengele vyote vinavyopendekezwa"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Imeongezeka"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Unganisha kila wakati"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Kipengele cha unganisha kila wakati huwasha vipengele vya mtandao wakati televisheni haitumiki"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-sw/strings.xml b/Settings/res/values-sw/strings.xml
index 9760bac..0c3b3a2 100644
--- a/Settings/res/values-sw/strings.xml
+++ b/Settings/res/values-sw/strings.xml
@@ -252,7 +252,7 @@
     <string name="bluetooth_enter_pin_msg" msgid="8905524093007140634">"Ili kuoanisha: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, &lt;br&gt;Chapa PIN inayohitajika ya kifaa:"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="889584097447402492">"Ili kuoanisha na: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, &lt;br&gt;Chapa nenosiri linalohitajika la kifaa:"</string>
     <string name="bluetooth_pin_values_hint" msgid="6237371515577342950">"Kwa kawaida 0000 au 1234"</string>
-    <string name="bluetooth_pair" msgid="2410285813728786067">"Oanisha"</string>
+    <string name="bluetooth_pair" msgid="2410285813728786067">"Unganisha"</string>
     <string name="bluetooth_cancel" msgid="4415185529332987034">"Ghairi"</string>
     <string name="bluetooth_device_connected_toast" msgid="1896195197089204806">"%1$s imeunganishwa"</string>
     <string name="bluetooth_device_disconnected_toast" msgid="7459239447363156499">"%1$s imetenganishwa"</string>
@@ -260,7 +260,7 @@
     <string name="bluetooth_toggle_title" msgid="3808904783456336104">"Bluetooth"</string>
     <string name="bluetooth_toggle_confirmation_dialog_title" msgid="3906746631391295717">"Zima Bluetooth"</string>
     <string name="bluetooth_toggle_confirmation_dialog_summary" msgid="9017044450625172698">"Hutaweza kufikia programu ya Mratibu wa Google kwenye kidhibiti chako cha mbali ukiwa umezima Bluetooth."</string>
-    <string name="bluetooth_pair_accessory" msgid="5508750142754420984">"Oanisha kifaa cha ziada"</string>
+    <string name="bluetooth_pair_accessory" msgid="5508750142754420984">"Unganisha kifuasi"</string>
     <string name="bluetooth_known_devices_category" msgid="6895470515631452961">"Vifaa vya ziada"</string>
     <string name="bluetooth_official_remote_category" msgid="5817814488268307170">"Kidhibiti cha Mbali"</string>
     <string name="bluetooth_official_remote_entry_title" msgid="6699700335229570038">"Mipangilio ya kidhibiti cha mbali"</string>
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Sheria za Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Data ya leseni haipatikani"</string>
     <string name="about_model" msgid="9164284529291439296">"Muundo"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Hali ya Kifaa"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Hifadhi Toleo la Kujaribu"</string>
     <string name="about_version" msgid="6223547403835399861">"Toleo la Mfumo wa Uendeshaji wa Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Nambari ya ufuatiliaji"</string>
     <string name="about_build" msgid="8467840394761634575">"Muundo wa Mfumo wa Uendeshaji wa Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Muunganisho kwa Intaneti"</string>
     <string name="connected" msgid="4981532275162345997">"Umeunganishwa"</string>
     <string name="not_connected" msgid="475810896484271663">"Hujaunganishwa"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Hakuna muunganisho wa Intaneti"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Imehifadhiwa"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Nenosiri si sahihi"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Nenosiri la Wi-Fi ni fupi mno"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Unahitaji kuingia katika akaunti"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Chaguo nyinginezo"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Angalia yote"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Angalia chache"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Geuza vizuizi viwe utakavyo"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Kidogo tu..."</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Badilisha pin"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Unda wasifu uliodhibitiwa?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Umeunda Tayari"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Ruka"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Unda PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Utafungua mfumo wenye vizuizi?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Hamna wasifu uliodhibitiwa"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Umeweka tayari"</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">"Programu hii inaweza kufikia akaunti zako. Inadhibitiwa na <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Weka PIN ili uangalie kituo hiki"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Maikrofoni zilizotumika kurekodi sauti"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Imeshindwa kuanza kurekodi sauti."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Imeshindwa kurekodi sauti."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Kiokoa Data"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Rekebisha ubora wa video kiotomatiki ili utumie kiasi kidogo cha data ya simu"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Arifa na matumizi ya data"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Unaweza kuunganisha kwenye intaneti ukitumia Wi-Fi, Ethaneti au mtandao pepe wa simu yako."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Ungependa kufanya televisheni ionekane kwenye vifaa vingine vyenye Bluetooth?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Programu inataka kufanya televisheni yako ionekane kwenye vifaa vingine vyenye Bluetooth kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Mipangilio hii inaathiri kifaa wakati hakitumiki"</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_mode_eco_hint" msgid="5280058011809503514">"Matumizi ya nishati yanaweza kuongezeka kutokana na idadi ya vipengele vya televisheni unavyowasha."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Washa \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Tafuta kidhibiti changu cha mbali"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Cheza sauti ili upate kilipo kidhibiti chako cha mbali cha Google TV ikiwa kimepotea"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Bonyeza kitufe kilicho upande wa nyuma wa kitiririshaji chako cha Google TV ili ucheze sauti kwenye kidhibiti chako cha mbali kwa sekunde 30. Kipengele hiki kinapatikana tu kwa vidhibiti vya mbali vya Google TV.\n\nIli usitishe uchezaji sauti, bonyeza kitufe chochote kwenye kidhibiti chako cha mbali."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Kuna kitufe kwenye Google TV yako unachoweza kukibofya ili kucheza sauti kwenye kidhibiti chako cha mbali kwa sekunde 30. Kipengele hiki kinafanya kazi tu kwenye vidhibiti vya mbali vya Google TV vinavyotumika.\n\nIli uzime sauti, bonyeza kitufe chochote kwenye kidhibiti chako cha mbali."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Ukiwasha huduma ya Tafuta kidhibiti changu cha mbali, unaweza kucheza sauti ili kupata kilipo kidhibiti chako cha mbali cha Google TV kikipotea."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Cheza sauti"</string>
 </resources>
diff --git a/Settings/res/values-ta/energy-modes.xml b/Settings/res/values-ta/energy-modes.xml
index 4510006..910e905 100644
--- a/Settings/res/values-ta/energy-modes.xml
+++ b/Settings/res/values-ta/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"குறைவான ஆற்றல் பயன்முறை"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"அத்தியாவசிய நெட்வொர்க் அம்சங்களுடன்"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"டிவி உபயோகத்தில் இல்லாதபோது நெட்வொர்க் இணைப்பை முடக்கும் (காத்திருப்புப் பயன்முறை)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"குறைவு"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"காத்திருப்புப் பயன்முறை"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"காத்திருப்புப் பயன்முறை — டிவி உபயோகத்தில் இல்லாதபோது நெட்வொர்க் இணைப்பு முடக்கப்பட்டிருக்கும்"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"முக்கிய அறிவிப்புகளும் செயல்பாடுகளும்"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"மேம்படுத்தப்பட்ட ஆற்றல் பயன்முறை"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"பரிந்துரைக்கப்பட்ட நெட்வொர்க் அம்சங்களுடன்"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"நெட்வொர்க் மூலமாக டிவியை எழுப்ப அம்சங்களை அனுமதிக்கும் (நெட்வொர்க் காத்திருப்பு பயன்முறை)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"தேவைப்படும் அம்சங்கள் அனைத்தும்"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"நடுநிலை"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"நெட்வொர்க் காத்திருப்புப் பயன்முறை"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"நெட்வொர்க் காத்திருப்புப் பயன்முறை — நெட்வொர்க் மூலமாக டிவியை இயக்க அம்சங்களை இயக்குகிறது"</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="6636328986387241066">"அதிகரிக்கப்பட்ட ஆற்றல் பயன்முறை"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"கூடுதல் நெட்வொர்க் அம்சங்களுடன்"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"டிவி உபயோகத்தில் இல்லாதபோதும் கூடுதல் அம்சங்களை அனுமதிக்கும்."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"பரிந்துரைக்கப்படும் அம்சங்கள் அனைத்தும்"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"அதிகம்"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"எப்போதும் இணைக்கப்பட்டிருக்கும்"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"எப்போதும் இணைக்கப்பட்டிருக்கும் — டிவி உபயோகத்தில் இல்லாதபோது நெட்வொர்க் அம்சங்களை இயக்குகிறது"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-ta/strings.xml b/Settings/res/values-ta/strings.xml
index eb9e071..2a16e3c 100644
--- a/Settings/res/values-ta/strings.xml
+++ b/Settings/res/values-ta/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google சட்டம்"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"உரிமத் தரவு கிடைக்கவில்லை"</string>
     <string name="about_model" msgid="9164284529291439296">"மாடல்"</string>
+    <string name="device_mode" msgid="7258350575590118152">"சாதனப் பயன்முறை"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"ஸ்டோர் டெமோ பயன்முறை"</string>
     <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>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"இணைய இணைப்பு"</string>
     <string name="connected" msgid="4981532275162345997">"இணைக்கப்பட்டது"</string>
     <string name="not_connected" msgid="475810896484271663">"இணைக்கப்படவில்லை"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"இணைய இணைப்பு இல்லை"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"சேமிக்கப்பட்டது"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"தவறான கடவுச்சொல்"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"வைஃபை கடவுச்சொல் மிகவும் சிறியதாக உள்ளது"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"உள்நுழைவு தேவை"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"பிற வசதிகள்"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"எல்லாம் காட்டு"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"குறைவாகக் காட்டு"</string>
@@ -902,6 +909,13 @@
     <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>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"கட்டுப்படுத்தப்பட்ட சுயவிவரமா?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"ஏற்கெனவே உருவாக்கப்பட்டுள்ளது"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"தவிர்"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"பின்னை உருவாக்கு"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"கட்டுப்படுத்தப்பட்ட சுயவிவரமா?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"கட்டுப்படுத்தப்பட்ட சுயவிவரம் இல்லை"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"ஏற்கெனவே உள்நுழைந்துள்ளது"</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="pin_enter_unlock_channel" msgid="243855138978654080">"இந்தச் சேனலைப் பார்க்க PINஐ உள்ளிடவும்"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"மைக்ரோஃபோன்களில் ரெக்கார்டு செய்யப்பட்டவை"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"ஆடியோ ரெக்கார்டிங்கைத் தொடங்க முடியவில்லை."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"ஆடியோவை ரெக்கார்டு செய்ய முடியவில்லை."</string>
-    <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">"வைஃபை, ஈதர்நெட், மொபைலின் ஹாட்ஸ்பாட் ஆகியவை மூலம் இணையத்துடன் இணையலாம்."</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> வினாடிகளுக்கு உங்கள் TV பிற புளூடூத் சாதனங்களுக்குத் தெரியும்படி வைத்திருக்க ஆப்ஸ் விரும்புகிறது."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"சாதனம் உபயோகத்தில் இல்லாதபோது இந்த அமைப்புகள் அதைப் பாதிக்கும்"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"இவற்றை இயக்கும்:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"இந்தப் பயன்முறை சாதனத்தின் மின்சார உபயோகத்தை அதிகரிக்கக்கூடும் என்பதை நினைவில் கொள்ளுங்கள்."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"நீங்கள் இயக்கும் டிவி அம்சங்களின் எண்ணிக்கையின் அடிப்படையில் மின்சார உபயோகம் அதிகரிக்கலாம்."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" பயன்முறையை இயக்குதல்"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"எனது ரிமோட்டைக் கண்டறிதல்"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"உங்கள் Google TV ரிமோட்டைத் தவறுதலாக வேறொரு இடத்தில் வைத்திருந்தால் ஒலியை இயக்குவதன் மூலம் அதைக் கண்டறியலாம்"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Google TVயின் பின்புறம் உள்ள பட்டனை அழுத்துவதன் மூலம் உங்கள் ரிமோட்டில் 30 வினாடிகளுக்கு ஒலியை இயக்கலாம். ஆதரிக்கப்படும் Google TV ரிமோட் கன்ட்ரோல்களில் மட்டுமே இது வேலை செய்யும்.\n\nஒலியை நிறுத்த, உங்கள் ரிமோட்டில் இருக்கும் ஏதேனும் ஒரு பட்டனை அழுத்தவும்."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"உங்கள் Google TVயில் ஒரு பட்டன் உள்ளது அதை அழுத்தினால் உங்கள் ரிமோட் 30 வினாடிகளுக்கு ஒலிக்கும். ஆதரிக்கப்படும் Google TV ரிமோட் கன்ட்ரோல்களில் மட்டுமே இது வேலை செய்யும்.\n\nஒலியை நிறுத்த, உங்கள் ரிமோட்டில் இருக்கும் ஏதேனும் ஒரு பட்டனை அழுத்தவும்."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"எனது ரிமோட்டைக் கண்டறிதல் அம்சம் இயக்கத்தில் இருக்கும்போது உங்கள் Google TV ரிமோட்டைத் தவறுதலாக வேறொரு இடத்தில் வைத்திருந்தால் ஒலியை இயக்கி அதைக் கண்டறியலாம்."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"ஒலியை இயக்கு"</string>
 </resources>
diff --git a/Settings/res/values-te/energy-modes.xml b/Settings/res/values-te/energy-modes.xml
index 0cb6a1f..dd659da 100644
--- a/Settings/res/values-te/energy-modes.xml
+++ b/Settings/res/values-te/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"తక్కువ ఎనర్జీ మోడ్"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"అవసరమైన నెట్‌వర్క్ ఫీచర్‌లతో"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"టీవీ ఉపయోగంలో లేనప్పుడు (స్టాండ్‌బై మోడ్) నెట్‌వర్క్ కనెక్షన్‌ను ఆఫ్ చేయండి."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"తక్కువ"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"స్టాండ్‌బై‌లో ఉంది"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"స్టాండ్‌బై‌లో ఉంది — టీవీ ఉపయోగంలో లేనప్పుడు నెట్‌వర్క్ కనెక్షన్ ఆఫ్‌లో ఉంటుంది"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"క్లిష్టమైన అప్‌డేట్‌లు, ఫంక్షన్‌లు"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"ఆప్టిమైజ్ చేసిన ఎనర్జీ మోడ్"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"సిఫార్సు చేసిన నెట్‌వర్క్ ఫీచర్‌లతో"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"నెట్‌వర్క్ (నెట్‌వర్క్ ట్రిగ్గర్ స్టాండ్‌బై) ద్వారా టీవీని ఆన్ చేసే ఫీచర్‌లను అనుమతిస్తుంది."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"అవసరమైన అన్ని ఫీచర్‌లు"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"ఆప్టిమైజ్ చేయబడింది"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"నెట్‌వర్క్ ట్రిగ్గర్ స్టాండ్‌బై"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"నెట్‌వర్క్ ట్రిగ్గర్ స్టాండ్‌బై — నెట్‌వర్క్‌లో టీవీని మేల్కొలపడానికి ఫీచర్‌లను ప్రారంభిస్తుంది"</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="6636328986387241066">"పెరిగిన ఎనర్జీ మోడ్"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"అదనపు నెట్‌వర్క్ ఫీచర్‌లతో"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"టీవీని ఉపయోగించినప్పుడు కూడా అదనపు ఫీచర్‌లను అనుమతిస్తుంది."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"సిఫార్సు చేసిన అన్ని ఫీచర్‌లు"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"పెంచబడింది"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"ఎల్లప్పుడూ కనెక్ట్ చేయబడుతుంది"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"ఎల్లప్పుడూ కనెక్ట్ చేయబడుతుంది — టీవీ ఉపయోగంలో లేనప్పుడు నెట్‌వర్క్ ఫీచర్‌లను ప్రారంభిస్తుంది"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-te/strings.xml b/Settings/res/values-te/strings.xml
index b41fe23..9a8151f 100644
--- a/Settings/res/values-te/strings.xml
+++ b/Settings/res/values-te/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google చట్టపరమైన అంశాల విభాగం"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"లైసెన్స్ డేటా అందుబాటులో లేదు"</string>
     <string name="about_model" msgid="9164284529291439296">"నమూనా"</string>
+    <string name="device_mode" msgid="7258350575590118152">"పరికరం మోడ్"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Store డెమో"</string>
     <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>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"ఇంటర్నెట్ కనెక్షన్"</string>
     <string name="connected" msgid="4981532275162345997">"కనెక్ట్ చేయబడింది"</string>
     <string name="not_connected" msgid="475810896484271663">"కనెక్ట్ చేయబడలేదు"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"ఇంటర్నెట్ లేదు"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"సేవ్ చేయబడింది"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"పాస్‌వర్డ్ తప్పు"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi పాస్‌వర్డ్ చాలా చిన్నదిగా ఉంది"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"సైన్ ఇన్ అవసరం"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"ఇతర ఆప్షన్‌లు"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"అన్నీ చూడండి"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"తక్కువ చూడండి"</string>
@@ -902,6 +909,13 @@
     <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>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"పరిమిత ప్రొఫైల్ సృష్టించాలా?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"ఇప్పటికే క్రియేట్ చేయబడింది"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"స్కిప్ చేయండి"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"PINను క్రియేట్ చేయండి"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"పరిమిత ప్రొఫైల్ ఎంటర్ చేయాలా?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"పరిమితం చేయబడిన ప్రొఫైల్ లేదు"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"ఇప్పటికే ఎంటర్ చేయబడింది"</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="pin_enter_unlock_channel" msgid="243855138978654080">"ఈ ఛానెల్‌ను చూడటానికి పిన్‌ని నమోదు చేయండి"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"రికార్డ్ చేయబడిన మైక్రోఫోన్(లు)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"ఆడియో రికార్డింగ్‌ను ప్రారంభించడంలో విఫలమైంది."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"ఆడియో రికార్డింగ్ విఫలమైంది."</string>
-    <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="bluetooth_ask_discovery_title" msgid="4955540555242269694">"ఇతర బ్లూటూత్ పరికరాలకు కనిపించేలా చేయాలా?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"యాప్ మీ TVను ఇతర బ్లూటూత్ పరికరాలకు <xliff:g id="TIMEOUT">%1$d</xliff:g> సెకన్ల పాటు కనిపించేలా చేయాలనుకుంటుంది."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"ఉపయోగంలో లేనప్పుడు ఈ సెట్టింగ్‌లు పరికరాన్ని ప్రభావితం చేస్తాయి"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"ఎనేబుల్ చేయబడినవి:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ఈ మోడ్ పరికరం తాలూకు విద్యుత్ వినియోగాన్ని పెంచుతుందని గమనించండి."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"మీరు ప్రారంభించే టీవీ ఫీచర్‌ల సంఖ్యతో విద్యుత్ వినియోగం పెరగవచ్చు."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\"ను ఎనేబుల్ చేయండి"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"నా రిమోట్‌ను కనుగొనండి"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"మీ Google TV రిమోట్ మిస్‌ప్లేస్ చేయబడితే దాన్ని గుర్తించడానికి సౌండ్ ప్లే చేయండి"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"మీ రిమోట్‌లో 30 సెకన్ల పాటు సౌండ్‌ను ప్లే చేయడానికి మీ Google TV వెనుక ఉన్న బటన్‌ను నొక్కండి. సపోర్ట్ చేసే Google TV రిమోట్ కంట్రోల్స్‌తో మాత్రమే ఇది పని చేస్తుంది.\n\nసౌండ్‌ను ఆపివేయడానికి, మీ రిమోట్‌లో ఉన్న ఏదైనా బటన్‌ను నొక్కండి."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"మీ రిమోట్‌లో 30 సెకన్ల పాటు ధ్వనిని ప్లే చేయడానికి మీ Google TVలో ఒక బటన్ ఉంటుంది. సపోర్ట్ చేసే Google TV రిమోట్ కంట్రోల్స్‌తో మాత్రమే ఇది పని చేస్తుంది.\n\nసౌండ్‌ను ఆపివేయడానికి, మీ రిమోట్‌లో ఏదైనా బటన్‌ను నొక్కండి."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"\'నా రిమోట్‌ను కనుగొనండి\' ఫీచర్‌ను ఎనేబుల్ చేసినప్పుడు, మీ Google TV రిమోట్ మిస్‌ప్లేస్ చేయబడితే దాన్ని గుర్తించడానికి మీరు సౌండ్‌ను ప్లే చేయవచ్చు."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"సౌండ్‌ను ప్లే చేయండి"</string>
 </resources>
diff --git a/Settings/res/values-th/energy-modes.xml b/Settings/res/values-th/energy-modes.xml
index c48614c..d1a607f 100644
--- a/Settings/res/values-th/energy-modes.xml
+++ b/Settings/res/values-th/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"โหมดใช้พลังงานต่ำ"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"พร้อมด้วยฟีเจอร์ที่สำคัญของเครือข่าย"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"ปิดการเชื่อมต่อเครือข่ายเมื่อไม่ได้ใช้งานทีวี (โหมดสแตนด์บาย)"</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"ต่ำ"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"สแตนด์บาย"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"สแตนด์บาย — การเชื่อมต่อเครือข่ายจะปิดเมื่อไม่ได้ใช้งานทีวี"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"การอัปเดตและฟังก์ชันที่สำคัญ"</item>
+    <item msgid="4002284890471636101">"[ใส่ฟีเจอร์ 1]"</item>
+    <item msgid="7072772341455731040">"[ใส่ฟีเจอร์ 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"โหมดใช้พลังงานเหมาะสม"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"พร้อมด้วยฟีเจอร์ที่แนะนำของเครือข่าย"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"อนุญาตฟีเจอร์เพื่อปลุกระบบทีวีผ่านเครือข่าย (โหมดสแตนด์บายที่เชื่อมต่อเครือข่าย)"</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"ฟีเจอร์ที่จำเป็นทั้งหมด"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"เพิ่มประสิทธิภาพแล้ว"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"โหมดสแตนด์บายที่เชื่อมต่อเครือข่าย"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"โหมดสแตนด์บายที่เชื่อมต่อเครือข่าย — เปิดใช้ฟีเจอร์ต่างๆ เพื่อปลุกระบบทีวีผ่านเครือข่าย"</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="6636328986387241066">"โหมดใช้พลังงานมากขึ้น"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"พร้อมด้วยฟีเจอร์ของเครือข่ายเพิ่มเติม"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"อนุญาตฟีเจอร์เพิ่มเติมแม้เมื่อไม่ได้ใช้งานทีวีอยู่ก็ตาม"</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"ฟีเจอร์ที่แนะนำทั้งหมด"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"เพิ่มขึ้น"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"เชื่อมต่อตลอดเวลา"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"เชื่อมต่อตลอดเวลา — เปิดใช้ฟีเจอร์ของเครือข่ายเมื่อไม่ได้ใช้งานทีวี"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[ใส่ฟีเจอร์ 1]"</item>
     <item msgid="170760143032597722">"[ใส่ฟีเจอร์ 2]"</item>
diff --git a/Settings/res/values-th/strings.xml b/Settings/res/values-th/strings.xml
index 3b58b19..c210144 100644
--- a/Settings/res/values-th/strings.xml
+++ b/Settings/res/values-th/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"ข้อความทางกฎหมายของ Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"ข้อมูลใบอนุญาตไม่สามารถใช้ได้"</string>
     <string name="about_model" msgid="9164284529291439296">"รุ่น"</string>
+    <string name="device_mode" msgid="7258350575590118152">"โหมดอุปกรณ์"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"การสาธิตที่ร้านค้า"</string>
     <string name="about_version" msgid="6223547403835399861">"เวอร์ชันของระบบปฏิบัติการ Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"หมายเลขซีเรียล"</string>
     <string name="about_build" msgid="8467840394761634575">"บิลด์ของระบบปฏิบัติการ Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"การเชื่อมต่ออินเทอร์เน็ต"</string>
     <string name="connected" msgid="4981532275162345997">"เชื่อมต่อแล้ว"</string>
     <string name="not_connected" msgid="475810896484271663">"ไม่ได้เชื่อมต่อ"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"ไม่มีอินเทอร์เน็ต"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"บันทึกแล้ว"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"รหัสผ่านไม่ถูกต้อง"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"รหัสผ่าน Wi-Fi สั้นเกินไป"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"จำเป็นต้องลงชื่อเข้าใช้"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"ตัวเลือกอื่นๆ"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"ดูทั้งหมด"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"ดูน้อยลง"</string>
@@ -902,6 +909,13 @@
     <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">"เปลี่ยน PIN"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"สร้างโปรไฟล์ที่จำกัดไหม"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"สร้างแล้ว"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"ข้าม"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"สร้าง PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"เปลี่ยนไปใช้โปรไฟล์ที่จำกัดไหม"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"ไม่มีโปรไฟล์ที่จำกัด"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"ใช้งานอยู่"</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="pin_enter_unlock_channel" msgid="243855138978654080">"ป้อน PIN เพื่อดูช่องนี้"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"ไมโครโฟนที่จะอัด"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"เริ่มบันทึกเสียงไม่สำเร็จ"</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"การบันทึกเสียงไม่สำเร็จ"</string>
-    <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="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>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"การตั้งค่าเหล่านี้ส่งผลต่ออุปกรณ์เมื่อไม่มีการใช้งาน"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"ฟีเจอร์ที่เปิดใช้"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"โปรดทราบว่าโหมดนี้อาจทำให้อุปกรณ์ใช้พลังงานมากขึ้น"</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"การใช้พลังงานอาจเพิ่มขึ้นตามจำนวนฟีเจอร์ของทีวีที่คุณเปิดใช้"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"เปิดใช้ \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"หารีโมตของฉัน"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"เล่นเสียงเพื่อค้นหารีโมต Google TV หากวางไว้ผิดที่"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"กดปุ่มที่ด้านหลังของ Google TV เพื่อเล่นเสียงบนรีโมตของคุณเป็นเวลา 30 วินาที วิธีนี้ใช้ได้เฉพาะกับรีโมตคอนโทรลที่รองรับ Google TV\n\nหากต้องการหยุดเสียง ให้กดปุ่มใดก็ได้บนรีโมต"</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Google TV มีปุ่มให้กดเพื่อเล่นเสียงบนรีโมตได้เป็นเวลา 30 วินาที ซึ่งใช้ได้เฉพาะกับรีโมตคอนโทรลที่รองรับ Google TV\n\nหากต้องการหยุดเสียง ให้กดปุ่มใดก็ได้บนรีโมต"</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"เมื่อเปิดใช้งาน \"หารีโมตของฉัน\" คุณจะเล่นเสียงเพื่อค้นหารีโมต Google TV ได้หากวางไว้ผิดที่"</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"เล่นเสียง"</string>
 </resources>
diff --git a/Settings/res/values-tl/energy-modes.xml b/Settings/res/values-tl/energy-modes.xml
index a90f223..681e7f9 100644
--- a/Settings/res/values-tl/energy-modes.xml
+++ b/Settings/res/values-tl/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Low energy mode"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"may mahahalagang feature ng network"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"I-off ang koneksyon ng network kapag hindi ginagamit ang TV (standby mode)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Mahina"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Naka-standby"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Naka-standby — Naka-off ang koneksyon ng network kapag hindi ginagamit ang TV"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Mga kritikal na update at function"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Optimized energy mode"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"may mga inirerekomendang feature ng network"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Pinapayagan ang mga feature na i-wake ang TV kapag may network (naka-network na standby)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Lahat ng mahalagang feature"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Naka-optimize"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Naka-network na Standby"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Naka-network na standby — Ine-enable ang pag-wake ng mga feature ng TV gamit ang network"</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="6636328986387241066">"Increased energy mode"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"may mga karagdagang feature ng network"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Pinapayagan ang mga karagdagang feature kahit na hindi ginagamit ang TV."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Mga inirerekomendang feature"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Tumaas"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Palaging nakakonekta"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Palaging nakakonekta — Ine-enable ang mga feature ng network kapag hindi ginagamit ang TV"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-tl/strings.xml b/Settings/res/values-tl/strings.xml
index e04465d..7259083 100644
--- a/Settings/res/values-tl/strings.xml
+++ b/Settings/res/values-tl/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google legal"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Hindi available ang data ng lisensya"</string>
     <string name="about_model" msgid="9164284529291439296">"Modelo"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Device Mode"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Demo sa Tindahan"</string>
     <string name="about_version" msgid="6223547403835399861">"Bersyon ng Android TV OS"</string>
     <string name="about_serial" msgid="3432319328808745459">"Serial number"</string>
     <string name="about_build" msgid="8467840394761634575">"Build ng Android TV OS"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Koneksyon sa internet"</string>
     <string name="connected" msgid="4981532275162345997">"Nakakonekta"</string>
     <string name="not_connected" msgid="475810896484271663">"Hindi nakakonekta"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Walang Internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Na-save"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Maling password"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Masyadong maikli ang password ng Wi-Fi"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Kailangang mag-sign in"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Iba pang pagpipilian"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Tingnan lahat"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Tumingin ng mas kaunti"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"I-customize ang mga paghihigpit"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Sandali lang…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Palitan ang pin"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Gumawa ng restricted profile?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Nagawa Na"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Laktawan"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Gumawa ng PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Pumasok sa restricted profile?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Walang restricted profile"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Nailagay na"</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">"Maa-access ng app na ito ang iyong mga account. Kinokontrol ng <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Ilagay ang PIN upang mapanood ang channel na ito"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"(Mga) recorded microphone"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Hindi nasimulan ang pag-record ng audio."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Hindi na-record ang audio."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Data Saver"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Awtomatikong isaayos ang kalidad ng video para sa mas kaunting mobile data"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Paggamit ng data at mga alerto"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Puwede kang kumonekta sa internet gamit ang Wi-Fi, Ethernet, o hotspot ng iyong telepono."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Gawing nakikita sa iba pang Bluetooth device?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Gusto ng isang app na gawing nakikita ng iba pang Bluetooth device ang iyong TV sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Naaapektuhan ng mga setting na ito ang device kapag hindi ginagamit"</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_mode_eco_hint" msgid="5280058011809503514">"Puwedeng tumaas ang pagkonsumo ng kuryente sa dami ng mga feature ng TV na ie-enable mo."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"I-enable ang \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Hanapin ang remote ko"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Mag-play ng tunog para mahanap ang remote ng iyong Google TV kung nawawala ito"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Pindutin ang button sa likod ng iyong Google TV para mag-play ng tunog sa iyong remote sa loob ng 30 segundo. Gumagana lang ito sa mga sinusuportahang remote control ng Google TV.\n\nPara itigil ang tunog, pumindot ng kahit anong button sa iyong remote."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"May button sa iyong Google TV na mapipindot mo para mag-play ng tunog sa iyong remote nang 30 segundo. Gumagana lang ito sa mga sinusuportahang remote control ng Google TV.\n\nPara itigil ang tunog, pumindot ng kahit anong button sa iyong remote."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Kapag naka-enable ang Hanapin ang remote ko, puwede kang mag-play ng tunog para mahanap ang iyong Google TV remote kung nawawala ito."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"I-play ang tunog"</string>
 </resources>
diff --git a/Settings/res/values-tr/energy-modes.xml b/Settings/res/values-tr/energy-modes.xml
index bde9f39..447e7e1 100644
--- a/Settings/res/values-tr/energy-modes.xml
+++ b/Settings/res/values-tr/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Düşük enerji modu"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"gerekli ağ özellikleriyle"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"TV kullanılmazken (bekleme modunda) ağ bağlantısını kapatın."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Düşük"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Bekleme"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Bekleme: Ağ bağlantısı, TV kullanılmadığında kapalıdır"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Kritik güncellemeler ve işlevler"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Optimize edilmiş enerji modu"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"önerilen ağ özellikleriyle"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"TV\'yi ağ üzerinden uyandırma özelliklerine (ağa bağlı bekleme modu) izin verir."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Tüm gerekli özellikler"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimize edilmiş"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Ağa Bağlı Bekleme Modu"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Ağa bağlı bekleme modu: TV\'yi ağ üzerinden uyandırma özelliklerini etkinleştirir"</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="6636328986387241066">"Daha yüksek enerji modu"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"ek ağ özellikleriyle"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"TV kullanılmazken bile ek özelliklere izin verir."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Tüm önerilen özellikler"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Daha yüksek"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Her zaman bağlantılı"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Her zaman bağlı: TV kullanılmadığında ağ özelliklerini etkinleştirir"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-tr/strings.xml b/Settings/res/values-tr/strings.xml
index b24bd58..f60f2a8 100644
--- a/Settings/res/values-tr/strings.xml
+++ b/Settings/res/values-tr/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google yasal"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Lisans verileri kullanılamıyor"</string>
     <string name="about_model" msgid="9164284529291439296">"Model"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Cihaz Modu"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Mağaza Demosu"</string>
     <string name="about_version" msgid="6223547403835399861">"Android TV OS sürümü"</string>
     <string name="about_serial" msgid="3432319328808745459">"Seri numarası"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV OS derlemesi"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"İnternet bağlantısı"</string>
     <string name="connected" msgid="4981532275162345997">"Bağlı"</string>
     <string name="not_connected" msgid="475810896484271663">"Bağlı değil"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"İnternet bağlantısı yok"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Kaydedildi"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Yanlış şifre"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Kablosuz ağ şifresi çok kısa"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Oturum açmanız gerekiyor"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Diğer seçenekler"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Tümünü göster"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Daha az göster"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Kısıtlamaları özelleştir"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Bir dakika..."</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"PIN\'i değiştir"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Kısıtlanmış profil oluşturulsun mu?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Önceden Oluşturulmuştu"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Atla"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"PIN oluşturun"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Kısıtlanmış profile geçilsin mi?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Kısıtlanmış profil yok"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Önceden girilmişti"</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">"Bu uygulama, hesaplarınıza erişebilir. <xliff:g id="APP">%1$s</xliff:g> tarafından kontrol edilmektedir"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Bu kanalı izlemek için PIN\'i girin"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Mikrofon kaydı"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Ses kaydı başlatılamadı."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Ses kaydı başarısız oldu."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Veri Tasarrufu"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Video kalitesini daha az mobil veri kullanacak şekilde otomatik olarak ayarlayın"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Veri kullanımı ve uyarılar"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"İnternete kablosuz, Ethernet veya telefonunuzun hotspot\'u üzerinden bağlanabilirsiniz."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Diğer Bluetooth cihazlara görünür olsun mu?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Bir uygulama, telefonunuzu <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca diğer Bluetooth cihazlarına görünür yapmak istiyor."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Bu ayarlar, kullanılmadığında cihazı etkiler"</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_mode_eco_hint" msgid="5280058011809503514">"Güç tüketimi, etkinleştirdiğiniz TV özelliklerinin sayısına göre artabilir."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" modunu etkinleştir"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Uzaktan kumandamı bul"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Google TV uzaktan kumandanızın nerede olduğunu hatırlamıyorsanız ses çaldırarak yerini bulabilirsiniz"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Uzaktan kumandanızda 30 saniye boyunca ses çaldırmak için Google TV cihazınızın arkasındaki düğmeye basın. Bu işlem yalnızca desteklenen Google TV uzaktan kumandalarında çalışır.\n\nSes çalmayı durdurmak için uzaktan kumandanızda herhangi bir düğmeye basın."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Google TV\'nizde, uzaktan kumandanızda 30 saniye boyunca ses çalmak için basabileceğiniz bir düğme mevcuttur. Bu işlem yalnızca desteklenen Google TV uzaktan kumandalarında çalışır.\n\nSes çalmayı durdurmak için uzaktan kumandanızda herhangi bir düğmeye basın."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Uzaktan kumandamı bul özelliği etkinleştirildiğinde Google TV uzaktan kumandanızın nerede olduğunu hatırlamıyorsanız ses çaldırarak yerini bulabilirsiniz."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Ses çaldır"</string>
 </resources>
diff --git a/Settings/res/values-uk/energy-modes.xml b/Settings/res/values-uk/energy-modes.xml
index 6599ce4..762f0a1 100644
--- a/Settings/res/values-uk/energy-modes.xml
+++ b/Settings/res/values-uk/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Режим низького енергоспоживання"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"з основними мережевими функціями"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"З’єднання з мережею вимикається, коли телевізор не використовується (режим очікування)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Низьке енергоспоживання"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Режим очікування"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Режим очікування — з’єднання з мережею вимикається, коли телевізор не використовується"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Важливі оновлення та функції"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Режим оптимізованого енергоспоживання"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"з рекомендованими мережевими функціями"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Дає змогу ввімкнути функції, які виводять телевізор із режиму сну через мережу (мережевий режим очікування)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Усі основні функції"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Оптимальне енергоспоживання"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Мережевий режим очікування"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Мережевий режим очікування — вмикає функції, що виводять телевізор із режиму сну через мережу"</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="6636328986387241066">"Режим збільшеного енергоспоживання"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"з додатковими мережевими функціями"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Дає змогу ввімкнути додаткові функції, навіть коли телевізор не використовується."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Усі рекомендовані функції"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Підвищене енергоспоживання"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Постійне з’єднання з мережею"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Постійне з’єднання з мережею — вмикає мережеві функції, коли телевізор не використовується"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-uk/strings.xml b/Settings/res/values-uk/strings.xml
index 92acd69..cef6c10 100644
--- a/Settings/res/values-uk/strings.xml
+++ b/Settings/res/values-uk/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Юридичні умови Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Дані ліцензії недоступні"</string>
     <string name="about_model" msgid="9164284529291439296">"Модель"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Режим пристрою"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Демонстраційний режим для магазинів"</string>
     <string name="about_version" msgid="6223547403835399861">"Версія ОС Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Серійний номер"</string>
     <string name="about_build" msgid="8467840394761634575">"Складання ОС Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"З’єднання з Інтернетом"</string>
     <string name="connected" msgid="4981532275162345997">"З’єднано"</string>
     <string name="not_connected" msgid="475810896484271663">"Не з’єднано"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Немає Інтернету"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Збережено"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Неправильний пароль"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Пароль Wi-Fi закороткий"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Потрібно ввійти"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Інші варіанти"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Показати все"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Показати менше"</string>
@@ -902,6 +909,13 @@
     <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">"Змінити PIN-код"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Створити профіль з обмеженням?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Уже створено"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Пропустити"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Створити PIN-код"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Увійти в профіль з обмеженням?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Немає профілю з обмеженням"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Уже здійснено вхід"</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="pin_enter_unlock_channel" msgid="243855138978654080">"Щоб дивитися цей канал, введіть PIN-код"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Мікрофони, з яких записувався звук"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Не вдалося почати запис аудіо."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Не вдалося записати аудіо."</string>
-    <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, Ethernet або точку доступу свого телефона."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Зробити видимим для інших пристроїв із Bluetooth?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Додаток хоче зробити ваш телевізор видимим для інших пристроїв із Bluetooth упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> с."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Ці налаштування впливають на пристрій, коли він не використовується"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"Функції, що вмикаються"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Зверніть увагу, що в цьому режимі може збільшитися енергоспоживання пристрою."</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"Енергоспоживання може підвищуватися залежно від кількості функцій, які ви вмикаєте на телевізорі."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Увімкнути режим \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Знайти пульт"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Якщо ви загубили пульт Google TV, відтворіть на ньому звуковий сигнал, щоб швидше знайти"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Натисніть кнопку на задній панелі Google TV, щоб на пульті дистанційного керування протягом 30 секунд відтворювався звуковий сигнал. Ця функція працює лише з підтримуваними пультами ДК для Google TV.\n\nЩоб вимкнути звуковий сигнал, натисніть будь-яку кнопку на пульті."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"На пристрої Google TV є кнопка, яку можна натиснути, щоб на пульті дистанційного керування протягом 30 секунд відтворювався звуковий сигнал. Ця функція працює лише з підтримуваними пультами ДК для Google TV.\n\nЩоб вимкнути звуковий сигнал, натисніть будь-яку кнопку на пульті."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Увімкнувши функцію \"Знайти пульт\", ви зможете відтворити звуковий сигнал на пульті Google TV, якщо загубили його."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Відтворити звуковий сигнал"</string>
 </resources>
diff --git a/Settings/res/values-ur/energy-modes.xml b/Settings/res/values-ur/energy-modes.xml
index 002bf76..fd778eb 100644
--- a/Settings/res/values-ur/energy-modes.xml
+++ b/Settings/res/values-ur/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"کم توانائی والی وضع"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"نیٹ ورک کی ضروری خصوصیات کے ساتھ"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"TV کے استعمال میں نہ ہونے پر نیٹ ورک کنکشن آف کریں (اسٹینڈ بائی وضع)۔"</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"کم ہے"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"اسٹینڈ بائی"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"اسٹینڈ بائی — جب TV استعمال میں نہ ہو تو نیٹ ورک کنکشن بند ہوتا ہے"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"اہم اپ ڈیٹس اور فنکشنز"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"بہترین کردہ توانائی والی وضع"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"تجویز کردہ نیٹ ورک کی خصوصیات کے ساتھ"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"نیٹ ورک پر TV کو بحال کرنے کیلئے خصوصیات کو اجازت دیتا ہے (اسٹینڈ بائی وضع میں نیٹ ورک)۔"</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"تمام ضروری خصوصیات"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"بہتر کردہ"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"نیٹ ورک اسٹینڈ بائی موڈ"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"نیٹ ورک اسٹینڈ بائی موڈ — نیٹ ورک پر 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="6636328986387241066">"اضافی توانائی والی وضع"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"نیٹ ورک کی اضافی خصوصیات کے ساتھ"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"TV کے استعمال میں نہ ہونے پر بھی اضافی خصوصیات کی اجازت دیتا ہے۔"</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"تمام تجویز کردہ خصوصیات"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"اضافہ شدہ"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"ہمیشہ منسلک"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"ہمیشہ منسلک — جب TV استعمال میں نہ ہو تو نیٹ ورک کی خصوصیات کو فعال کرتا ہے"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-ur/strings.xml b/Settings/res/values-ur/strings.xml
index cc92888..799fe3d 100644
--- a/Settings/res/values-ur/strings.xml
+++ b/Settings/res/values-ur/strings.xml
@@ -280,7 +280,7 @@
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"آپ کو بلوٹوتھ ترتیبات میں تبدیلی کرنے کی اجازت نہیں ہے۔"</string>
     <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"TV آڈیو کے لیے استعمال کریں"</string>
     <string name="send_feedback" msgid="936698637869795473">"تاثرات بھیجیں"</string>
-    <string name="launch_help" msgid="2607478763131952469">"مرکز امداد"</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>
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google قانونی"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"لائسنس ڈیٹا دستیاب نہیں ہے"</string>
     <string name="about_model" msgid="9164284529291439296">"ماڈل"</string>
+    <string name="device_mode" msgid="7258350575590118152">"آلے کا موڈ"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"اسٹور ڈیمو"</string>
     <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>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"انٹرنیٹ کنکشن"</string>
     <string name="connected" msgid="4981532275162345997">"مربوط ہے"</string>
     <string name="not_connected" msgid="475810896484271663">"غیر منسلک"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"انٹرنیٹ نہیں ہے"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"محفوظ ہے"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"غلط پاس ورڈ"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi پاس ورڈ بہت مختصر ہے"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"سائن ان درکار ہے"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"دیگر اختیارات"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"سبھی دیکھیں"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"کم ملاحظہ کریں"</string>
@@ -902,6 +909,13 @@
     <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>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"محدود پروفائل تخلیق کریں؟"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"پہلے سے ہی تخلیق کی گئی"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"نظر انداز کریں"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"PIN تخلیق کریں"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"محدود پروفائل درج کریں؟"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"کوئی محدود پروفائل نہیں ہے"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"پہلے سے ہی درج کی گئی"</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="pin_enter_unlock_channel" msgid="243855138978654080">"یہ چینل دیکھنے کیلئے PIN درج کریں"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"ریکارڈ کردہ مائیکروفون (مائیکروفونز)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"آڈیو ریکارڈنگ شروع کرنے میں ناکام۔"</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"آڈیو ریکارڈنگ ناکام ہو گئی۔"</string>
-    <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="bluetooth_ask_discovery_title" msgid="4955540555242269694">"دوسرے بلوٹوتھ آلات پر مرئی بنائیں؟"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"ایپ آپ کے TV کو <xliff:g id="TIMEOUT">%1$d</xliff:g> سیکنڈ کیلئے دیگر بلوٹوتھ آلات پر مرئی بنانا چاہتی ہے۔"</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"یہ ترتیبات استعمال میں نہ ہونے پر آلہ کو متاثر کرتی ہیں"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"فعال کرتا ہے:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"نوٹ کریں کہ یہ وضع آلہ کی بجلی کی کھپت کو بڑھا سکتی ہے۔"</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"آپ کے فعال کردہ TV خصوصیات کی تعداد کے ساتھ بجلی کی کھپت بڑھ سکتی ہے۔"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" کو فعال کریں"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"میرا ریموٹ تلاش کریں"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"اگر آپ کا Google TV کا ریموٹ گم ہو گیا ہے تو اس کا پتا لگانے کے لیے آواز چلائیں"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"30 سیکنڈ تک اپنے ریموٹ پر آواز چلانے کے لیے اپنے Google TV کے پیچھے والے بٹن کو دبائیں۔ یہ صرف تعاون یافتہ Google TV کے ریموٹ کنٹرولز کے ساتھ کام کرتا ہے۔\n\nآواز کو روکنے کے لیے، اپنے ریموٹ پر موجود کسی بھی بٹن کو دبائیں۔"</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"آپ کے Google TV پر ایک بٹن ہے جسے آپ 30 سیکنڈ تک اپنے ریموٹ پر آواز چلانے کے لیے دبا سکتے ہیں۔ یہ صرف تعاون یافتہ Google TV کے ریموٹ کنٹرولز کے ساتھ کام کرتا ہے۔\n\nآواز کو روکنے کے لیے، اپنے ریموٹ پر موجود کسی بھی بٹن کو دبائیں۔"</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"میرا ریموٹ تلاش کریں فعال ہونے پر اگر آپ کا Google TV ریموٹ کہیں گم ہو جائے تو آپ اس کو تلاش کرنے کے لئے آواز چلا سکتے ہیں۔"</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"آواز چلائیں"</string>
 </resources>
diff --git a/Settings/res/values-uz/energy-modes.xml b/Settings/res/values-uz/energy-modes.xml
index b34b1e6..2044b75 100644
--- a/Settings/res/values-uz/energy-modes.xml
+++ b/Settings/res/values-uz/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Past quvvat rejimi"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"zaruriy tarmoq funksiyalari bilan"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Televizor ishlatilmaganda (kutish rejimi) tarmoq aloqasini faolsizlantirish."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Past"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Uyqu rejimi"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Uyqu rejimi — Tarmoq aloqasi televizor oʻchiqligida ishlamaydi"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Muhim yangilanishlar va funksiyalar"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Optimal quvvat rejimi"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"tavsiya etilgan tarmoq funksiyalari bilan"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Funksiyalarga televizorni tarmoq orqali yoqish (tarmoqqa ulangan kutish rejimida) imkonni beradi."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Barcha muhim funksiyalar"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Optimal"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Tarmoqni kutish"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Aloqadagi uyqu rejimi — Televizorni tarmoq orqali yoqish funksiyalari ishlaydi"</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="6636328986387241066">"Yuqori quvvat rejimi"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"qoʻshimcha tarmoq funksiyalari bilan"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Televizor ishlamayotgan vaqtda ham qoʻshimcha funksiyalarga ruxsat beradi."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Barcha tavsiya etiladigan funksiyalar"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Yuqori"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Doim aloqada"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Doim aloqada — Tarmoq funksiyalari televizor oʻchiqligida ham ishlayveradi"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-uz/strings.xml b/Settings/res/values-uz/strings.xml
index 136d15a..51a01ca 100644
--- a/Settings/res/values-uz/strings.xml
+++ b/Settings/res/values-uz/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google huquqiy masalalari"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Litsenziya ma\'lumotlari mavjud emas"</string>
     <string name="about_model" msgid="9164284529291439296">"Modeli"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Qurilma rejimi"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Demo rejimi"</string>
     <string name="about_version" msgid="6223547403835399861">"Android TV OT versiyasi"</string>
     <string name="about_serial" msgid="3432319328808745459">"Seriya raqami"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV OT nashri"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Internetga ulanish"</string>
     <string name="connected" msgid="4981532275162345997">"Ulangan"</string>
     <string name="not_connected" msgid="475810896484271663">"Ulanmagan"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Internetga ulanmagan"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Saqlangan"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Parol xato"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi paroli juda qisqa"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Hisobga kirish zarur"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Boshqa variantlar"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Hammasi"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Qisqaroq"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Cheklanishlarni sozlash"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Bir lahza…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"PIN kodni o‘zgartiring"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Cheklangan profil yaratilsinmi?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Yaratilgan"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Tashlab ketish"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"PIN kod yaratish"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Cheklangan profil kiritilsinmi?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Cheklangan profil topilmadi"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Kiritilgan"</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">"Bu ilova hisoblaringizga kirishi mumkin. <xliff:g id="APP">%1$s</xliff:g> tomonidan nazorat qilinadi"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Bu kanalni ko‘rish uchun PIN kodni kiriting"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Yozib olingan mikrofon(lar)"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Audio yozib olinishi ishga tushmadi."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Audio yozib olinmadi."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Trafik tejash"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Video sifatini mobil internet trafik tejalishiga moslash"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Trafik sarfi va bildirishnomalar"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Internetga Wi-Fi, Ethernet yoki telefon hotspoti yordamida ulanishingiz mumkin."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Boshqa Bluetooth qurilmalarga koʻrinadigan boʻlsinmi?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Ilova televizoringizni boshqa Bluetooth qurilmalariga <xliff:g id="TIMEOUT">%1$d</xliff:g> soniya davomida koʻrinarli qilmoqchi."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Bu sozlamalar qurilma oʻchiqligida amal qiladi"</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_mode_eco_hint" msgid="5280058011809503514">"Yoqilgan TV funksiyalar soniga qarab quvvat sarfi ortishi mumkin."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"“<xliff:g id="ENERGYMODENAME">%s</xliff:g>” rejimini yoqish"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Pultimni top"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Google TV pulti joyida boʻlmasa, uni topish uchun jiringlating"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Pultingizni 30 soniya jiringlatish uchun Google TV orqasidagi tugmani bosing. Bu faqat Google TV pultlarida ishlaydi.\n\nTovushni toʻxtatish uchun pultdagi istalgan tugmani bosing."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Google TV qurilmasida bosilganda pultni 30 soniya jiringlatadigan tugma mavjud. Bu faqat Google TV pultlarida ishlaydi.\n\nTovushni toʻxtatish uchun pultdagi istalgan tugmani bosing."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Pultimni top funksiyasi yoniq boʻlsa, yoʻqolgan Google TV pultini ovozli signal orqali topish mumkin."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Jiringlatish"</string>
 </resources>
diff --git a/Settings/res/values-vi/energy-modes.xml b/Settings/res/values-vi/energy-modes.xml
index fabc3b0..d8078d9 100644
--- a/Settings/res/values-vi/energy-modes.xml
+++ b/Settings/res/values-vi/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Chế độ giảm mức sử dụng năng lượng"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"cho phép các tính năng kết nối mạng thiết yếu"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Tắt kết nối mạng khi bạn không dùng TV (chế độ chờ)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Thấp"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Chế độ chờ"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Chế độ chờ – Tắt kết nối mạng khi 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>
+    <item msgid="4002284890471636101">"[Chèn tính năng 1]"</item>
+    <item msgid="7072772341455731040">"[Chèn tính năng 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Chế độ tối ưu hoá mức sử dụng năng lượng"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"cho phép các tính năng kết nối mạng được đề xuất"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Cho phép các tính năng đánh thức TV qua mạng (chế độ chờ có kết nối mạng)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Tất cả tính năng thiết yếu"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Tối ưu hoá"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Chế độ chờ có kết nối mạng"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Chế độ chờ có kết nối mạng – Bật các tính năng để đánh thức TV qua 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="6636328986387241066">"Chế độ tăng mức sử dụng năng lượng"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"cho phép một số tính năng kết nối mạng bổ sung"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Cho phép các tính năng bổ sung hoạt động ngay cả khi bạn không dùng TV."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Tất cả tính năng được đề xuất"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Cao hơn"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Luôn kết nối"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Luôn kết nối – Bật các tính năng kết nối mạng khi không dùng TV"</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>
diff --git a/Settings/res/values-vi/strings.xml b/Settings/res/values-vi/strings.xml
index c526839..2bc7f1b 100644
--- a/Settings/res/values-vi/strings.xml
+++ b/Settings/res/values-vi/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Chính sách pháp lý của Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Hiện không có dữ liệu về giấy phép"</string>
     <string name="about_model" msgid="9164284529291439296">"Kiểu máy"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Chế độ thiết bị"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"Bản minh hoạ cửa hàng"</string>
     <string name="about_version" msgid="6223547403835399861">"Phiên bản hệ điều hành Android TV"</string>
     <string name="about_serial" msgid="3432319328808745459">"Số sê-ri"</string>
     <string name="about_build" msgid="8467840394761634575">"Bản dựng hệ điều hành Android TV"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Kết nối Internet"</string>
     <string name="connected" msgid="4981532275162345997">"Đã kết nối"</string>
     <string name="not_connected" msgid="475810896484271663">"Chưa kết nối"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Không có Internet"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Đã lưu"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Mật khẩu sai"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Mật khẩu Wi-Fi quá ngắn"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Cần đăng nhập"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Tùy chọn khác"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Xem tất cả"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Ẩn bớt"</string>
@@ -634,7 +641,7 @@
     <string name="microphone_physical_privacy_enabled_title" msgid="6135130916399886772">"Đã chặn quyền truy cập micrô"</string>
     <string name="microphone_physical_privacy_enabled_text" msgid="401238365312924088">"Để bỏ chặn, hãy chuyển nút quyền riêng tư trên thiết bị sang vị trí bật micrô để cho phép truy cập micrô."</string>
     <string name="camera" msgid="1226671478936288283">"Máy ảnh"</string>
-    <string name="camera_toggle_title" msgid="5566469574224956142">"Quyền truy cập vào máy ảnh"</string>
+    <string name="camera_toggle_title" msgid="5566469574224956142">"Quyền truy cập camera"</string>
     <string name="open_camera_permissions" msgid="301360297337141591">"Quyền truy cập của ứng dụng vào máy ảnh"</string>
     <string name="camera_physical_privacy_enabled_title" msgid="1944155695921165511">"Đã chặn quyền truy cập máy ảnh"</string>
     <string name="camera_physical_privacy_enabled_text" msgid="6692088634676282779">"Để bỏ chặn, hãy chuyển nút quyền riêng tư trên thiết bị sang vị trí bật máy ảnh để cho phép truy cập máy ảnh."</string>
@@ -805,7 +812,7 @@
     <string name="system_desc_show_hardware_layer" msgid="3483713991865249527">"Lớp phần cứng flash có màu xanh khi chúng cập nhật"</string>
     <string name="system_desc_show_gpu_overdraw" msgid="74019834911598588">"Từ tốt nhất đến tồi nhất: lam, lục, đỏ tươi, đỏ"</string>
     <string name="system_desc_show_surface_updates" msgid="4018685547515133353">"Chuyển nhanh toàn bộ các giao diện cửa sổ khi các giao diện này cập nhật"</string>
-    <string name="system_desc_strict_mode_enabled" msgid="1974896408481676324">"Màn hình nháy khi ứng dụng thực hiện các hoạt động dài trên luồng chính"</string>
+    <string name="system_desc_strict_mode_enabled" msgid="1974896408481676324">"Nhấp nháy màn hình khi ứng dụng thực hiện các hoạt động dài trên luồng chính"</string>
     <string name="system_desc_profile_gpu_rendering" msgid="1594070211030991">"Đo thời gian kết xuất trong adb shell dumpsys gfxinfo"</string>
     <string name="security_unknown_sources_title" msgid="2012801664240314305">"Nguồn không xác định"</string>
     <string name="security_unknown_sources_desc" msgid="7196715598352173267">"Cho phép cài đặt ứng dụng từ những nguồn khác ngoài Cửa hàng Play"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Tùy chỉnh các hạn chế"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Một lúc nữa..."</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Thay đổi mã pin"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Tạo hồ sơ bị hạn chế?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Đã tạo"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Bỏ qua"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Tạo mã PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Nhập hồ sơ bị hạn chế?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Không có hồ sơ bị hạn chế"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Đã nhập"</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">"Ứng dụng này có thể truy cập tài khoản của bạn. Do <xliff:g id="APP">%1$s</xliff:g> kiểm soát"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Nhập mã PIN để xem kênh này"</string>
@@ -931,7 +945,7 @@
     <string name="device_apps_app_management_enable_desc" msgid="8686291003061136476">"Bạn có muốn bật ứng dụng này không?"</string>
     <string name="device_apps_app_management_storage_used" msgid="6725789557993296433">"Bộ nhớ đã sử dụng"</string>
     <string name="device_apps_app_management_storage_used_desc" msgid="8928632612101487179">"Đã sử dụng <xliff:g id="SIZE">%1$s</xliff:g> trong <xliff:g id="VOLUME">%2$s</xliff:g>"</string>
-    <string name="device_apps_app_management_clear_data" msgid="7305471678286735600">"Xóa dữ liệu"</string>
+    <string name="device_apps_app_management_clear_data" msgid="7305471678286735600">"Xoá dữ liệu"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="170972356946852847">"Tất cả dữ liệu của ứng dụng này sẽ bị xóa vĩnh viễn, bao gồm tất cả các tệp, các tùy chọn cài đặt, tài khoản, cơ sở dữ liệu, v.v.\n"</string>
     <string name="device_apps_app_management_clear_default" msgid="4566187319647111484">"Xoá các cài đặt mặc định"</string>
     <string name="device_apps_app_management_clear_default_set" msgid="1649974109123107390">"Đặt khởi chạy ƯD này cho một số tác vụ"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"(Các) micrô ghi âm"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Không bắt đầu ghi âm được."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Không ghi âm được."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Trình tiết kiệm dữ liệu"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Tự động điều chỉnh chất lượng video để tiết kiệm dữ liệu di động"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Mức sử dụng dữ liệu và thông báo"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Bạn có thể kết nối Internet qua Wi-Fi, cáp Ethernet hoặc điểm phát sóng của điện thoại."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Đặt ở chế độ hiển thị với các thiết bị Bluetooth khác?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"Một ứng dụng muốn đặt TV của bạn ở chế độ hiển thị với các thiết bị Bluetooth khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Các chế độ cài đặt này có ảnh hưởng đến thiết bị khi bạn không dùng thiết bị"</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_mode_eco_hint" msgid="5280058011809503514">"Mức tiêu thụ điện có thể tăng theo số lượng tính năng bật trên TV."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Bật \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Tìm điều khiển từ xa"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Phát chuông báo để tìm điều khiển từ xa Google TV khi bạn không nhớ chỗ để"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Nhấn nút ở mặt sau Google TV để phát chuông báo trên điều khiển từ xa trong 30 giây. Tính năng này chỉ hoạt động với các loại điều khiển từ xa được hỗ trợ của Google TV.\n\nNếu bạn muốn dừng chuông báo, hãy nhấn nút bất kỳ trên điều khiển từ xa."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Trên Google TV có nút nhấn để phát chuông báo trên điều khiển từ xa trong vòng 30 giây. Tính năng này chỉ hoạt động với các loại điều khiển từ xa được hỗ trợ của Google TV.\n\nNếu bạn muốn dừng chuông báo, hãy nhấn nút bất kỳ trên điều khiển từ xa."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Khi tính năng Tìm điều khiển từ xa đã bật, bạn có thể phát chuông báo để tìm điều khiển từ xa của Google TV nếu bạn không nhớ chỗ để."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Phát chuông báo"</string>
 </resources>
diff --git a/Settings/res/values-zh-rCN/energy-modes.xml b/Settings/res/values-zh-rCN/energy-modes.xml
index a9a5d7f..23d8395 100644
--- a/Settings/res/values-zh-rCN/energy-modes.xml
+++ b/Settings/res/values-zh-rCN/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"低能耗模式"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"支持使用基本网络功能"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"在您未使用电视（待机模式下）时关闭网络连接。"</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"低"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"待机"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"待机 - 未使用电视时关闭网络连接"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"重要更新和功能"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"优化能耗模式"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"支持使用推荐的网络功能"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"允许特定功能通过网络唤醒电视（联网待机）。"</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"所有基本功能"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"优化"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"网络待机"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"网络待机 - 启用相关功能，以便通过网络唤醒电视"</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="6636328986387241066">"高能耗模式"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"支持使用额外网络功能"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"允许额外功能运行，即使在电视未被使用的情况下。"</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"所有推荐功能"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"高"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"始终保持连接"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"始终保持连接 - 未使用电视时仍启用网络功能"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-zh-rCN/strings.xml b/Settings/res/values-zh-rCN/strings.xml
index d2f5965..0b9d761 100644
--- a/Settings/res/values-zh-rCN/strings.xml
+++ b/Settings/res/values-zh-rCN/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google 法律信息"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"无法获取许可数据"</string>
     <string name="about_model" msgid="9164284529291439296">"型号"</string>
+    <string name="device_mode" msgid="7258350575590118152">"设备模式"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"商店演示"</string>
     <string name="about_version" msgid="6223547403835399861">"Android TV 操作系统版本"</string>
     <string name="about_serial" msgid="3432319328808745459">"序列号"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV 操作系统版本"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"互联网连接"</string>
     <string name="connected" msgid="4981532275162345997">"已连接"</string>
     <string name="not_connected" msgid="475810896484271663">"未连接"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"未连接到互联网"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"已保存"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"密码错误"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"WLAN 密码太短"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"需要登录"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"其他选项"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"查看全部"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"隐藏部分"</string>
@@ -902,6 +909,13 @@
     <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">"更改 PIN 码"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"创建受限个人资料？"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"已创建"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"跳过"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"创建 PIN 码"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"进入受限个人资料？"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"无受限个人资料"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"已进入"</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="pin_enter_unlock_channel" msgid="243855138978654080">"输入 PIN 码即可观看此频道"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"用于录音的麦克风"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"无法启动音频录制。"</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"音频录制失败。"</string>
-    <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">"您可以通过 WLAN、以太网或手机的热点连接到互联网。"</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>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"这些设置会在您未使用设备时影响设备"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"此模式会启用下列功能："</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"请注意，此模式可能会增加设备的耗电量。"</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"您启用的电视功能数量越多，耗电量可能会越高。"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"启用“<xliff:g id="ENERGYMODENAME">%s</xliff:g>”"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"查找我的遥控器"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"让忘记放在何处的 Google TV 遥控器响铃，以便找到它"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"按下 Google TV 设备背面的按钮，即可让遥控器响铃 30 秒。此操作仅对支持的 Google TV 遥控器有效。\n\n若要停止响铃，请按下遥控器上的任意按钮。"</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Google TV 上有一个按钮，按下后遥控器会响铃 30 秒钟。此操作仅对支持的 Google TV 遥控器有效。\n\n若要停止响铃，请按下遥控器上的任意按钮。"</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"当“查找我的遥控器”处于启用状态时，您可让找不到的 Google TV 遥控器响铃，从而定位它。"</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"响铃"</string>
 </resources>
diff --git a/Settings/res/values-zh-rHK/energy-modes.xml b/Settings/res/values-zh-rHK/energy-modes.xml
index 9dad7ad..e3455a9 100644
--- a/Settings/res/values-zh-rHK/energy-modes.xml
+++ b/Settings/res/values-zh-rHK/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"低耗電模式"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"提供必要網絡功能"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"在電視閒置時關閉網絡連線 (待機模式)。"</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"低"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"待機"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"待機 — 在電視閒置時關閉網絡連線"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"重要更新和功能"</item>
+    <item msgid="4002284890471636101">"[插入功能 1]"</item>
+    <item msgid="7072772341455731040">"[插入功能 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"優化耗電模式"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"提供建議網絡功能"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"允許可透過網絡喚醒電視的功能 (網絡待機)。"</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"所有必要功能"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"優化"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"網絡待機"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"網絡待機 — 可使用透過網絡喚醒電視的功能"</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="6636328986387241066">"高耗電模式"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"提供額外網絡功能"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"允許在電視閒置時使用額外功能。"</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"所有建議功能"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"較高"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"保持連線"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"保持連線 — 在電視閒置時啟用網絡功能"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-zh-rHK/strings.xml b/Settings/res/values-zh-rHK/strings.xml
index 811743d..6ff0e7b 100644
--- a/Settings/res/values-zh-rHK/strings.xml
+++ b/Settings/res/values-zh-rHK/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google 法律條款"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"無法提供授權資料"</string>
     <string name="about_model" msgid="9164284529291439296">"模型"</string>
+    <string name="device_mode" msgid="7258350575590118152">"裝置模式"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"商店示範模式"</string>
     <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>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"互聯網連線"</string>
     <string name="connected" msgid="4981532275162345997">"已連線"</string>
     <string name="not_connected" msgid="475810896484271663">"未連線"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"沒有互聯網連線"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"已儲存"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"密碼錯誤"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi 密碼太短"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"需要登入"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"其他選項"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"顯示全部"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"顯示較少"</string>
@@ -902,6 +909,13 @@
     <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">"變更 PIN 碼"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"要建立受限制的個人檔案嗎？"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"已建立"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"略過"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"建立 PIN"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"要輸入受限制的個人檔案嗎？"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"沒有受限制的個人檔案"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"已輸入"</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="pin_enter_unlock_channel" msgid="243855138978654080">"輸入 PIN 即可觀看這個頻道"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"用於錄音的麥克風"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"無法開始錄音。"</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"錄音失敗。"</string>
-    <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="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>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"這些設定會影響閒置中的裝置"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"啟用以下功能："</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"請注意，這個模式可能會增加裝置的耗電量。"</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"耗電量或會因你啟用的電視功能數量而增加。"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"啟用「<xliff:g id="ENERGYMODENAME">%s</xliff:g>」"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"尋找遙控器"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"讓位置不明的 Google TV 遙控器播放音效，助你找到裝置"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"按一下 Google TV 背面的按鈕，即可令遙控器播放音效 30 秒。此功能只適用於支援的 Google TV 遙控器。\n\n如要停止播放音效，請按下遙控器上任何按鈕。"</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"你的 Google TV 設有按鈕，按下後會在遙控器播放音效 30 秒。此功能只適用於支援的 Google TV 遙控器。\n\n如要停止播放音效，請按下遙控器上任何按鈕。"</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"啟用「尋找遙控器」後，你可以令位置不明的 Google TV 遙控器播放音效，從而找出裝置。"</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"播放音效"</string>
 </resources>
diff --git a/Settings/res/values-zh-rTW/energy-modes.xml b/Settings/res/values-zh-rTW/energy-modes.xml
index 1ff613a..6d77f31 100644
--- a/Settings/res/values-zh-rTW/energy-modes.xml
+++ b/Settings/res/values-zh-rTW/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"低耗電量模式"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"開啟必要的網路功能"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"在沒有人使用電視時關閉網路連線 (待機模式)。"</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"低用量"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"待機"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"待機：沒有人使用電視時關閉網路連線"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"重大更新與功能"</item>
+    <item msgid="4002284890471636101">"[Insert feature 1]"</item>
+    <item msgid="7072772341455731040">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"最佳化耗電量模式"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"開啟建議的網路功能"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"啟用相關功能，以便透過網路喚醒電視 (連網待機)。"</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"所有必要功能"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"最佳化"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"連網待機"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"連網待機：讓各項功能透過網路喚醒電視"</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="6636328986387241066">"高耗電量模式"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"開啟額外的網路功能"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"啟用額外功能，即使沒有人使用電視也一樣。"</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"所有建議功能"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"高用量"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"隨時保持連線"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"隨時保持連線：沒有人使用電視時也啟用網路功能"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Insert feature 1]"</item>
     <item msgid="170760143032597722">"[Insert feature 2]"</item>
diff --git a/Settings/res/values-zh-rTW/strings.xml b/Settings/res/values-zh-rTW/strings.xml
index f917426..2ccc450 100644
--- a/Settings/res/values-zh-rTW/strings.xml
+++ b/Settings/res/values-zh-rTW/strings.xml
@@ -329,9 +329,9 @@
     <string name="enterprise_privacy_number_packages" msgid="6256222390430349008">"{count,plural, =1{# 個應用程式}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>
-    <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_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_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>
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Google 法律條款"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"無法提供授權資料"</string>
     <string name="about_model" msgid="9164284529291439296">"型號"</string>
+    <string name="device_mode" msgid="7258350575590118152">"裝置模式"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"商店展示模式"</string>
     <string name="about_version" msgid="6223547403835399861">"Android TV 作業系統版本"</string>
     <string name="about_serial" msgid="3432319328808745459">"序號"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV 作業系統版本"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"網際網路連線"</string>
     <string name="connected" msgid="4981532275162345997">"已連線"</string>
     <string name="not_connected" msgid="475810896484271663">"尚未連線"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"沒有網路連線"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"已儲存"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"密碼錯誤"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Wi-Fi 密碼太短"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"必須登入"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"其他選項"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"全部顯示"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"顯示較少"</string>
@@ -792,7 +799,7 @@
     <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>
-    <string name="system_background_process_limit" msgid="1985373407150771045">"背景處理程序限制"</string>
+    <string name="system_background_process_limit" msgid="1985373407150771045">"背景程序限制"</string>
     <string name="system_show_all_anrs" msgid="5353216640638263217">"顯示所有無回應程式"</string>
     <string name="system_desc_stay_awake" msgid="8485868071929937500">"停用休眠功能"</string>
     <string name="system_desc_hdcp_checking" msgid="1664068008848077241">"僅用於 DRM 內容"</string>
@@ -902,6 +909,13 @@
     <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">"變更 PIN 碼"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"要建立設有限制的個人資料嗎？"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"已經建立設有限制的個人資料"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"略過"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"設定 PIN 碼"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"要切換至設有限制的個人資料嗎？"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"找不到設有限制的個人資料"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"已經切換至設有限制的個人資料"</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="pin_enter_unlock_channel" msgid="243855138978654080">"輸入 PIN 即可觀看這個頻道"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"用於錄音的麥克風"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"無法開始錄音。"</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"錄音失敗。"</string>
-    <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="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>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"裝置在未使用時會受到這些設定影響"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"啟用以下功能："</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"請注意，這個模式可能會使裝置耗電量增加。"</string>
+    <string name="energy_mode_eco_hint" msgid="5280058011809503514">"視你啟用的電視功能數量而定，耗電量可能會增加。"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"啟用「<xliff:g id="ENERGYMODENAME">%s</xliff:g>」"</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"尋找我的遙控器"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"讓忘記放在何處的 Google TV 遙控器發出音效，以便找出裝置"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"按下 Google TV 裝置背面的按鈕即可讓遙控器播放音效 30 秒。這項功能僅適用於支援的 Google TV 遙控器。\n\n如要停止播放音效，請按下遙控器上的任一按鈕。"</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Google TV 有一個按鈕，按下即可讓遙控器播放音效 30 秒。這項功能僅適用於支援的 Google TV 遙控器。\n\n如要停止播放音效，請按下遙控器上的任一按鈕。"</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"啟用「尋找我的遙控器」後，你可以讓忘記放在何處的 Google TV 遙控器發出音效，以便找出裝置。"</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"播放音效"</string>
 </resources>
diff --git a/Settings/res/values-zu/energy-modes.xml b/Settings/res/values-zu/energy-modes.xml
index 8f66697..26f0213 100644
--- a/Settings/res/values-zu/energy-modes.xml
+++ b/Settings/res/values-zu/energy-modes.xml
@@ -16,26 +16,25 @@
 
 <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="1975446673545235501">"Imodi yamandla aphansi"</string>
-    <string name="energy_mode_low_subtitle" msgid="2138250509057251435">"ngezakhi ezibalulekile zenethiwekhi"</string>
-    <string name="energy_mode_low_info" msgid="8586799718140263220">"Vala uxhumano lwenethiwekhi uma i-TV ingasebenzi (imodi yokulinda)."</string>
+    <string name="energy_mode_low_title" msgid="5700567801191430606">"Phansi"</string>
+    <string name="energy_mode_low_subtitle" msgid="7660632849388740009">"Ilindile"</string>
+    <string name="energy_mode_low_info" msgid="3931173640626998821">"Ilindile — Uxhumano lwenethiwekhi luvaliwe uma i-TV ingasebenzi"</string>
   <string-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Izibuyekezo nokukhethwayo okubucayi"</item>
+    <item msgid="4002284890471636101">"[Faka isakhi 1]"</item>
+    <item msgid="7072772341455731040">"[Faka isakhi 2]"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="8306916492188176732">"Imodi yamandla elungiselelwe"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="7478438819421632774">"ngezakhi zenethiwekhi ezinconyiwe"</string>
-    <string name="energy_mode_moderate_info" msgid="7254958508156484301">"Ivumela izakhi ukuvusa i-TV ngenethiwekhi (okubekwe eceleni okunenethiwekhi)."</string>
-    <string name="energy_mode_moderate_all_low_features" msgid="2417504172139004649">"Zonke izakhi ezisemqoka"</string>
+    <string name="energy_mode_moderate_title" msgid="8612259261851051150">"Kulungisiwe"</string>
+    <string name="energy_mode_moderate_subtitle" msgid="5565533500130453270">"Ilindele Inethiwekhi"</string>
+    <string name="energy_mode_moderate_info" msgid="3188005033276283994">"Ilindele inethiwekhi — Inika amandla izakhi ukuvusa i-TV ngenethiwekhi"</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="6636328986387241066">"Imodi yamandla engeziwe"</string>
-    <string name="energy_mode_high_subtitle" msgid="8710109098343358567">"ngezakhi ezengeziwe zenethiwekhi"</string>
-    <string name="energy_mode_high_info" msgid="7089288229870320944">"Ivumela izakhi ezengeziwe ngisho noma i-TV ingasebenzi."</string>
-    <string name="energy_mode_moderate_all_moderate_features" msgid="1518972636963419872">"Zonke izakhi ezinconyiwe"</string>
+    <string name="energy_mode_high_title" msgid="7596672058005896920">"Kungeziwe"</string>
+    <string name="energy_mode_high_subtitle" msgid="5994284096495805422">"Ihlala ixunyiwe"</string>
+    <string name="energy_mode_high_info" msgid="8805447042714350186">"Ihlala ixhunyiwe — Inika amandla izakhi zenethiwekhi uma i-TV ingasebenzi"</string>
   <string-array name="energy_mode_high_features">
     <item msgid="3018897868803319747">"[Faka isakhi 1]"</item>
     <item msgid="170760143032597722">"[Faka isakhi 2]"</item>
diff --git a/Settings/res/values-zu/strings.xml b/Settings/res/values-zu/strings.xml
index 4ca92ff..1008387 100644
--- a/Settings/res/values-zu/strings.xml
+++ b/Settings/res/values-zu/strings.xml
@@ -368,6 +368,8 @@
     <string name="about_terms_of_service" msgid="8514826341101557623">"Ezomthetho ze-Google"</string>
     <string name="about_license_activity_unavailable" msgid="4559187037375581674">"Idatha yelayisense ayitholakali"</string>
     <string name="about_model" msgid="9164284529291439296">"Imodeli"</string>
+    <string name="device_mode" msgid="7258350575590118152">"Imodi yedivayisi"</string>
+    <string name="store_demo_mode" msgid="4382231515659362796">"I-demo Yesitolo"</string>
     <string name="about_version" msgid="6223547403835399861">"Inguqulo ye-Android TV OS"</string>
     <string name="about_serial" msgid="3432319328808745459">"Inombolo yomkhiqizo"</string>
     <string name="about_build" msgid="8467840394761634575">"Umakhiwo we-Android TV OS"</string>
@@ -435,6 +437,11 @@
     <string name="title_internet_connection" msgid="7502414094881828069">"Uxhumano lwe-intanethi"</string>
     <string name="connected" msgid="4981532275162345997">"Ixhunyiwe"</string>
     <string name="not_connected" msgid="475810896484271663">"Akuxhunyiwe"</string>
+    <string name="wifi_no_internet" msgid="27421689535934864">"Ayikho i-Inthanethi"</string>
+    <string name="wifi_saved" msgid="4354792774811431829">"Ilondoloziwe"</string>
+    <string name="wifi_bad_password" msgid="8686375382346768922">"Iphasiwedi engalungile"</string>
+    <string name="wifi_short_password" msgid="7658809378390032385">"Iphasiwedi ye-Wi-Fi ifushane kakhulu"</string>
+    <string name="wifi_captive_portal" msgid="8262150024660339529">"Kudingeka ukungena ngemvume"</string>
     <string name="wifi_setting_header_other_options" msgid="217382325707026836">"Okunye okukhethwa kukho"</string>
     <string name="wifi_setting_see_all" msgid="5048103047976316675">"Buka konke"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"Bona okumbalwa"</string>
@@ -902,6 +909,13 @@
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"Yenza ngokwezifiso imikhawulo"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"Isikhathashana nje..."</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"Guqula iphinikhodi"</string>
+    <string name="restricted_profile_create_preference_screen" msgid="3263536648469645089">"Sungula iphrofayela ekhawulelwe?"</string>
+    <string name="restricted_profile_already_created_placeholder" msgid="8619544048199836920">"Isunguliwe Kakade"</string>
+    <string name="restricted_profile_skip_action" msgid="4674562040162193593">"Yeqa"</string>
+    <string name="restricted_profile_create_pin_action" msgid="1883036507880250231">"Sungula Iphinikhodi"</string>
+    <string name="restricted_profile_enter_preference_screen" msgid="676246260867597333">"Ngena kuphrofayela ekhawulelwe?"</string>
+    <string name="restricted_profile_enter_not_found_placeholder" msgid="2270969471829375976">"Ayikho iphrofayela ekhawulelwe?"</string>
+    <string name="restricted_profile_enter_already_entered_placeholder" msgid="6178278708529027598">"Ifakiwe kakade"</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">"Lolu hlelo lokusebenza lungafinyelela kuma-akhawunti wakho. Ilawulwe yi-<xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"Faka i-PIN ukuze ubuke lesi siteshi"</string>
@@ -1064,10 +1078,6 @@
     <string name="recorded_microphones_title" msgid="5466988146086215426">"Amamakrofoni arekhodiwe"</string>
     <string name="show_audio_recording_start_failed" msgid="9131762831381326605">"Yehlulekile ukuqalisa ukurekhoda umsindo."</string>
     <string name="show_audio_recording_failed" msgid="8128216664039868681">"Ukurekhoda komsindo kwehlulekile."</string>
-    <string name="title_data_saver" msgid="7500278996154002792">"Iseva yedatha"</string>
-    <string name="summary_data_saver" msgid="6793558728898207405">"Lungisa ngokuzenzakalela ikhwalithi yevidiyo ukuze usebenzise idatha encane yeselula"</string>
-    <string name="title_data_alert" msgid="8262081890052682475">"Ukusetshenziswa kwedatha nezexwayiso"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Ungaxhuma ku-inthanethi nge-Wi-Fi, i-Ethernet, noma i-hotspot yefoni yakho."</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"Kwenze kubonakale kwamanye amadivayisi we-Bluetooth?"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"I-app ifuna ukwenza iTV yakho ibonakale kwamanye amadivayisi e-Bluetooth kumasekhondi angu-<xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1123,13 +1133,13 @@
     <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_modes_summary" msgid="2324906343309484649">"Lawa masethingi athinta idivayisi uma ingasetshenziswa"</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_mode_eco_hint" msgid="5280058011809503514">"Ukusetshenziswa kwamandla kungase kukhuphuke ngenani lezakhi ze-TV ozinika amandla."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Nika amandla okuthi \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
     <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Thola irimothi yami"</string>
     <string name="settings_find_my_remote_description" msgid="6606011378441585154">"Dlala umsindo ukuze uthole irimothi yakho ye-Google TV uma ibekwe kabi"</string>
-    <string name="find_my_remote_slice_description" msgid="7288029543560257872">"Cindezela inkinobho engemuva kwe-Google TV yakho ukuze udlale umsindo kurimothi yakho imizuzwana engu-30. Lokhu kusebenza kuphela ngamarimothi asekelwayo e-Google TV.\n\nUkuze umise umsindo, cindezela noma iyiphi inkinobho kurimothi yakho."</string>
+    <string name="find_my_remote_slice_description" msgid="313598681990933215">"Kunenkinobho ku-Google TV yakho ongayicindezela ukuze udlale umsindo kurimothi yakho imizuzwana engu-30. Lokhu kusebenza kuphela ngezilawuli-kude ezisekelwayo ze-Google TV.\n\nUkuze umise umsindo, cindezela noma iyiphi inkinobho kurimothi yakho."</string>
     <string name="find_my_remote_integration_hint" msgid="7560895390042161430">"Uma okuthi Thola irimothi yami kunikwe amandla, ungadlala umsindo ukuze uthole irimothi yakho ye-Google TV uma ibekwe kabi."</string>
     <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Dlala umsindo"</string>
 </resources>
diff --git a/Settings/res/values/energy-modes.xml b/Settings/res/values/energy-modes.xml
index d2a613b..56e220a 100644
--- a/Settings/res/values/energy-modes.xml
+++ b/Settings/res/values/energy-modes.xml
@@ -31,11 +31,12 @@
     <string name="energy_mode_low_identifier" translatable="false">low_energy_use</string>
     <color name="energy_mode_low_color">#137332</color>
     <drawable name="energy_mode_low_icon">@drawable/ic_eco_leaf</drawable>
-    <string name="energy_mode_low_title">Low energy mode</string>
-    <string name="energy_mode_low_subtitle">with essential network features</string>
-    <string name="energy_mode_low_info">Turn off network connection when the TV is not in use (standby mode).</string>
+    <string name="energy_mode_low_title">Low</string>
+    <string name="energy_mode_low_subtitle">Standby</string>
+    <string name="energy_mode_low_info">Standby — Network connection is off when the TV is not in use</string>
     <string-array name="energy_mode_low_features">
-        <item>Critical updates and functions</item>
+        <item>[Insert feature 1]</item>
+        <item>[Insert feature 2]</item>
     </string-array>
     <string name="energy_mode_low_eco_hint" />
 
@@ -53,10 +54,9 @@
     <string name="energy_mode_moderate_identifier" translatable="false">moderate_energy_use</string>
     <color name="energy_mode_moderate_color">#184EA6</color>
     <drawable name="energy_mode_moderate_icon">@drawable/ic_energy_mode_moderate</drawable>
-    <string name="energy_mode_moderate_title">Optimized energy mode</string>
-    <string name="energy_mode_moderate_subtitle">with recommended network features</string>
-    <string name="energy_mode_moderate_info">Allows features to wake the TV over the network (networked standby).</string>
-    <string name="energy_mode_moderate_all_low_features">All essential features</string>
+    <string name="energy_mode_moderate_title">Optimized</string>
+    <string name="energy_mode_moderate_subtitle">Networked Standby</string>
+    <string name="energy_mode_moderate_info">Networked standby — Enables features to wake up the TV over the network</string>
     <string-array name="energy_mode_moderate_features">
         <item>[Insert feature 1]</item>
         <item>[Insert feature 2]</item>
@@ -76,10 +76,9 @@
     <string name="energy_mode_high_identifier" translatable="false">high_energy_use</string>
     <color name="energy_mode_high_color">#EA8600</color>
     <drawable name="energy_mode_high_icon">@drawable/ic_energy_mode_high</drawable>
-    <string name="energy_mode_high_title">Increased energy mode</string>
-    <string name="energy_mode_high_subtitle">with additional network features</string>
-    <string name="energy_mode_high_info">Allows extra features even when the TV is not in use.</string>
-    <string name="energy_mode_moderate_all_moderate_features">All recommended features</string>
+    <string name="energy_mode_high_title">Increased</string>
+    <string name="energy_mode_high_subtitle">Always connected</string>
+    <string name="energy_mode_high_info">Always connected — Enables network features when TV is not in use</string>
     <string-array name="energy_mode_high_features">
         <item>[Insert feature 1]</item>
         <item>[Insert feature 2]</item>
diff --git a/Settings/res/values/strings.xml b/Settings/res/values/strings.xml
index 11a63ed..fe2c9be 100644
--- a/Settings/res/values/strings.xml
+++ b/Settings/res/values/strings.xml
@@ -634,6 +634,8 @@
     <string name="accessory_change_name">Change name</string>
     <!-- Title of dialog for renaming the bluetooth accessory [CHAR LIMIT=50] -->
     <string name="accessory_change_name_title">Enter a new name for this accessory</string>
+    <!-- Package to send menu state changes to and names of parameters -->
+    <string name="accessory_menu_state_broadcast_package" translatable="false"/>
 
     <!-- Remote and Accessories -->
     <skip />
@@ -972,6 +974,10 @@
     <string name="about_license_activity_unavailable">License data is unavailable</string>
     <!-- Preference which shows model. [CHAR LIMIT=50] -->
     <string name="about_model">Model</string>
+    <!-- Preference which shows the current device mode. [CHAR LIMIT=100] -->
+    <string name="device_mode">Device Mode</string>
+    <!-- Description of the current usage of the device indicating it is in a demo mode. [CHAR LIMIT=100] -->
+    <string name="store_demo_mode">Store Demo</string>
     <!-- Preference which shows version. [CHAR LIMIT=50] -->
     <string name="about_version">Android TV OS version</string>
     <!-- Preference which shows serial number. [CHAR LIMIT=50] -->
@@ -1142,6 +1148,16 @@
     <string name="connected">Connected</string>
     <!-- Not connected [CHAR LIMIT=50] -->
     <string name="not_connected">Not connected</string>
+    <!-- No internet access [CHAR LIMIT=50] -->
+    <string name="wifi_no_internet">No Internet</string>
+    <!-- Saved network [CHAR LIMIT=50] -->
+    <string name="wifi_saved">Saved</string>
+    <!-- Network with bad password [CHAR LIMIT=50] -->
+    <string name="wifi_bad_password">Wrong password</string>
+    <!-- Network with short password [CHAR LIMIT=NONE] -->
+    <string name="wifi_short_password">Wi-Fi password is too short</string>
+    <!-- Network with captive portal [CHAR LIMIT=50] -->
+    <string name="wifi_captive_portal">Sign-in required</string>
 
     <!-- Wifi setting headers [CHAR LIMIT=50] -->
     <string name="wifi_setting_header_other_options">Other options</string>
@@ -2629,18 +2645,6 @@
     <!-- Notification that audio recording failed. [CHAR LIMIT=100] -->
     <string name="show_audio_recording_failed"> Audio recording failed.</string>
 
-    <!-- Title of the preference displaying data saver setting. [CHAR LIMIT=50] -->
-    <string name="title_data_saver">Data Saver</string>
-
-    <!-- Summary of the preference displaying data saver setting. [CHAR LIMIT=80] -->
-    <string name="summary_data_saver">Automatically adjust video quality to use less mobile data</string>
-
-    <!-- Title of the preference displaying data usages and alerts setting. [CHAR LIMIT=50] -->
-    <string name="title_data_alert">Data usage and alerts</string>
-
-    <!-- Header info to educate users that they can connect to the internet via Wi-Fi, Ethernet, and phone's hotspot. [CHAR LIMIT=NONE] -->
-    <string name="data_saver_header_info">You can connect to the internet with Wi-Fi, Ethernet, or your phone\'s hotspot."</string>
-
     <!-- Title of dialog shown to the user whether to allow an app to enable discovery mode. [CHAR LIMIT=100] -->
     <string name="bluetooth_ask_discovery_title">Make visible to other Bluetooth devices?</string>
     <!-- Message of dialog shown to the user whether to allow an app to enable discovery mode. [CHAR LIMIT=NONE] -->
@@ -2683,6 +2687,8 @@
     <string name="advanced_color_format_slice_uri" translatable="false"/>
     <!-- Slice uri for Dolby Vision Mode in Advanced display settings -->
     <string name="advanced_dolby_vision_mode_slice_uri" translatable="false"/>
+    <!-- Slice uri for extended audio settings in Display & Sound settings -->
+    <string name="audio_ext_uri" translatable="false"/>
 
     <!-- Slice uri for general information -->
     <string name="general_info_slice_uri" translatable="false"/>
@@ -2806,6 +2812,7 @@
     <string name="basic_mode_exit_package" translatable="false" />
     <string name="basic_mode_exit_component" translatable="false" />
     <string name="basic_mode_exit_data" translatable="false" />
+    <string name="basic_mode_exit_internet" translatable="false" />
     <string name="basic_mode_suggestion_category_title" translatable="false" />
     <string name="basic_mode_exit_preference_title" translatable="false" />
     <string name="basic_mode_exit_preference_subtitle" translatable="false" />
@@ -2861,11 +2868,11 @@
     <!-- Title for energy modes preference -->
     <string name="energy_modes">Energy Modes</string>
     <!-- Title for energy mode selection confirmation dialog -->
-    <string name="energy_modes_summary">Improve energy efficiency when TV is not in use</string>
+    <string name="energy_modes_summary">These settings affect the device when not in use</string>
     <!-- Header for list of features enabled in the selected energy mode -->
     <string name="energy_mode_enables">Enables:</string>
     <!-- Warning that selecting a higher energy mode may increase power consumption -->
-    <string name="energy_mode_eco_hint">Note that this mode may increase the power consumption of the device.</string>
+    <string name="energy_mode_eco_hint">Power consumption may increase with the number of TV features you enable.</string>
     <!-- Title for energy mode selection confirmation dialog -->
     <string name="energy_modes_confirmation_title">Enable \"<xliff:g id="energyModeName" example="Essential network features">%s</xliff:g>\"</string>
 
@@ -2873,7 +2880,7 @@
     <string name="settings_find_my_remote_title">Find my remote</string>
     <!-- Description for find my remote preference -->
     <string name="settings_find_my_remote_description">Play a sound to locate your Google TV remote if it\'s misplaced</string>
-    <string name="find_my_remote_slice_description">Press the button at the back of your Google TV to play a sound on your remote for 30 seconds. This only works with supported Google TV remote controls.\n\nTo stop the sound, press any button on your remote.</string>
+    <string name="find_my_remote_slice_description">There is a button on your Google TV that you can push to play a sound on your remote for 30 seconds. This only works with supported Google TV remote controls.\n\nTo stop the sound, press any button on your remote.</string>
     <string name="find_my_remote_integration_title" translatable="false">@string/settings_find_my_remote_title</string>
     <string name="find_my_remote_integration_hint">When Find my remote is enabled, you can play a sound to locate your Google TV remote if it\'s misplaced.</string>
     <string name="find_my_remote_play_sound">Play sound</string>
diff --git a/Settings/res/xml/device_info_settings.xml b/Settings/res/xml/device_info_settings.xml
index c5c4abb..6def93a 100644
--- a/Settings/res/xml/device_info_settings.xml
+++ b/Settings/res/xml/device_info_settings.xml
@@ -81,6 +81,11 @@
         android:title="@string/about_model"
         android:summary="@string/device_info_default"/>
 
+    <!-- Device mode -->
+    <Preference android:key="device_mode"
+        android:title="@string/device_mode"
+        android:summary="@string/store_demo_mode"/>
+
     <!-- Device firmware version -->
     <Preference android:key="firmware_version"
         android:title="@string/about_version"
diff --git a/Settings/res/xml/device_info_settings_vendor.xml b/Settings/res/xml/device_info_settings_vendor.xml
index d6029d8..8b84821 100644
--- a/Settings/res/xml/device_info_settings_vendor.xml
+++ b/Settings/res/xml/device_info_settings_vendor.xml
@@ -82,6 +82,11 @@
         android:title="@string/about_model"
         android:summary="@string/device_info_default"/>
 
+    <!-- Device mode -->
+    <Preference android:key="device_mode"
+        android:title="@string/device_mode"
+        android:summary="@string/store_demo_mode"/>
+
     <!-- Device firmware version -->
     <Preference android:key="firmware_version"
         android:title="@string/about_version"
diff --git a/Settings/res/xml/device_info_settings_x.xml b/Settings/res/xml/device_info_settings_x.xml
index c7ec4b7..cd88df3 100644
--- a/Settings/res/xml/device_info_settings_x.xml
+++ b/Settings/res/xml/device_info_settings_x.xml
@@ -84,6 +84,11 @@
         android:title="@string/about_model"
         android:summary="@string/device_info_default"/>
 
+    <!-- Device mode -->
+    <Preference android:key="device_mode"
+        android:title="@string/device_mode"
+        android:summary="@string/store_demo_mode"/>
+
     <!-- Device firmware version -->
     <Preference android:key="firmware_version"
         android:title="@string/about_version"
diff --git a/Settings/res/xml/display_sound_x.xml b/Settings/res/xml/display_sound_x.xml
index 205f721..67f3350 100644
--- a/Settings/res/xml/display_sound_x.xml
+++ b/Settings/res/xml/display_sound_x.xml
@@ -72,6 +72,11 @@
         android:fragment="com.android.tv.twopanelsettings.slices.SliceFragment"
         custom:uri="@string/default_audio_output_settings_slice_uri"
         custom:isPreferenceVisible="false" />
+    <com.android.tv.twopanelsettings.slices.EmbeddedSlicePreference
+        android:key="audio_ext"
+        android:fragment="com.android.tv.twopanelsettings.slices.SliceFragment"
+        custom:uri="@string/audio_ext_uri"
+        custom:isPreferenceVisible="false" />
     <Preference
         android:key="advanced_sound_settings"
         android:title="@string/advanced_sound_settings_title"
diff --git a/Settings/res/xml/network.xml b/Settings/res/xml/network.xml
index 9082b26..533c113 100644
--- a/Settings/res/xml/network.xml
+++ b/Settings/res/xml/network.xml
@@ -47,18 +47,6 @@
                 android:targetClass="com.android.tv.settings.connectivity.AddWifiNetworkActivity"
                 android:targetPackage="com.android.tv.settings" />
         </com.android.settingslib.RestrictedPreference>
-        <com.android.tv.twopanelsettings.slices.SlicePreference
-            android:key="data_saver_slice"
-            android:title="@string/title_data_saver"
-            android:summary="@string/summary_data_saver"
-            android:fragment="com.android.tv.twopanelsettings.slices.SliceFragment"
-            custom:uri="content://com.google.android.apps.nbu.smartconnect.tv/datasaver"/>
-        <com.android.tv.twopanelsettings.slices.SlicePreference
-            android:key="data_alert_slice"
-            android:title="@string/title_data_alert"
-            android:fragment="com.android.tv.twopanelsettings.slices.SliceFragment"
-            custom:uri="content://com.google.android.apps.nbu.smartconnect.tv/dataalert"/>
-
         <SwitchPreference
             android:key="wifi_always_scan"
             android:persistent="true"
diff --git a/Settings/res/xml/network_x.xml b/Settings/res/xml/network_x.xml
index 6463814..90ceb31 100644
--- a/Settings/res/xml/network_x.xml
+++ b/Settings/res/xml/network_x.xml
@@ -18,11 +18,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:custom="http://schemas.android.com/apk/res-auto"
                   android:title="@string/connectivity_network_category_title">
-    <Preference
-        android:key="data_saver_info"
-        android:title="@string/data_saver_header_info"
-        android:enabled="false"
-        android:selectable="false"/>
 
     <com.android.tv.settings.widget.SwitchWithSoundPreference
         android:key="wifi_enable"
@@ -54,17 +49,6 @@
                 android:targetClass="com.android.tv.settings.connectivity.AddWifiNetworkActivity"
                 android:targetPackage="com.android.tv.settings" />
         </com.android.settingslib.RestrictedPreference>
-        <com.android.tv.twopanelsettings.slices.SlicePreference
-            android:key="data_saver_slice"
-            android:title="@string/title_data_saver"
-            android:summary="@string/summary_data_saver"
-            android:fragment="com.android.tv.twopanelsettings.slices.SliceFragment"
-            custom:uri="content://com.google.android.apps.nbu.smartconnect.tv/datasaver"/>
-        <com.android.tv.twopanelsettings.slices.SlicePreference
-            android:key="data_alert_slice"
-            android:title="@string/title_data_alert"
-            android:fragment="com.android.tv.twopanelsettings.slices.SliceFragment"
-            custom:uri="content://com.google.android.apps.nbu.smartconnect.tv/dataalert"/>
 
         <com.android.tv.settings.widget.CustomContentDescriptionSwitchPreference
             android:key="wifi_always_scan"
diff --git a/Settings/src/com/android/tv/settings/BootReceiver.java b/Settings/src/com/android/tv/settings/BootReceiver.java
index c963bc9..bf7e2d8 100644
--- a/Settings/src/com/android/tv/settings/BootReceiver.java
+++ b/Settings/src/com/android/tv/settings/BootReceiver.java
@@ -39,10 +39,13 @@
         if (DEBUG) {
             Log.i(TAG, "onReceive");
         }
+        if (context == null) {
+            return;
+        }
+        EthernetDetectionUtil.registerEthernetDetection(context);
         // Start the Service that supports ConnectedDevicesSliceProvider only if the URI is not
         // overlaid.
-        if (context != null
-                && NATIVE_CONNECTED_DEVICE_SLICE_PROVIDER_URI.equals(
+        if (NATIVE_CONNECTED_DEVICE_SLICE_PROVIDER_URI.equals(
                         context.getResources().getString(R.string.connected_devices_slice_uri))) {
             Intent mainIntent = new Intent(context, BluetoothDevicesService.class);
             context.startService(mainIntent);
diff --git a/Settings/src/com/android/tv/settings/EthernetDetectionUtil.java b/Settings/src/com/android/tv/settings/EthernetDetectionUtil.java
new file mode 100644
index 0000000..0be1cf8
--- /dev/null
+++ b/Settings/src/com/android/tv/settings/EthernetDetectionUtil.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+
+package com.android.tv.settings;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.net.NetworkCapabilities;
+import android.net.NetworkRequest;
+
+import com.android.tv.settings.connectivity.NetworkChangeDetectionConfigs;
+
+/**
+ * The utility class handles the registration of Ethernet networks with the system.
+ */
+public class EthernetDetectionUtil {
+    private EthernetDetectionUtil() {}
+
+    public static void registerEthernetDetection(Context context) {
+        ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
+        cm.registerNetworkCallback(
+                getEthernetNetworkRequest(),
+                getPendingIntent(context));
+    }
+
+    private static NetworkRequest getEthernetNetworkRequest() {
+        return new NetworkRequest.Builder()
+                .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+                .addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
+                .build();
+    }
+
+    private static PendingIntent getPendingIntent(Context context) {
+        Intent ethernetDetectionIntent = new Intent(
+                NetworkChangeDetectionConfigs.ACTION_ETHERNET_DETECTED)
+                .setPackage(context.getPackageName());
+
+        return PendingIntent.getBroadcast(
+                context, 0,
+                ethernetDetectionIntent, PendingIntent.FLAG_IMMUTABLE);
+    }
+}
diff --git a/Settings/src/com/android/tv/settings/MainFragment.java b/Settings/src/com/android/tv/settings/MainFragment.java
index 7f728f3..f9e304d 100644
--- a/Settings/src/com/android/tv/settings/MainFragment.java
+++ b/Settings/src/com/android/tv/settings/MainFragment.java
@@ -200,11 +200,6 @@
         mSuggestionQuickSettingPrefsContainer.showOrHideQuickSettings();
         updateAccountPref();
         updateAccessoryPref();
-        if (isWifiScanOptimisationEnabled()) {
-            mConnectivityListenerLite.handleConnectivityChange();
-        } else {
-            updateConnectivity();
-        }
         updateBasicModeSuggestion();
         updateChannelsAndInputs();
         return super.onCreateView(inflater, container, savedInstanceState);
@@ -645,12 +640,32 @@
         btChangeFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
         btChangeFilter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
         getContext().registerReceiver(mBCMReceiver, btChangeFilter);
+        if(mConnectivityListenerLite != null) {
+            mConnectivityListenerLite.setListener(this::updateConnectivityType);
+        }
+        mConnectivityListenerOptional.ifPresent(
+                connectivityListener -> connectivityListener.setListener(this::updateConnectivity));
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (isWifiScanOptimisationEnabled()) {
+            mConnectivityListenerLite.handleConnectivityChange();
+        } else {
+            updateConnectivity();
+        }
     }
 
     @Override
     public void onStop() {
-        super.onStop();
         getContext().unregisterReceiver(mBCMReceiver);
+        if(mConnectivityListenerLite != null) {
+            mConnectivityListenerLite.setListener(null);
+        }
+        mConnectivityListenerOptional.ifPresent(
+                connectivityListener -> connectivityListener.setListener(null));
+        super.onStop();
     }
 
     @Override
diff --git a/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java b/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java
index 2f31da8..3350a5c 100644
--- a/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java
+++ b/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java
@@ -110,12 +110,6 @@
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        // Set list view listeners after the fragment view is created
-        if (getCallbackFragment() instanceof TwoPanelSettingsFragment) {
-            TwoPanelSettingsFragment parentFragment =
-                    (TwoPanelSettingsFragment) getCallbackFragment();
-            parentFragment.addListenerForFragment(this);
-        }
         if (view != null) {
             TextView titleView = view.findViewById(R.id.decor_title);
             // We rely on getResources().getConfiguration().getLayoutDirection() instead of
@@ -248,6 +242,11 @@
     public void onResume() {
         super.onResume();
         mLifecycle.handleLifecycleEvent(ON_RESUME);
+        if (getCallbackFragment() instanceof TwoPanelSettingsFragment) {
+            TwoPanelSettingsFragment parentFragment =
+                    (TwoPanelSettingsFragment) getCallbackFragment();
+            parentFragment.addListenerForFragment(this);
+        }
     }
 
     // This should only be invoked if the parent Fragment is TwoPanelSettingsFragment.
@@ -262,6 +261,11 @@
     public void onPause() {
         mLifecycle.handleLifecycleEvent(ON_PAUSE);
         super.onPause();
+        if (getCallbackFragment() instanceof TwoPanelSettingsFragment) {
+            TwoPanelSettingsFragment parentFragment =
+                    (TwoPanelSettingsFragment) getCallbackFragment();
+            parentFragment.removeListenerForFragment(this);
+        }
     }
 
     @CallSuper
@@ -278,16 +282,6 @@
         super.onDestroy();
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        if (getCallbackFragment() instanceof TwoPanelSettingsFragment) {
-            TwoPanelSettingsFragment parentFragment =
-                    (TwoPanelSettingsFragment) getCallbackFragment();
-            parentFragment.removeListenerForFragment(this);
-        }
-    }
-
     @CallSuper
     @Override
     public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
diff --git a/Settings/src/com/android/tv/settings/about/AboutFragment.java b/Settings/src/com/android/tv/settings/about/AboutFragment.java
index 736baf1..ddfb00f 100644
--- a/Settings/src/com/android/tv/settings/about/AboutFragment.java
+++ b/Settings/src/com/android/tv/settings/about/AboutFragment.java
@@ -96,6 +96,7 @@
     private static final String KEY_DEVICE_FEEDBACK = "device_feedback";
     private static final String KEY_SAFETY_LEGAL = "safetylegal";
     private static final String KEY_DEVICE_NAME = "device_name";
+    private static final String KEY_DEVICE_MODE = "device_mode";
     private static final String KEY_TUTORIALS = "tutorials";
     private static final String KEY_RESET = "reset";
     private static final String KEY_RESET_OPTIONS = "reset_options";
@@ -263,6 +264,12 @@
             removePreference(findPreference(KEY_MANUAL));
         }
 
+        // Remove device mode if not in store demo mode.
+        if (!FlavorUtils.getFeatureFactory(getContext()).getBasicModeFeatureProvider()
+                .isStoreDemoMode(getContext())) {
+            removePreference(findPreference(KEY_DEVICE_MODE));
+        }
+
         // Remove regulatory information if none present.
         final Preference regulatoryPref = findPreference(KEY_REGULATORY_INFO);
         PreferenceUtils.resolveSystemActivityOrRemove(getActivity(), screen, regulatoryPref, 0);
@@ -408,6 +415,7 @@
             case KEY_DEVICE_NAME:
                 logEntrySelected(TvSettingsEnums.SYSTEM_ABOUT_DEVICE_NAME);
                 break;
+            case KEY_DEVICE_MODE:
             case KEY_RESET:
                 logEntrySelected(TvSettingsEnums.SYSTEM_ABOUT_FACTORY_RESET);
                 Intent factoryResetIntent = new Intent();
diff --git a/Settings/src/com/android/tv/settings/accessories/AccessoryUtils.java b/Settings/src/com/android/tv/settings/accessories/AccessoryUtils.java
index 44defba..4f57811 100644
--- a/Settings/src/com/android/tv/settings/accessories/AccessoryUtils.java
+++ b/Settings/src/com/android/tv/settings/accessories/AccessoryUtils.java
@@ -28,6 +28,7 @@
 
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.bluetooth.LocalBluetoothProfile;
 import com.android.tv.settings.R;
 
 import java.util.Arrays;
@@ -215,6 +216,21 @@
         return false;
     }
 
+    /**
+     * Returns true if the CachedBluetoothDevice supports an audio profile (A2DP for now),
+     * false otherwise.
+     */
+    public static boolean hasAudioProfile(CachedBluetoothDevice cachedDevice) {
+        if (cachedDevice != null) {
+            for (LocalBluetoothProfile profile : cachedDevice.getProfiles()) {
+                if (profile.getProfileId() == BluetoothProfile.A2DP) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     private AccessoryUtils() {
         // do not allow instantiation
     }
diff --git a/Settings/src/com/android/tv/settings/accessories/AddAccessoryActivity.java b/Settings/src/com/android/tv/settings/accessories/AddAccessoryActivity.java
index 255f134..71bd10d 100644
--- a/Settings/src/com/android/tv/settings/accessories/AddAccessoryActivity.java
+++ b/Settings/src/com/android/tv/settings/accessories/AddAccessoryActivity.java
@@ -67,6 +67,8 @@
 
     public static final String ACTION_CONNECT_INPUT =
             "com.google.android.intent.action.CONNECT_INPUT";
+    public static final String ACTION_PAIRING_MENU_STATE_CHANGE =
+            "com.android.tv.settings.accessories.PAIR_MENU_STATE_CHANGE";
 
     public static final String INTENT_EXTRA_NO_INPUT_MODE = "no_input_mode";
 
@@ -92,6 +94,10 @@
     private static final int TIME_TO_START_AUTOPAIR_COUNT = 5000;
     private static final int EXIT_TIMEOUT_MILLIS = 90 * 1000;
 
+    private static final String STATE_NAME = "state";
+    private static final String STATE_VALUE_START = "start";
+    private static final String STATE_VALUE_STOP = "stop";
+
     private AddAccessoryPreferenceFragment mPreferenceFragment;
     private AddAccessoryContentFragment mContentFragment;
 
@@ -270,6 +276,7 @@
     @Override
     protected void onStart() {
         super.onStart();
+        sendStateChangeBroadcast(/* start= */ true);
         Log.d(TAG, "onStart() mPairingInBackground = " + mPairingInBackground);
 
         // Only do the following if we are not coming back to this activity from
@@ -305,6 +312,7 @@
     @Override
     public void onStop() {
         Log.d(TAG, "onStop()");
+        sendStateChangeBroadcast(/* start= */ false);
         if (!mPairingBluetooth) {
             stopBluetoothPairer();
             mMsgHandler.removeCallbacksAndMessages(null);
@@ -754,6 +762,24 @@
         client.oneTouchPlay(callback);
     }
 
+    private void sendStateChangeBroadcast(boolean start) {
+        final String target_package =
+                getResources().getString(R.string.accessory_menu_state_broadcast_package);
+        final String state_value = start ? STATE_VALUE_START : STATE_VALUE_STOP;
+        if (target_package.isEmpty()) {
+            return;
+        }
+        sendBroadcastAsUser(
+                new Intent(ACTION_PAIRING_MENU_STATE_CHANGE)
+                        .setPackage(target_package)
+                        .setFlags(
+                                Intent.FLAG_INCLUDE_STOPPED_PACKAGES
+                                        | Intent.FLAG_RECEIVER_FOREGROUND
+                                        | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND)
+                        .putExtra(STATE_NAME, state_value),
+                UserHandle.SYSTEM);
+    }
+
     /**
      * @return String containing text to be announced when the Activity is visible to the users
      * when Talkback is on.
diff --git a/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceProvider.java b/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceProvider.java
index 4228692..b2a9875 100644
--- a/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceProvider.java
+++ b/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceProvider.java
@@ -120,13 +120,17 @@
     static final String KEY_BLUETOOTH_TOGGLE = "bluetooth_toggle";
     static final String KEY_PAIR_REMOTE = "pair_remote";
     static final String KEY_ACCESSORIES = "accessories";
+    static final String KEY_OFFICIAL_REMOTES_CATEGORY = "official_remotes_category";
+    // Preference key for the remote bundled with the device (Bluetooth based)
     static final String KEY_OFFICIAL_REMOTE = "official_remote";
+    // Preference key for the remote bundled with the device (IR based)
     static final String KEY_IR = "ir";
     static final String KEY_CONNECT = "connect";
     static final String KEY_DISCONNECT = "disconnect";
     static final String KEY_RENAME = "rename";
     static final String KEY_FORGET = "forget";
     static final String KEY_EXTRAS_DEVICE = "extra_devices";
+    static final String KEY_BLUETOOTH_DEVICE_INFO = "bluetooth_device_info";
     static final String KEY_FIND_MY_REMOTE_TOGGLE = "fmr_toggle";
     static final String KEY_TOGGLE_ACTIVE_AUDIO_OUTPUT = "toggle_active_audio_output";
 
@@ -264,7 +268,8 @@
         if (Flags.enableTvMediaOutputDialog()
                 && cachedDevice != null && !cachedDevice.isBusy()
                 && AccessoryUtils.isConnected(device) && cachedDevice.isConnected()
-                && AccessoryUtils.isBluetoothHeadset(device)) {
+                && (AccessoryUtils.isBluetoothHeadset(device)
+                || AccessoryUtils.hasAudioProfile(cachedDevice))) {
             boolean isActive = AccessoryUtils.isActiveAudioOutput(device);
 
             Intent intent = new Intent(ACTION_TOGGLE_CHANGED);
@@ -395,6 +400,7 @@
 
         // Update "bluetooth device info preference".
         RowBuilder infoPref = new RowBuilder()
+                .setKey(KEY_BLUETOOTH_DEVICE_INFO)
                 .setIcon(IconCompat.createWithResource(context, R.drawable.ic_baseline_info_24dp));
 
         infoPref.addInfoItem(getString(R.string.bluetooth_serial_number_label), deviceAddr);
@@ -531,6 +537,7 @@
         boolean isIrSettingsUriValid = isSliceProviderValid(irSettingsUri);
         if (isOfficialRemoteSettingsUriValid || isIrSettingsUriValid) {
             psb.addPreferenceCategory(new RowBuilder()
+                    .setKey(KEY_OFFICIAL_REMOTES_CATEGORY)
                     .setTitle(getString(R.string.bluetooth_official_remote_category)));
         }
         if (isIrSettingsUriValid) {
diff --git a/Settings/src/com/android/tv/settings/basic/BasicModeFeatureProvider.java b/Settings/src/com/android/tv/settings/basic/BasicModeFeatureProvider.java
index 4aab26a..0d48aed 100644
--- a/Settings/src/com/android/tv/settings/basic/BasicModeFeatureProvider.java
+++ b/Settings/src/com/android/tv/settings/basic/BasicModeFeatureProvider.java
@@ -36,4 +36,16 @@
      */
     void startBasicModeExitActivity(@NonNull Activity activity);
 
+    /**
+     * Attempt to start the Activity for blocking internet in basic mode.
+     *
+     * @param activity the Activity to start the basic mode exit Activity from
+     */
+    void startBasicModeInternetBlock(@NonNull Activity activity);
+
+    /**
+     * @return whether the device is in store demo mode.
+     */
+    boolean isStoreDemoMode(@NonNull Context context);
+
 }
diff --git a/Settings/src/com/android/tv/settings/basic/BasicModeFeatureProviderImpl.java b/Settings/src/com/android/tv/settings/basic/BasicModeFeatureProviderImpl.java
index c48e84a..00f22b9 100644
--- a/Settings/src/com/android/tv/settings/basic/BasicModeFeatureProviderImpl.java
+++ b/Settings/src/com/android/tv/settings/basic/BasicModeFeatureProviderImpl.java
@@ -35,4 +35,14 @@
     public void startBasicModeExitActivity(@NonNull Activity activity) {
         // no-op
     }
+
+    @Override
+    public void startBasicModeInternetBlock(@NonNull Activity activity) {
+        // no-op
+    }
+
+    @Override
+    public boolean isStoreDemoMode(@NonNull Context context) {
+        return false;
+    }
 }
diff --git a/Settings/src/com/android/tv/settings/basic/BasicModeFeatureProviderImplX.java b/Settings/src/com/android/tv/settings/basic/BasicModeFeatureProviderImplX.java
index b83e239..fa21c4f 100644
--- a/Settings/src/com/android/tv/settings/basic/BasicModeFeatureProviderImplX.java
+++ b/Settings/src/com/android/tv/settings/basic/BasicModeFeatureProviderImplX.java
@@ -16,10 +16,13 @@
 
 package com.android.tv.settings.basic;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.ResolveInfo;
 import android.database.Cursor;
 import android.net.Uri;
@@ -30,9 +33,17 @@
 
 import com.android.tv.settings.util.ResourcesUtil;
 
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.List;
+import java.util.Optional;
 
-/** Implementation of {@link BasicModeFeatureProvider}. */
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserFactory;
+
+/**
+ * Implementation of {@link BasicModeFeatureProvider}.
+ */
 public class BasicModeFeatureProviderImplX implements BasicModeFeatureProvider {
 
     private static final String TAG = "BasicModeFeatureX";
@@ -40,6 +51,13 @@
     // The string "offline_mode" is a static protocol and should not be changed in general.
     private static final String KEY_BASIC_MODE = "offline_mode";
 
+    private static final String OEM_AUTHORITY = "tvlauncher.config";
+    private static final String OEM_CONTRACT_SCHEME = "content";
+    private static final String OEM_CONFIG_PATH = "configuration";
+    private static final String DEVICE_MODE = "device-mode";
+    private static final String STORE_DEMO = "store_demo";
+    private static final String VALUE = "value";
+
     @Override
     public boolean isBasicMode(@NonNull Context context) {
         final String providerUriString = ResourcesUtil.getString(context,
@@ -65,19 +83,29 @@
 
     @Override
     public void startBasicModeExitActivity(@NonNull Activity activity) {
+        final String basicModeExit = ResourcesUtil.getString(activity, "basic_mode_exit_data");
+        startBasicModeExitActivity(activity, basicModeExit);
+    }
+
+    @Override
+    public void startBasicModeInternetBlock(@NonNull Activity activity) {
+        final String basicModeExit = ResourcesUtil.getString(activity, "basic_mode_exit_internet");
+        startBasicModeExitActivity(activity, basicModeExit);
+    }
+
+    private void startBasicModeExitActivity(@NonNull Activity activity, String basicModeExitType) {
         final String basicModeExitPackage = ResourcesUtil.getString(activity,
                 "basic_mode_exit_package");
         final String basicModeExitComponent =
                 ResourcesUtil.getString(activity, "basic_mode_exit_component");
-        final String basicModeExitData = ResourcesUtil.getString(activity, "basic_mode_exit_data");
         if (TextUtils.isEmpty(basicModeExitPackage) || TextUtils.isEmpty(basicModeExitComponent)
-                || TextUtils.isEmpty(basicModeExitData)) {
+                || TextUtils.isEmpty(basicModeExitType)) {
             Log.e(TAG, "Basic mode exit activity undefined.");
             return;
         }
         ComponentName componentName =
                 new ComponentName(basicModeExitPackage, basicModeExitComponent);
-        Uri dataUri = Uri.parse(basicModeExitData);
+        Uri dataUri = Uri.parse(basicModeExitType);
         Intent intent = new Intent().setComponent(componentName).setData(dataUri);
         List<ResolveInfo> intentHandlingActivities =
                 activity.getPackageManager().queryIntentActivities(intent, 0);
@@ -95,4 +123,58 @@
         }
         Log.e(TAG, "Basic mode exit activity not found.");
     }
+
+    @Override
+    public boolean isStoreDemoMode(@NonNull Context context) {
+        if (getCustomizationAppPackageName(context).isEmpty()) {
+            // There is no customizations apk for this device.
+            return false;
+        }
+        Uri oemUri =
+                new Uri.Builder()
+                        .scheme(OEM_CONTRACT_SCHEME)
+                        .authority(OEM_AUTHORITY)
+                        .path(OEM_CONFIG_PATH)
+                        .build();
+        try (InputStream inputStream =
+                     context.getContentResolver().openInputStream(oemUri)) {
+            if (inputStream == null) {
+                return false;
+            }
+            XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
+            parser.setInput(new InputStreamReader(inputStream, UTF_8));
+            int eventType = parser.getEventType();
+            while (eventType != XmlPullParser.END_DOCUMENT) {
+                if (eventType == XmlPullParser.START_TAG) {
+                    if (DEVICE_MODE.equals(parser.getName())) {
+                        Log.e(TAG, "Got is Store Demo: " + STORE_DEMO.equals(
+                                parser.getAttributeValue(null, VALUE)));
+                        return STORE_DEMO.equals(parser.getAttributeValue(null, VALUE));
+                    }
+                }
+                eventType = parser.next();
+            }
+            return false;
+        } catch (Exception e) {
+            // Fallback to default mode if we can't get a value.
+            Log.e(TAG, "Unable to determine store demo mode", e);
+            return false;
+        }
+    }
+
+    private Optional<String> getCustomizationAppPackageName(@NonNull Context context) {
+        return Optional.ofNullable(
+                        context
+                                .getPackageManager()
+                                .resolveContentProvider(
+                                        OEM_AUTHORITY, /* flags= */ 0))
+                .filter(providerInfo -> hasSystemAppFlags(providerInfo.applicationInfo))
+                .map(providerInfo -> providerInfo.applicationInfo.packageName);
+    }
+
+    private static boolean hasSystemAppFlags(ApplicationInfo info) {
+        return (info.flags & (ApplicationInfo.FLAG_UPDATED_SYSTEM_APP
+                | ApplicationInfo.FLAG_SYSTEM))
+                != 0;
+    }
 }
diff --git a/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java b/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java
index cb46d3f..78e87f7 100644
--- a/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java
+++ b/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java
@@ -62,7 +62,7 @@
     private static final String TAG = "ConnectivityListener";
 
     private final Context mContext;
-    private final Listener mListener;
+    private Listener mListener;
 
     private WifiTracker mWifiTracker;
 
@@ -91,7 +91,6 @@
     private int mNetworkType;
     private String mWifiSsid;
     private int mWifiSignalStrength;
-    private final Handler mHandler = new Handler();
     private LinkProperties mLateLp = null;
     private final InterfaceStateListener mEthernetListener;
     private final ArrayMap<String, IpConfiguration> mAvailableInterfaces = new ArrayMap<>();
@@ -149,9 +148,9 @@
             telephonyManager.listen(mPhoneStateListener,
                     PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
         }
-        mConnectivityManager.registerDefaultNetworkCallback(mNetworkCallback, mHandler);
+        mConnectivityManager.registerDefaultNetworkCallback(mNetworkCallback, mUiHandler);
         if (mEthernetManager != null) {
-            mEthernetManager.addInterfaceStateListener(r -> mUiHandler.post(r),
+            mEthernetManager.addInterfaceStateListener(mContext.getMainExecutor(),
                     mEthernetListener);
         }
     }
@@ -468,6 +467,10 @@
         }
     }
 
+    public void setListener(Listener listener) {
+        this.mListener = listener;
+    }
+
     public interface Listener {
         void onConnectivityChange();
     }
diff --git a/Settings/src/com/android/tv/settings/connectivity/ConnectivityListenerLite.java b/Settings/src/com/android/tv/settings/connectivity/ConnectivityListenerLite.java
index b9a0868..dfdaa6c 100644
--- a/Settings/src/com/android/tv/settings/connectivity/ConnectivityListenerLite.java
+++ b/Settings/src/com/android/tv/settings/connectivity/ConnectivityListenerLite.java
@@ -81,6 +81,10 @@
         mListener = null;
     }
 
+    public void setListener(Listener listener) {
+        this.mListener = listener;
+    }
+
     public interface Listener {
         void onConnectivityChange(ActiveNetworkProvider activeNetworkProvider);
     }
diff --git a/Settings/src/com/android/tv/settings/connectivity/EthernetDetectionReceiver.java b/Settings/src/com/android/tv/settings/connectivity/EthernetDetectionReceiver.java
new file mode 100644
index 0000000..cd0103b
--- /dev/null
+++ b/Settings/src/com/android/tv/settings/connectivity/EthernetDetectionReceiver.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+
+package com.android.tv.settings.connectivity;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+
+/**
+ * The {@link BroadcastReceiver} for detecting and recording ethernet connections
+ */
+public class EthernetDetectionReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (!NetworkChangeDetectionConfigs.ACTION_ETHERNET_DETECTED.equals(intent.getAction())) {
+            return;
+        }
+        SharedPreferences networkChangePref = context.getSharedPreferences(
+                NetworkChangeDetectionConfigs.SHARED_PREFERENCES_NAME,
+                Context.MODE_PRIVATE);
+        boolean isEthernetRecorded = networkChangePref.getBoolean(
+                NetworkChangeDetectionConfigs.ETHERNET_RECORD_PREFERENCE_KEY, false);
+
+        if (!isEthernetRecorded) {
+            SharedPreferences.Editor networkChangePrefEditor = networkChangePref.edit();
+            int currentCount = networkChangePref.getInt(
+                    NetworkChangeDetectionConfigs.PREFERENCE_KEY, 0);
+            networkChangePrefEditor.putInt(NetworkChangeDetectionConfigs.PREFERENCE_KEY,
+                    currentCount + 1);
+            networkChangePrefEditor.putBoolean(
+                    NetworkChangeDetectionConfigs.ETHERNET_RECORD_PREFERENCE_KEY, true);
+            networkChangePrefEditor.commit();
+
+            // Notify NetworkChange observers of change.
+            context.getContentResolver().notifyChange(
+                    NetworkChangeDetectionConfigs.CONTENT_URI, null);
+        }
+    }
+}
diff --git a/Settings/src/com/android/tv/settings/connectivity/NetworkChangeContentProvider.java b/Settings/src/com/android/tv/settings/connectivity/NetworkChangeContentProvider.java
new file mode 100644
index 0000000..9b32f54
--- /dev/null
+++ b/Settings/src/com/android/tv/settings/connectivity/NetworkChangeContentProvider.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2024 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
+ */
+package com.android.tv.settings.connectivity;
+
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.net.Uri;
+import android.util.Log;
+
+/**
+ * A {@link ContentProvider} that provides information for detecting network changes to the
+ * current network for re-authenticating SmartHome access.
+ * This ContentProvider should only be accessed by the Launcherx Process, and no other apps should
+ * be able to invoke it (as determined by permission).
+ */
+public class NetworkChangeContentProvider extends ContentProvider {
+    private static final String TAG = "NetworkChangeContentProvider";
+    private static final int DEFAULT_COUNT = 0;
+
+    private SharedPreferences mSharedPreferences;
+
+    @Override
+    public boolean onCreate() {
+        if (getContext() != null) {
+            mSharedPreferences = getContext().getSharedPreferences(
+                    NetworkChangeDetectionConfigs.SHARED_PREFERENCES_NAME,
+                    Context.MODE_PRIVATE);
+        }
+        return true;
+    }
+
+    @Override
+    public Cursor query(
+            Uri uri,
+            String[] projection,
+            String selection,
+            String[] selectionArgs,
+            String sortOrder) {
+        Log.d(TAG, "Querying with URI " + uri);
+        String path = uri.getPath();
+
+        if (!path.endsWith("/" + NetworkChangeDetectionConfigs.PREFERENCE_KEY)) {
+            throw new IllegalArgumentException("Unknown URI: " + uri);
+        } else {
+            int totalCount = mSharedPreferences.getInt(NetworkChangeDetectionConfigs.PREFERENCE_KEY,
+                    DEFAULT_COUNT);
+            MatrixCursor cursor = new MatrixCursor(
+                    new String[]{NetworkChangeDetectionConfigs.PREFERENCE_KEY});
+            cursor.addRow(new Object[]{totalCount});
+            cursor.setNotificationUri(getContext().getContentResolver(),
+                    NetworkChangeDetectionConfigs.CONTENT_URI);
+            return cursor;
+        }
+    }
+
+    @Override
+    public String getType(Uri uri) {
+        return null;
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues contentValues) {
+        throw new UnsupportedOperationException("Read-only access supported.");
+    }
+
+    @Override
+    public int delete(Uri uri, String s, String[] strings) {
+        throw new UnsupportedOperationException("Read-only access supported.");
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues contentValues, String s, String[] strings) {
+        throw new UnsupportedOperationException("Read-only access supported.");
+    }
+}
\ No newline at end of file
diff --git a/Settings/src/com/android/tv/settings/connectivity/NetworkChangeDetectionConfigs.java b/Settings/src/com/android/tv/settings/connectivity/NetworkChangeDetectionConfigs.java
new file mode 100644
index 0000000..991a316
--- /dev/null
+++ b/Settings/src/com/android/tv/settings/connectivity/NetworkChangeDetectionConfigs.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2024 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
+ */
+package com.android.tv.settings.connectivity;
+
+import android.net.Uri;
+
+/**
+ * Helper class for maintaining all the values related to network change detection.
+ */
+public class NetworkChangeDetectionConfigs {
+    public static final String SHARED_PREFERENCES_NAME = "NetworkChangeSharedPreference";
+
+    public static final String PREFERENCE_KEY = "total_network_count";
+    public static final String ETHERNET_RECORD_PREFERENCE_KEY = "is_ethernet_recorded";
+
+    public static final String AUTHORITY =
+            "com.android.settings.connectivity.networkchangedetection";
+    public static final Uri CONTENT_URI = Uri.parse(
+            "content://" + AUTHORITY + "/" + PREFERENCE_KEY);
+    public static final String ACTION_ETHERNET_DETECTED =
+            "com.android.settings.connectivity.ETHERNET_DETECTED";
+
+    private NetworkChangeDetectionConfigs() {
+    }
+}
diff --git a/Settings/src/com/android/tv/settings/connectivity/NetworkChangeStateManager.java b/Settings/src/com/android/tv/settings/connectivity/NetworkChangeStateManager.java
new file mode 100644
index 0000000..ac45d73
--- /dev/null
+++ b/Settings/src/com/android/tv/settings/connectivity/NetworkChangeStateManager.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2024 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
+ */
+package com.android.tv.settings.connectivity;
+
+/**
+ * This is responsible for preserving the current state of the network with respect to
+ * whether it is already recognized from any preceding connections.
+ */
+public class NetworkChangeStateManager {
+    private static NetworkChangeStateManager instance;
+    private boolean isNetworkStateKnown = false;
+
+    private NetworkChangeStateManager() {}
+
+    public static NetworkChangeStateManager getInstance() {
+        if (instance == null) {
+            instance = new NetworkChangeStateManager();
+        }
+        return instance;
+    }
+
+    public boolean getIsNetworkStateKnown() {
+        return isNetworkStateKnown;
+    }
+
+    public void setIsNetworkStateKnown(boolean newValue) {
+        isNetworkStateKnown = newValue;
+    }
+}
diff --git a/Settings/src/com/android/tv/settings/connectivity/NetworkFragment.java b/Settings/src/com/android/tv/settings/connectivity/NetworkFragment.java
index 9009637..5a92aa0 100644
--- a/Settings/src/com/android/tv/settings/connectivity/NetworkFragment.java
+++ b/Settings/src/com/android/tv/settings/connectivity/NetworkFragment.java
@@ -29,14 +29,16 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.ConnectivityManager;
-import android.net.NetworkCapabilities;
 import android.net.NetworkInfo;
 import android.net.wifi.WifiManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.SystemClock;
+import android.os.SystemProperties;
 import android.os.UserManager;
 import android.provider.Settings;
+import android.util.ArrayMap;
 import android.view.View;
 
 import androidx.annotation.Keep;
@@ -46,13 +48,15 @@
 import androidx.preference.TwoStatePreference;
 
 import com.android.settingslib.RestrictedPreference;
-import com.android.tv.settings.library.network.AccessPoint;
 import com.android.tv.settings.MainFragment;
 import com.android.tv.settings.R;
 import com.android.tv.settings.RestrictedPreferenceAdapter;
 import com.android.tv.settings.SettingsPreferenceFragment;
+import com.android.tv.settings.basic.BasicModeFeatureProvider;
+import com.android.tv.settings.library.network.AccessPoint;
 import com.android.tv.settings.overlay.FlavorUtils;
 import com.android.tv.settings.util.SliceUtils;
+import com.android.tv.settings.widget.AccessPointPreference;
 import com.android.tv.settings.widget.CustomContentDescriptionSwitchPreference;
 import com.android.tv.settings.widget.TvAccessPointPreference;
 import com.android.tv.twopanelsettings.slices.SlicePreference;
@@ -60,8 +64,10 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -83,11 +89,8 @@
     private static final String KEY_ETHERNET_STATUS = "ethernet_status";
     private static final String KEY_ETHERNET_PROXY = "ethernet_proxy";
     private static final String KEY_ETHERNET_DHCP = "ethernet_dhcp";
-    private static final String KEY_DATA_SAVER_SLICE = "data_saver_slice";
-    private static final String KEY_DATA_ALERT_SLICE = "data_alert_slice";
     private static final String KEY_NETWORK_DIAGNOSTICS = "network_diagnostics";
 
-    private static final String ACTION_DATA_ALERT_SETTINGS = "android.settings.DATA_ALERT_SETTINGS";
     private static final int INITIAL_UPDATE_DELAY = 500;
 
     private static final String NETWORK_DIAGNOSTICS_ACTION =
@@ -108,7 +111,8 @@
     private Preference mEthernetStatusPref;
     private Preference mEthernetProxyPref;
     private Preference mEthernetDhcpPref;
-    private PreferenceCategory mWifiOther;
+    private Map<WifiEntry, RestrictedPreferenceAdapter<TvAccessPointPreference>> mPrefMap =
+            Collections.emptyMap();
 
     private final Handler mHandler = new Handler();
     private long mNoWifiUpdateBeforeMillis;
@@ -125,6 +129,8 @@
         return new NetworkFragment();
     }
 
+    private final List<AccessPoint> mCurrentAccessPoints = new ArrayList<>();
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         mIsWifiHardwarePresent = getContext().getPackageManager()
@@ -147,11 +153,6 @@
     }
 
     @Override
-    public void onDestroy() {
-        super.onDestroy();
-    }
-
-    @Override
     public void onResume() {
         super.onResume();
         // There doesn't seem to be an API to listen to everything this could cover, so
@@ -159,6 +160,14 @@
         updateConnectivity();
     }
 
+
+    @Override
+    public void onStop() {
+        mConnectivityListener.setListener(null);
+        clearCurrentAccessPoints();
+        super.onStop();
+    }
+
     private int getPreferenceScreenResId() {
         switch (FlavorUtils.getFlavor(getContext())) {
             case FLAVOR_CLASSIC:
@@ -184,7 +193,6 @@
         mAddPref = (RestrictedPreference) findPreference(KEY_WIFI_ADD);
         mAddEasyConnectPref = (RestrictedPreference) findPreference(KEY_WIFI_ADD_EASYCONNECT);
         mAlwaysScan = (TwoStatePreference) findPreference(KEY_WIFI_ALWAYS_SCAN);
-        mWifiOther = (PreferenceCategory) findPreference(KEY_WIFI_OTHER);
 
         mEthernetCategory = (PreferenceCategory) findPreference(KEY_ETHERNET);
         mEthernetStatusPref = findPreference(KEY_ETHERNET_STATUS);
@@ -195,20 +203,6 @@
             mEnableWifiPref.setVisible(false);
         }
 
-        updateVisibilityForDataSaver();
-        Preference dataSaverSlicePref = findPreference(KEY_DATA_SAVER_SLICE);
-        Preference dataAlertSlicePref = findPreference(KEY_DATA_ALERT_SLICE);
-        Intent i = getActivity().getIntent();
-        if (i != null && i.getAction() != null) {
-            if (i.getAction().equals(Settings.ACTION_DATA_SAVER_SETTINGS)
-                    && dataSaverSlicePref.isVisible()) {
-                mHandler.post(() -> scrollToPreference(dataSaverSlicePref));
-            } else if (i.getAction().equals(ACTION_DATA_ALERT_SETTINGS)
-                    && dataAlertSlicePref.isVisible()) {
-                mHandler.post(() -> scrollToPreference(dataAlertSlicePref));
-            }
-        }
-
         Preference networkDiagnosticsPref = findPreference(KEY_NETWORK_DIAGNOSTICS);
         Intent networkDiagnosticsIntent = makeNetworkDiagnosticsIntent();
         if (networkDiagnosticsIntent != null) {
@@ -243,17 +237,6 @@
         }
     }
 
-    private void updateVisibilityForDataSaver() {
-        Preference dataSaverSlicePref = findPreference(KEY_DATA_SAVER_SLICE);
-        Preference dataAlertSlicePref = findPreference(KEY_DATA_ALERT_SLICE);
-        boolean isDataSaverVisible = isConnected() && SliceUtils.isSliceProviderValid(
-                getContext(), ((SlicePreference) dataSaverSlicePref).getUri());
-        boolean isDataAlertVisible = isConnected() && SliceUtils.isSliceProviderValid(
-                getContext(), ((SlicePreference) dataAlertSlicePref).getUri());
-        dataSaverSlicePref.setVisible(isDataSaverVisible);
-        dataAlertSlicePref.setVisible(isDataAlertVisible);
-    }
-
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
         if (preference.getKey() == null) {
@@ -261,7 +244,22 @@
         }
         switch (preference.getKey()) {
             case KEY_WIFI_ENABLE:
-                mConnectivityListener.setWifiEnabled(mEnableWifiPref.isChecked());
+                BasicModeFeatureProvider provider = FlavorUtils.getFeatureFactory(
+                        getContext()).getBasicModeFeatureProvider();
+                if (mEnableWifiPref.isChecked() &&
+                        Settings.Global.getInt(
+                                getContext().getContentResolver(), Settings.Global.ADB_ENABLED, 0)
+                                != 1 && SystemProperties.getInt(
+                        "ro.product.first_api_level", Build.VERSION.SDK_INT)
+                        >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE && provider.isBasicMode(
+                        getContext())
+                        && !provider.isStoreDemoMode(getContext())) {
+                    // WiFi turned ON + not developer + launched on U+ + basic mode.
+                    // Prevent WiFi connection by launching dialog instead.
+                    provider.startBasicModeInternetBlock(getActivity());
+                } else {
+                    mConnectivityListener.setWifiEnabled(mEnableWifiPref.isChecked());
+                }
                 logToggleInteracted(
                         TvSettingsEnums.NETWORK_WIFI_ON_OFF, mEnableWifiPref.isChecked());
                 return true;
@@ -375,8 +373,6 @@
                     ? R.string.connected : R.string.not_connected);
             mEthernetStatusPref.setSummary(mConnectivityListener.getEthernetIpAddress());
         }
-
-        updateVisibilityForDataSaver();
     }
 
     private void updateWifiList() {
@@ -405,13 +401,16 @@
         }
 
         final Context themedContext = getPreferenceManager().getContext();
-        final Collection<AccessPoint> accessPoints = mConnectivityListener.getAvailableNetworks();
+        final Collection<AccessPoint> newAccessPoints =
+                mConnectivityListener.getAvailableNetworks();
         int index = 0;
 
-        for (final AccessPoint accessPoint : accessPoints) {
+        final Map<WifiEntry, RestrictedPreferenceAdapter<TvAccessPointPreference>> newPrefMap =
+                new ArrayMap<>();
+        for (final AccessPoint accessPoint : newAccessPoints) {
             accessPoint.setListener(this);
             RestrictedPreferenceAdapter<TvAccessPointPreference> restrictedPref =
-                    (RestrictedPreferenceAdapter<TvAccessPointPreference>) accessPoint.getTag();
+                    mPrefMap.get(accessPoint.getWifiEntry());
             Preference pref;
             if (restrictedPref == null) {
                 pref = new TvAccessPointPreference(accessPoint, themedContext, mUserBadgeCache,
@@ -422,13 +421,21 @@
                 restrictedPref = new RestrictedPreferenceAdapter(themedContext, pref,
                         userRestrictions);
                 restrictedPref.setApSaved(accessPoint.isSaved());
-                accessPoint.setTag(restrictedPref);
             } else {
                 restrictedPref.setApSaved(accessPoint.isSaved());
                 toRemove.remove(restrictedPref.getPreference());
                 pref = restrictedPref.getOriginalPreference();
             }
-            if (accessPoint.isActive() && !isCaptivePortal(accessPoint)) {
+            newPrefMap.put(accessPoint.getWifiEntry(), restrictedPref);
+
+            if (isCaptivePortal(accessPoint)) {
+                pref.setFragment(null);
+                pref.setIntent(null);
+                pref.setOnPreferenceClickListener(preference -> {
+                    accessPoint.getWifiEntry().signIn(null);
+                    return true;
+                });
+            } else if (accessPoint.isActive()) {
                 pref.setFragment(WifiDetailsFragment.class.getName());
                 // No need to track entry selection as new page will be focused
                 pref.setOnPreferenceClickListener(preference -> false);
@@ -446,12 +453,12 @@
             pref.setVisible(!restrictedPref.isRestricted(UserManager.DISALLOW_CONFIG_WIFI)
                     || accessPoint.isSaved());
             pref.setOrder(index++);
-            pref.setSummary(accessPoint.isActive()? R.string.connected : R.string.not_connected);
+            pref.setSummary(WifiUtils.getConnectionStatus(accessPoint.getWifiEntry()));
             restrictedPref.updatePreference();
 
             Preference restrictedChild = restrictedPref.getPreference();
             if (restrictedChild.getParent() != null &&
-                restrictedChild.getParent() != mWifiNetworksCategory) {
+                    restrictedChild.getParent() != mWifiNetworksCategory) {
                 // Remove first if added to parent from old fragment.
                 restrictedChild.getParent().removePreference(restrictedChild);
             }
@@ -463,15 +470,21 @@
         }
 
         mCollapsePref.setVisible(mWifiNetworksCategory.shouldShowCollapsePref());
+        mPrefMap = newPrefMap;
+
+        clearCurrentAccessPoints();
+        mCurrentAccessPoints.addAll(newAccessPoints);
+    }
+
+    private void clearCurrentAccessPoints() {
+        for (AccessPoint accessPoint : mCurrentAccessPoints) {
+            accessPoint.setListener(null);
+        }
+        mCurrentAccessPoints.clear();
     }
 
     private boolean isCaptivePortal(AccessPoint accessPoint) {
-        if (accessPoint.getWifiEntry().getConnectedState() != WifiEntry.CONNECTED_STATE_CONNECTED) {
-            return false;
-        }
-        NetworkCapabilities nc = mConnectivityManager.getNetworkCapabilities(
-                mWifiManager.getCurrentNetwork());
-        return nc != null && nc.hasCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
+        return accessPoint.getWifiEntry().canSignIn();
     }
 
     private Intent makeNetworkDiagnosticsIntent() {
@@ -501,15 +514,15 @@
     @Override
     public void onAccessPointChanged(AccessPoint accessPoint) {
         RestrictedPreferenceAdapter<TvAccessPointPreference> restrictedPref =
-                (RestrictedPreferenceAdapter<TvAccessPointPreference>) accessPoint.getTag();
-        restrictedPref.updatePreference(pref -> pref.refresh());
+                mPrefMap.get(accessPoint.getWifiEntry());
+        restrictedPref.updatePreference(AccessPointPreference::refresh);
     }
 
     @Override
     public void onLevelChanged(AccessPoint accessPoint) {
         RestrictedPreferenceAdapter<TvAccessPointPreference> restrictedPref =
-                (RestrictedPreferenceAdapter<TvAccessPointPreference>) accessPoint.getTag();
-        restrictedPref.updatePreference(pref -> pref.onLevelChanged());
+                mPrefMap.get(accessPoint.getWifiEntry());
+        restrictedPref.updatePreference(AccessPointPreference::onLevelChanged);
     }
 
     @Override
diff --git a/Settings/src/com/android/tv/settings/connectivity/NetworkRequestDialogFragment.java b/Settings/src/com/android/tv/settings/connectivity/NetworkRequestDialogFragment.java
index aa55853..8ace395 100644
--- a/Settings/src/com/android/tv/settings/connectivity/NetworkRequestDialogFragment.java
+++ b/Settings/src/com/android/tv/settings/connectivity/NetworkRequestDialogFragment.java
@@ -201,16 +201,14 @@
             final AccessPoint selectedAccessPoint = accessPointList.get(which);
             WifiConfiguration wifiConfig = selectedAccessPoint.getConfig();
             if (wifiConfig == null) {
-                wifiConfig = WifiUtils.getWifiConfig(selectedAccessPoint, /* scanResult */
-                        null, /* password */ null);
+                wifiConfig = WifiConfigHelper.getConfiguration(
+                        selectedAccessPoint.getSsidStr(),
+                        selectedAccessPoint.getSecurity());
             }
 
-            if (wifiConfig != null) {
-                mUserSelectionCallback.select(wifiConfig);
-
-                mWaitingConnectCallback = true;
-                updateConnectButton(false);
-            }
+            mUserSelectionCallback.select(wifiConfig);
+            mWaitingConnectCallback = true;
+            updateConnectButton(false);
         }
     }
 
diff --git a/Settings/src/com/android/tv/settings/connectivity/WifiConfigHelper.java b/Settings/src/com/android/tv/settings/connectivity/WifiConfigHelper.java
index e7448cc..90bf6aa 100644
--- a/Settings/src/com/android/tv/settings/connectivity/WifiConfigHelper.java
+++ b/Settings/src/com/android/tv/settings/connectivity/WifiConfigHelper.java
@@ -35,6 +35,7 @@
 import com.android.tv.settings.library.network.AccessPoint;
 import com.android.tv.settings.R;
 import com.android.tv.settings.connectivity.util.WifiSecurityUtil;
+import com.android.wifitrackerlib.WifiEntry;
 
 import java.util.List;
 import java.util.regex.Matcher;
@@ -90,23 +91,32 @@
      */
     public static void setConfigKeyManagementBySecurity(
             WifiConfiguration config, int security) {
-        config.allowedKeyManagement.clear();
-        config.allowedAuthAlgorithms.clear();
         switch (security) {
-            case AccessPoint.SECURITY_NONE:
-                config.allowedKeyManagement.set(KeyMgmt.NONE);
+            case WifiEntry.SECURITY_NONE:
+                config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_OPEN);
                 break;
-            case AccessPoint.SECURITY_WEP:
-                config.allowedKeyManagement.set(KeyMgmt.NONE);
-                config.allowedAuthAlgorithms.set(AuthAlgorithm.OPEN);
-                config.allowedAuthAlgorithms.set(AuthAlgorithm.SHARED);
+            case WifiEntry.SECURITY_WEP:
+                config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_WEP);
                 break;
-            case AccessPoint.SECURITY_PSK:
-                config.allowedKeyManagement.set(KeyMgmt.WPA_PSK);
+            case WifiEntry.SECURITY_PSK:
+                config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_PSK);
                 break;
-            case AccessPoint.SECURITY_EAP:
-                config.allowedKeyManagement.set(KeyMgmt.WPA_EAP);
-                config.allowedKeyManagement.set(KeyMgmt.IEEE8021X);
+            case WifiEntry.SECURITY_EAP:
+                config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
+                break;
+            case WifiEntry.SECURITY_EAP_WPA3_ENTERPRISE:
+                config.setSecurityParams(
+                        WifiConfiguration.SECURITY_TYPE_EAP_WPA3_ENTERPRISE);
+                break;
+            case WifiEntry.SECURITY_EAP_SUITE_B:
+                // allowedSuiteBCiphers will be set according to certificate type
+                config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B);
+                break;
+            case WifiEntry.SECURITY_SAE:
+                config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_SAE);
+                break;
+            case WifiEntry.SECURITY_OWE:
+                config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_OWE);
                 break;
         }
     }
@@ -194,87 +204,16 @@
     }
 
     /**
-     * Did this config come out of the supplicant?  NOT "Is the config currently in the supplicant?"
-     */
-    public static boolean isNetworkSaved(WifiConfiguration config) {
-        return config != null && config.networkId > -1;
-    }
-
-    /**
      * Return the configured network that matches the ssid/security pair, or create one.
      */
-    public static WifiConfiguration getConfiguration(Context context, String ssid, int security) {
-        WifiConfiguration config = getFromConfiguredNetworks(context, ssid, security);
-
-        if (config == null) {
-            // No configured network found; populate a new one with the provided ssid / security.
-            config = new WifiConfiguration();
-            setConfigSsid(config, ssid);
-            setConfigKeyManagementBySecurity(config, security);
-        }
+    public static WifiConfiguration getConfiguration(String ssid, int security) {
+        WifiConfiguration config = new WifiConfiguration();
+        setConfigSsid(config, ssid);
+        setConfigKeyManagementBySecurity(config, security);
         return config;
     }
 
     /**
-     * Save a wifi configuration.
-     */
-    public static boolean saveConfiguration(Context context, WifiConfiguration config) {
-        if (config == null) {
-            return false;
-        }
-
-        WifiManager wifiMan = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-        int networkId = wifiMan.addNetwork(config);
-        if (networkId == -1) {
-            if (DEBUG) Log.e(TAG, "failed to add network: " + config.toString());
-            return false;
-        }
-
-        if (!wifiMan.enableNetwork(networkId, false)) {
-            if (DEBUG) Log.e(TAG, "enable network failed: " + networkId + "; " + config.toString());
-            return false;
-        }
-
-        if (!wifiMan.saveConfiguration()) {
-            if (DEBUG) Log.e(TAG, "failed to save: " + config.toString());
-            return false;
-        }
-
-        if (DEBUG) Log.d(TAG, "saved network: " + config.toString());
-        return true;
-    }
-
-    /**
-     * @return A matching WifiConfiguration from the list of configured
-     * networks, or null if no matching network is found.
-     */
-    private static WifiConfiguration getFromConfiguredNetworks(Context context,
-            String ssid,
-            int security) {
-        WifiManager wifiMan = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-        List<WifiConfiguration> configuredNetworks = wifiMan.getConfiguredNetworks();
-        if (configuredNetworks != null) {
-            for (WifiConfiguration configuredNetwork : configuredNetworks) {
-                if (configuredNetwork == null || configuredNetwork.SSID == null) {
-                    continue;  // Does this ever really happen?
-                }
-
-                // If the SSID and the security match, that's our network.
-                String configuredSsid = WifiInfo.sanitizeSsid(configuredNetwork.SSID);
-
-                if (TextUtils.equals(configuredSsid, ssid)) {
-                    int configuredSecurity = WifiSecurityUtil.getSecurity(configuredNetwork);
-                    if (configuredSecurity == security) {
-                        return configuredNetwork;
-                    }
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
      * @param context Context of caller
      * @param config  The WiFi config.
      * @return true if Settings cannot modify the config due to lockDown.
diff --git a/Settings/src/com/android/tv/settings/connectivity/WifiConnectionActivity.java b/Settings/src/com/android/tv/settings/connectivity/WifiConnectionActivity.java
index 3f4705f..2e858ea 100644
--- a/Settings/src/com/android/tv/settings/connectivity/WifiConnectionActivity.java
+++ b/Settings/src/com/android/tv/settings/connectivity/WifiConnectionActivity.java
@@ -22,7 +22,6 @@
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.util.Log;
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
@@ -31,11 +30,9 @@
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedLockUtilsInternal;
-import com.android.tv.settings.library.network.AccessPoint;
 import com.android.tv.settings.R;
 import com.android.tv.settings.connectivity.setup.AddStartState;
 import com.android.tv.settings.connectivity.setup.AdvancedWifiOptionsFlow;
-import com.android.tv.settings.connectivity.setup.CaptivePortalWaitingState;
 import com.android.tv.settings.connectivity.setup.ConnectFailedState;
 import com.android.tv.settings.connectivity.setup.ConnectState;
 import com.android.tv.settings.connectivity.setup.EnterPasswordState;
@@ -45,9 +42,10 @@
 import com.android.tv.settings.connectivity.setup.UserChoiceInfo;
 import com.android.tv.settings.connectivity.util.State;
 import com.android.tv.settings.connectivity.util.StateMachine;
-import com.android.tv.settings.connectivity.util.WifiSecurityUtil;
 import com.android.tv.settings.core.instrumentation.InstrumentedActivity;
+import com.android.tv.settings.library.network.AccessPoint;
 import com.android.tv.settings.library.util.DataBinder;
+import com.android.wifitrackerlib.WifiEntry;
 
 /**
  * Add a wifi network where we already know the ssid/security; normal post-install settings.
@@ -56,26 +54,15 @@
         State.FragmentChangeListener {
     private static final String TAG = "WifiConnectionActivity";
 
-    private static final String EXTRA_WIFI_SSID = "wifi_ssid";
-    private static final String EXTRA_WIFI_SECURITY_NAME = "wifi_security_name";
     private static final String EXTRA_WIFI_ENTRY = "wifi_entry";
 
-    public static Intent createIntent(Context context, AccessPoint result, int security) {
+    public static Intent createIntent(Context context, AccessPoint result) {
         Bundle bundle = new Bundle();
-        bundle.putString(EXTRA_WIFI_SSID, result.getSsidStr());
-        bundle.putInt(EXTRA_WIFI_SECURITY_NAME, security);
         bundle.putBinder(EXTRA_WIFI_ENTRY, DataBinder.with(result.getWifiEntry()));
         return new Intent(context, WifiConnectionActivity.class)
                 .putExtras(bundle);
     }
 
-    public static Intent createIntent(Context context, AccessPoint result) {
-        final int security = result.getSecurity();
-        return createIntent(context, result, security);
-    }
-
-    private WifiConfiguration mConfiguration;
-    private int mWifiSecurity;
     private StateMachine mStateMachine;
     private State mConnectFailureState;
     private State mConnectState;
@@ -85,7 +72,6 @@
     private State mOptionsOrConnectState;
     private State mAddStartState;
     private State mFinishState;
-    private State mCaptivePortalWaitingState;
 
     private final StateMachine.Callback mStateMachineCallback = new StateMachine.Callback() {
         @Override
@@ -98,7 +84,7 @@
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
+        NetworkChangeStateManager.getInstance().setIsNetworkStateKnown(false);
         final UserManager userManager = UserManager.get(this);
         if (userManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_WIFI)) {
             EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(this,
@@ -121,7 +107,6 @@
         mOptionsOrConnectState = new OptionsOrConnectState(this);
         mAddStartState = new AddStartState(this);
         mFinishState = new FinishState(this);
-        mCaptivePortalWaitingState = new CaptivePortalWaitingState(this);
 
         /* KnownNetwork */
         mStateMachine.addState(
@@ -168,10 +153,6 @@
                 mConnectState,
                 StateMachine.RESULT_SUCCESS,
                 mSuccessState);
-        mStateMachine.addState(
-                mConnectState,
-                StateMachine.RESULT_CAPTIVE_PORTAL,
-                mCaptivePortalWaitingState);
 
         /* Connect Failed */
         mStateMachine.addState(
@@ -185,26 +166,25 @@
                 mFinishState
         );
 
-        mWifiSecurity = getIntent().getIntExtra(EXTRA_WIFI_SECURITY_NAME, 0);
-        mConfiguration = WifiConfigHelper.getConfiguration(
-                this, getIntent().getStringExtra(EXTRA_WIFI_SSID), mWifiSecurity);
+        WifiEntry wifiEntry = DataBinder.getData(
+                getIntent().getExtras().getBinder(EXTRA_WIFI_ENTRY));
 
         AdvancedWifiOptionsFlow.createFlow(
                 this, false, true, null,
                 mOptionsOrConnectState, mConnectState, AdvancedWifiOptionsFlow.START_DEFAULT_PAGE);
         UserChoiceInfo userChoiceInfo =
                     ViewModelProviders.of(this).get(UserChoiceInfo.class);
-        userChoiceInfo.setWifiConfiguration(mConfiguration);
-        userChoiceInfo.setWifiSecurity(mWifiSecurity);
-        userChoiceInfo.setWifiEntry(DataBinder.getData(
-                getIntent().getExtras().getBinder(EXTRA_WIFI_ENTRY)));
+        userChoiceInfo.setWifiEntry(wifiEntry);
+        userChoiceInfo.setWifiConfiguration(
+                wifiEntry.isSaved()
+                ? wifiEntry.getWifiConfiguration()
+                : WifiConfigHelper.getConfiguration(wifiEntry.getSsid(),
+                        wifiEntry.getSecurity()));
+        userChoiceInfo.setWifiSecurity(wifiEntry.getSecurity());
 
-        WifiConfiguration.NetworkSelectionStatus networkStatus =
-                mConfiguration.getNetworkSelectionStatus();
-        if (networkStatus.getNetworkSelectionDisableReason()
-                == WifiConfiguration.NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD) {
+        if (wifiEntry.shouldEditBeforeConnect()) {
             mStateMachine.setStartState(mEnterPasswordState);
-        } else if (WifiConfigHelper.isNetworkSaved(mConfiguration)) {
+        } else if (wifiEntry.isSaved()) {
             mStateMachine.setStartState(mKnownNetworkState);
         } else {
             mStateMachine.setStartState(mAddStartState);
diff --git a/Settings/src/com/android/tv/settings/connectivity/WifiDetailsFragment.java b/Settings/src/com/android/tv/settings/connectivity/WifiDetailsFragment.java
index a7c8f44..12300fc 100644
--- a/Settings/src/com/android/tv/settings/connectivity/WifiDetailsFragment.java
+++ b/Settings/src/com/android/tv/settings/connectivity/WifiDetailsFragment.java
@@ -154,7 +154,8 @@
 
         final boolean active = mAccessPoint.isActive();
 
-        mConnectionStatusPref.setSummary(active ? R.string.connected : R.string.not_connected);
+        mConnectionStatusPref.setSummary(
+                WifiUtils.getConnectionStatus(mAccessPoint.getWifiEntry()));
         mIpAddressPref.setVisible(active);
         mSignalStrengthPref.setVisible(active);
 
diff --git a/Settings/src/com/android/tv/settings/connectivity/WifiUtils.java b/Settings/src/com/android/tv/settings/connectivity/WifiUtils.java
index 5dda3f5..389ef33 100644
--- a/Settings/src/com/android/tv/settings/connectivity/WifiUtils.java
+++ b/Settings/src/com/android/tv/settings/connectivity/WifiUtils.java
@@ -19,137 +19,28 @@
 import android.net.wifi.WifiConfiguration;
 import android.text.TextUtils;
 
+import androidx.annotation.StringRes;
+import com.android.tv.settings.R;
+
 import com.android.tv.settings.library.network.AccessPoint;
+import com.android.wifitrackerlib.WifiEntry;
 
 /** Helper class for Wifi configuration. */
-public class WifiUtils {
-    /**
-     * Gets security value from ScanResult.
-     *
-     * Duplicated method from {@link AccessPoint#getSecurity(ScanResult)}.
-     * TODO(b/120827021): Should be removed if the there is have a common one in shared place (e.g.
-     * SettingsLib).
-     *
-     * @param result ScanResult
-     * @return Related security value based on {@link AccessPoint}.
-     */
-    public static int getAccessPointSecurity(ScanResult result) {
-        if (result.capabilities.contains("WEP")) {
-            return AccessPoint.SECURITY_WEP;
-        } else if (result.capabilities.contains("SAE")) {
-            return AccessPoint.SECURITY_SAE;
-        } else if (result.capabilities.contains("PSK")) {
-            return AccessPoint.SECURITY_PSK;
-        } else if (result.capabilities.contains("EAP_SUITE_B_192")) {
-            return AccessPoint.SECURITY_EAP_SUITE_B;
-        } else if (result.capabilities.contains("EAP")) {
-            return AccessPoint.SECURITY_EAP;
-        } else if (result.capabilities.contains("OWE")) {
-            return AccessPoint.SECURITY_OWE;
+class WifiUtils {
+    @StringRes
+    static int getConnectionStatus(WifiEntry wifiEntry) {
+        if (wifiEntry.canSignIn()) {
+            return R.string.wifi_captive_portal;
+        } else if (wifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED) {
+            return wifiEntry.hasInternetAccess()
+                    ? R.string.connected : R.string.wifi_no_internet;
+        } else if (wifiEntry.shouldEditBeforeConnect()) {
+            return R.string.wifi_bad_password;
+        } else if (wifiEntry.isSaved()) {
+            return R.string.wifi_saved;
         }
-
-        return AccessPoint.SECURITY_NONE;
+        return R.string.not_connected;
     }
 
-    /**
-     * Provides a simple way to generate a new {@link WifiConfiguration} obj from
-     * {@link ScanResult} or {@link AccessPoint}. Either {@code accessPoint} or {@code scanResult
-     * } input should be not null for retrieving information, otherwise will throw
-     * IllegalArgumentException.
-     * This method prefers to take {@link AccessPoint} input in priority. Therefore this method
-     * will take {@link AccessPoint} input as preferred data extraction source when you input
-     * both {@link AccessPoint} and {@link ScanResult}, and ignore {@link ScanResult} input.
-     *
-     * Duplicated and simplified method from {@link WifiConfigController#getConfig()}.
-     * TODO(b/120827021): Should be removed if the there is have a common one in shared place (e.g.
-     * SettingsLib).
-     *
-     * @param accessPoint Input data for retrieving WifiConfiguration.
-     * @param scanResult  Input data for retrieving WifiConfiguration.
-     * @return WifiConfiguration obj based on input.
-     */
-    public static WifiConfiguration getWifiConfig(AccessPoint accessPoint, ScanResult scanResult,
-            String password) {
-        if (accessPoint == null && scanResult == null) {
-            throw new IllegalArgumentException(
-                    "At least one of AccessPoint and ScanResult input is required.");
-        }
-
-        final WifiConfiguration config = new WifiConfiguration();
-        final int security;
-
-        if (accessPoint == null) {
-            config.SSID = AccessPoint.convertToQuotedString(scanResult.SSID);
-            security = getAccessPointSecurity(scanResult);
-        } else {
-            if (!accessPoint.isSaved()) {
-                config.SSID = AccessPoint.convertToQuotedString(
-                        accessPoint.getSsidStr());
-            } else {
-                config.networkId = accessPoint.getConfig().networkId;
-                config.hiddenSSID = accessPoint.getConfig().hiddenSSID;
-            }
-            security = accessPoint.getSecurity();
-        }
-
-        switch (security) {
-            case AccessPoint.SECURITY_NONE:
-                config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_OPEN);
-                break;
-
-            case AccessPoint.SECURITY_WEP:
-                config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_WEP);
-                if (!TextUtils.isEmpty(password)) {
-                    int length = password.length();
-                    // WEP-40, WEP-104, and 256-bit WEP (WEP-232?)
-                    if ((length == 10 || length == 26 || length == 58)
-                            && password.matches("[0-9A-Fa-f]*")) {
-                        config.wepKeys[0] = password;
-                    } else {
-                        config.wepKeys[0] = '"' + password + '"';
-                    }
-                }
-                break;
-
-            case AccessPoint.SECURITY_PSK:
-                config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_PSK);
-                if (!TextUtils.isEmpty(password)) {
-                    if (password.matches("[0-9A-Fa-f]{64}")) {
-                        config.preSharedKey = password;
-                    } else {
-                        config.preSharedKey = '"' + password + '"';
-                    }
-                }
-                break;
-
-            case AccessPoint.SECURITY_EAP:
-            case AccessPoint.SECURITY_EAP_SUITE_B:
-                if (security == AccessPoint.SECURITY_EAP_SUITE_B) {
-                    // allowedSuiteBCiphers will be set according to certificate type
-                    config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B);
-                } else {
-                    config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
-                }
-
-                if (!TextUtils.isEmpty(password)) {
-                    config.enterpriseConfig.setPassword(password);
-                }
-                break;
-            case AccessPoint.SECURITY_SAE:
-                config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_SAE);
-                if (!TextUtils.isEmpty(password)) {
-                    config.preSharedKey = '"' + password + '"';
-                }
-                break;
-
-            case AccessPoint.SECURITY_OWE:
-                config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_OWE);
-                break;
-
-            default:
-                break;
-        }
-
-        return config;
-    }
+    private WifiUtils() {}
 }
diff --git a/Settings/src/com/android/tv/settings/connectivity/security/WifiSecurityHelper.java b/Settings/src/com/android/tv/settings/connectivity/security/WifiSecurityHelper.java
index 8065ed7..5eba177 100644
--- a/Settings/src/com/android/tv/settings/connectivity/security/WifiSecurityHelper.java
+++ b/Settings/src/com/android/tv/settings/connectivity/security/WifiSecurityHelper.java
@@ -19,25 +19,23 @@
 import android.content.Context;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
-import android.text.TextUtils;
 
 import androidx.fragment.app.FragmentActivity;
 import androidx.leanback.widget.GuidedAction;
 import androidx.lifecycle.ViewModelProviders;
 
-import com.android.tv.settings.library.network.AccessPoint;
 import com.android.tv.settings.R;
+import com.android.tv.settings.connectivity.WifiConfigHelper;
 import com.android.tv.settings.connectivity.setup.AdvancedOptionsFlowInfo;
 import com.android.tv.settings.connectivity.setup.UserChoiceInfo;
+import com.android.tv.settings.library.network.AccessPoint;
+import com.android.wifitrackerlib.WifiEntry;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /** Helper class to handle Wi-Fi security */
 public class WifiSecurityHelper {
-
-    private static final String TAG = "WifiSecurityConfigInfo";
-
     public static List<GuidedAction> getSecurityTypes(Context context) {
         WifiManager wifiManager = context.getSystemService(WifiManager.class);
         List<GuidedAction> securityTypes = new ArrayList<>();
@@ -68,16 +66,6 @@
         return securityTypes;
     }
 
-    public static List<GuidedAction> getActionsList(FragmentActivity context,
-            @UserChoiceInfo.PAGE int page) {
-        switch (page) {
-            case UserChoiceInfo.SECURITY:
-                return getSecurityTypes(context);
-            default:
-                return null;
-        }
-    }
-
     public static String getSsid(FragmentActivity context) {
         UserChoiceInfo userChoiceInfo = ViewModelProviders.of(context).get(UserChoiceInfo.class);
         String savedSsid = userChoiceInfo.getPageSummary(UserChoiceInfo.SSID);
@@ -96,64 +84,46 @@
         AdvancedOptionsFlowInfo advancedOptionsFlowInfo = ViewModelProviders.of(context).get(
                 AdvancedOptionsFlowInfo.class);
         WifiConfiguration config = userChoiceInfo.getWifiConfiguration();
-
-        if (TextUtils.isEmpty(config.SSID)) {
-            // If the user adds a network manually, assume that it is hidden.
-            config.hiddenSSID = true;
-        }
-
-        if (userChoiceInfo.getPageSummary(UserChoiceInfo.SSID) != null) {
+        String ssid = userChoiceInfo.getPageSummary(UserChoiceInfo.SSID);
+        if (ssid != null) {
             config.SSID = AccessPoint.convertToQuotedString(
                     userChoiceInfo.getPageSummary(UserChoiceInfo.SSID));
         }
-        int accessPointSecurity = getSecurity(context);
+        Integer security = userChoiceInfo.getChoice(UserChoiceInfo.SECURITY);
+        if (security != null) {
+            WifiConfigHelper.setConfigKeyManagementBySecurity(config, security);
+        }
+
         String password = userChoiceInfo.getPageSummary(UserChoiceInfo.PASSWORD);
-        int length = password != null ? password.length() : 0;
+        int passwordLength = password != null ? password.length() : 0;
 
-        switch (accessPointSecurity) {
-            case AccessPoint.SECURITY_NONE:
-                config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
-                break;
-
-            case AccessPoint.SECURITY_WEP:
-                config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
-                config.allowedAuthAlgorithms.set(WifiConfiguration.AuthAlgorithm.OPEN);
-                config.allowedAuthAlgorithms.set(WifiConfiguration.AuthAlgorithm.SHARED);
-                // WEP-40, WEP-104, and 256-bit WEP (WEP-232?)
-                if ((length == 10 || length == 26 || length == 58)
-                        && password.matches("[0-9A-Fa-f]*")) {
-                    config.wepKeys[0] = password;
-                } else if (length != 0) {
-                    config.wepKeys[0] = '"' + password + '"';
-                }
-                break;
-
-            case AccessPoint.SECURITY_PSK:
-                config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
-                if (length != 0) {
+        if (passwordLength > 0)  {
+            switch (getSecurity(context)) {
+                case WifiEntry.SECURITY_WEP:
+                    // WEP-40, WEP-104, and 256-bit WEP (WEP-232?)
+                    if ((passwordLength == 10 || passwordLength == 26 || passwordLength == 58)
+                            && password.matches("[0-9A-Fa-f]*")) {
+                        config.wepKeys[0] = password;
+                    } else {
+                        config.wepKeys[0] = '"' + password + '"';
+                    }
+                    break;
+                case WifiEntry.SECURITY_PSK:
                     if (password.matches("[0-9A-Fa-f]{64}")) {
                         config.preSharedKey = password;
                     } else {
                         config.preSharedKey = '"' + password + '"';
                     }
-                }
-                break;
-
-            case AccessPoint.SECURITY_SAE:
-                config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_SAE);
-                if (length != 0) {
+                    break;
+                case WifiEntry.SECURITY_SAE:
                     config.preSharedKey = '"' + password + '"';
-                }
-                break;
-            case AccessPoint.SECURITY_OWE:
-                config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_OWE);
-                break;
-
-            default:
-                return null;
+                    break;
+            }
         }
 
-        config.setIpConfiguration(advancedOptionsFlowInfo.getIpConfiguration());
+        if (advancedOptionsFlowInfo.getIpConfiguration() != null) {
+            config.setIpConfiguration(advancedOptionsFlowInfo.getIpConfiguration());
+        }
         return config;
     }
 }
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/CaptivePortalWaitingState.java b/Settings/src/com/android/tv/settings/connectivity/setup/CaptivePortalWaitingState.java
deleted file mode 100644
index ba3e7c1..0000000
--- a/Settings/src/com/android/tv/settings/connectivity/setup/CaptivePortalWaitingState.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-package com.android.tv.settings.connectivity.setup;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.NetworkInfo;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.ViewModelProviders;
-
-import com.android.tv.settings.connectivity.util.State;
-import com.android.tv.settings.connectivity.util.StateMachine;
-
-/**
- * State for hosting captive portal log in.
- */
-public class CaptivePortalWaitingState implements State {
-    private final FragmentActivity mActivity;
-    private Fragment mFragment;
-
-
-    public CaptivePortalWaitingState(FragmentActivity activity) {
-        mActivity = activity;
-    }
-
-    @Override
-    public void processForward() {
-        mFragment = null;
-        openCaptivePortalPage();
-        StateMachine stateMachine = ViewModelProviders.of(mActivity).get(StateMachine.class);
-        stateMachine.getListener().onComplete(StateMachine.CONTINUE);
-    }
-
-    @Override
-    public void processBackward() {
-        StateMachine stateMachine = ViewModelProviders.of(mActivity).get(StateMachine.class);
-        stateMachine.back();
-    }
-
-    private void openCaptivePortalPage() {
-        ConnectivityManager connectivityManager = (ConnectivityManager) mActivity.getSystemService(
-                Context.CONNECTIVITY_SERVICE);
-
-        Network[] networks = connectivityManager.getAllNetworks();
-
-        for (Network network : networks) {
-            NetworkInfo networkInfo = connectivityManager.getNetworkInfo(network);
-            if (networkInfo.isConnected()
-                    && networkInfo.getType() == ConnectivityManager.TYPE_WIFI) {
-                connectivityManager.startCaptivePortalApp(network);
-                return;
-            }
-        }
-    }
-
-    @Override
-    public Fragment getFragment() {
-        return mFragment;
-    }
-}
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/ConnectFailedState.java b/Settings/src/com/android/tv/settings/connectivity/setup/ConnectFailedState.java
index 0ff4308..93c9284 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/ConnectFailedState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/ConnectFailedState.java
@@ -27,6 +27,7 @@
 import androidx.lifecycle.ViewModelProviders;
 
 import com.android.tv.settings.R;
+import com.android.tv.settings.connectivity.NetworkChangeStateManager;
 import com.android.tv.settings.connectivity.util.State;
 import com.android.tv.settings.connectivity.util.StateMachine;
 
@@ -48,6 +49,8 @@
         mFragment = new ConnectFailedFragment();
         FragmentChangeListener listener = (FragmentChangeListener) mActivity;
         if (listener != null) {
+            NetworkChangeStateManager manager = NetworkChangeStateManager.getInstance();
+            manager.setIsNetworkStateKnown(false);
             listener.onFragmentChange(mFragment, true);
         }
     }
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/ConnectState.java b/Settings/src/com/android/tv/settings/connectivity/setup/ConnectState.java
index 1959d3e..d9eed95 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/ConnectState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/ConnectState.java
@@ -16,20 +16,22 @@
 
 package com.android.tv.settings.connectivity.setup;
 
+import static android.net.wifi.WifiConfiguration.NetworkSelectionStatus.DISABLED_AUTHENTICATION_FAILURE;
+import static android.net.wifi.WifiConfiguration.NetworkSelectionStatus.DISABLED_AUTHENTICATION_NO_CREDENTIALS;
+import static android.net.wifi.WifiConfiguration.NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD;
 import static android.net.wifi.WifiConfiguration.NetworkSelectionStatus.NETWORK_SELECTION_ENABLED;
+import static com.android.wifitrackerlib.WifiEntry.ConnectCallback.CONNECT_STATUS_SUCCESS;
 
 import android.annotation.Nullable;
 import android.content.Context;
 import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
 import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiConfiguration.NetworkSelectionStatus;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -41,15 +43,15 @@
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.ViewModelProviders;
 
-import com.android.tv.settings.library.network.AccessPoint;
 import com.android.tv.settings.R;
 import com.android.tv.settings.connectivity.ConnectivityListener;
 import com.android.tv.settings.connectivity.security.WifiSecurityHelper;
 import com.android.tv.settings.connectivity.util.State;
 import com.android.tv.settings.connectivity.util.StateMachine;
+import com.android.tv.settings.library.network.AccessPoint;
+import com.android.wifitrackerlib.WifiEntry;
 
 import java.lang.ref.WeakReference;
-import java.util.List;
 
 /**
  * State responsible for showing the connect page.
@@ -105,6 +107,10 @@
         private ConnectivityListener mConnectivityListener;
         private ConnectivityManager mConnectivityManager;
         private UserChoiceInfo mUserChoiceInfo;
+        private boolean mStartedConnect;
+        private boolean mConnectSucceeded;
+        private boolean mStartedSave;
+        private boolean mSaveComplete;
 
         /**
          * Obtain a new instance of ConnectToWifiFragment.
@@ -114,7 +120,7 @@
          * @return new instance.
          */
         public static ConnectToWifiFragment newInstance(String title,
-                boolean showProgressIndicator) {
+                                                        boolean showProgressIndicator) {
             ConnectToWifiFragment fragment = new ConnectToWifiFragment();
             Bundle args = new Bundle();
             addArguments(args, title, showProgressIndicator);
@@ -149,6 +155,8 @@
             ((TextView) view.findViewById(R.id.status_text)).setText(
                     getContext().getString(R.string.wifi_connecting,
                             WifiSecurityHelper.getSsid(getActivity())));
+            mSaveComplete = !needsSave();
+            proceedDependOnNetworkState();
             return view;
         }
 
@@ -156,86 +164,129 @@
         public void onResume() {
             super.onResume();
             postTimeout();
-            proceedDependOnNetworkState();
+        }
+
+        @Override
+        public void onPause() {
+            super.onPause();
+            mHandler.removeMessages(MSG_TIMEOUT);
         }
 
         @VisibleForTesting
         void proceedDependOnNetworkState() {
-            if (isNetworkConnected()) {
-                mWifiManager.disconnect();
+            if (mStartedConnect) {
+                return;
             }
 
             int easyConnectNetworkId = mUserChoiceInfo.getEasyConnectNetworkId();
             if (easyConnectNetworkId != -1) {
                 if (DEBUG) Log.d(TAG, "Starting to connect via EasyConnect");
-
-                mWifiManager.connect(easyConnectNetworkId, new WifiManager.ActionListener() {
-                    @Override
-                    public void onSuccess() {
-                        if (DEBUG) Log.d(TAG, "EasyConnect: onSuccess");
-                    }
-
-                    @Override
-                    public void onFailure(int reason) {
-                        if (DEBUG) Log.d(TAG, "EasyConnect: onFailure, reason = " + reason);
-                    }
-                });
+                WifiEntry wifiEntry = getEntryForNetworkId(easyConnectNetworkId);
+                if (wifiEntry != null) {
+                    startConnect(wifiEntry);
+                }
+            } else if (!mSaveComplete) {
+                startSave();
             } else {
-                mWifiManager.addNetwork(mWifiConfiguration);
-                mWifiManager.connect(mWifiConfiguration, null);
+                WifiEntry wifiEntry = getEntryForConfiguration();
+                if (wifiEntry != null) {
+                    startConnect(wifiEntry);
+                }
             }
         }
 
         @Override
         public void onDestroy() {
-            if (!isNetworkConnected()) {
+            if (!mConnectSucceeded) {
                 mWifiManager.disconnect();
             }
 
-            mHandler.removeMessages(MSG_TIMEOUT);
             super.onDestroy();
         }
 
         @Override
         public void onWifiListChanged() {
-            List<AccessPoint> accessPointList = mConnectivityListener.getAvailableNetworks();
-            if (accessPointList != null) {
-                for (AccessPoint accessPoint : accessPointList) {
-                    if (accessPoint != null && AccessPoint.convertToQuotedString(
-                            accessPoint.getSsidStr()).equals(mWifiConfiguration.SSID)) {
-                        inferConnectionStatus(accessPoint);
-                    }
-                }
-            }
+            proceedDependOnNetworkState();
         }
 
-        private void inferConnectionStatus(AccessPoint accessPoint) {
-            WifiConfiguration configuration = accessPoint.getConfig();
-            if (configuration == null) {
+        @Nullable
+        private WifiEntry getEntryForNetworkId(int networkId) {
+            WifiEntry result = null;
+            for (AccessPoint accessPoint : mConnectivityListener.getAvailableNetworks()) {
+                if (accessPoint.getConfig() != null
+                        && accessPoint.getConfig().networkId == networkId) {
+                    result = accessPoint.getWifiEntry();
+                } else if (accessPoint.getWifiEntry().canDisconnect()) {
+                    accessPoint.getWifiEntry().disconnect(null);
+                }
+            }
+            return result;
+        }
+
+        @Nullable
+        private WifiEntry getEntryForConfiguration() {
+            WifiEntry result = null;
+            for (AccessPoint accessPoint : mConnectivityListener.getAvailableNetworks()) {
+                if (AccessPoint.convertToQuotedString(accessPoint.getSsidStr())
+                        .equals(mWifiConfiguration.SSID)
+                        && accessPoint.getWifiEntry().getSecurityTypes()
+                        .contains(WifiSecurityHelper.getSecurity(getActivity()))) {
+                    result = accessPoint.getWifiEntry();
+                } else if (accessPoint.getWifiEntry().canDisconnect()) {
+                    accessPoint.getWifiEntry().disconnect(null);
+                }
+            }
+            return result;
+        }
+
+        private void startConnect(WifiEntry wifiEntry) {
+            mStartedConnect = true;
+
+            if (wifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED) {
+                notifyListener(StateMachine.RESULT_SUCCESS);
                 return;
             }
-            if (configuration.getNetworkSelectionStatus().getNetworkSelectionStatus()
-                    == NETWORK_SELECTION_ENABLED) {
-                NetworkCapabilities wifiNetworkCapabilities = getActiveWifiNetworkCapabilities();
-                if (wifiNetworkCapabilities != null) {
-                    if (wifiNetworkCapabilities.hasCapability(
-                            NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL)) {
-                        notifyListener(StateMachine.RESULT_CAPTIVE_PORTAL);
-                    } else if (wifiNetworkCapabilities.hasCapability(
-                            NetworkCapabilities.NET_CAPABILITY_VALIDATED) ||
-                        wifiNetworkCapabilities.hasCapability(
-                            NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
-                        notifyListener(StateMachine.RESULT_SUCCESS);
+
+            wifiEntry.connect(status -> {
+                if (status == CONNECT_STATUS_SUCCESS) {
+                    mConnectSucceeded = true;
+                    notifyListener(StateMachine.RESULT_SUCCESS);
+                    return;
+                }
+
+                // Diagnose failure based on current WifiConfiguration.
+                WifiConfiguration configuration = null;
+                for (WifiConfiguration config : mWifiManager.getConfiguredNetworks()) {
+                    if (config.networkId == wifiEntry.getWifiConfiguration().networkId) {
+                        configuration = config;
+                        break;
                     }
                 }
-            } else {
-                switch (configuration.getNetworkSelectionStatus()
-                        .getNetworkSelectionDisableReason()) {
-                    case WifiConfiguration.NetworkSelectionStatus.DISABLED_AUTHENTICATION_FAILURE:
-                    case WifiConfiguration.NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD:
+
+                if (configuration == null) {
+                    notifyListener(StateMachine.RESULT_UNKNOWN_ERROR);
+                    return;
+                }
+
+                NetworkSelectionStatus networkSelectionStatus =
+                        configuration.getNetworkSelectionStatus();
+                if (networkSelectionStatus.getNetworkSelectionStatus() != NETWORK_SELECTION_ENABLED
+                        || !networkSelectionStatus.hasEverConnected()) {
+                    if (networkSelectionStatus.getDisableReasonCounter(
+                            DISABLED_AUTHENTICATION_FAILURE) > 0
+                            || networkSelectionStatus.getDisableReasonCounter(
+                            DISABLED_BY_WRONG_PASSWORD) > 0
+                            || networkSelectionStatus.getDisableReasonCounter(
+                            DISABLED_AUTHENTICATION_NO_CREDENTIALS) > 0) {
                         mUserChoiceInfo.setConnectionFailedStatus(
                                 UserChoiceInfo.ConnectionFailedStatus.AUTHENTICATION);
-                        break;
+                        notifyListener(StateMachine.RESULT_FAILURE);
+                        return;
+                    }
+                }
+
+                switch (configuration.getNetworkSelectionStatus()
+                        .getNetworkSelectionDisableReason()) {
                     case WifiConfiguration.NetworkSelectionStatus.DISABLED_ASSOCIATION_REJECTION:
                         mUserChoiceInfo.setConnectionFailedStatus(
                                 UserChoiceInfo.ConnectionFailedStatus.REJECTED);
@@ -248,8 +299,33 @@
                                 UserChoiceInfo.ConnectionFailedStatus.UNKNOWN);
                 }
                 notifyListener(StateMachine.RESULT_FAILURE);
-                accessPoint.clearConfig();
+            });
+        }
+
+        private void startSave() {
+            if (mStartedSave) {
+                return;
             }
+            mStartedSave = true;
+            mWifiManager.save(mWifiConfiguration, new WifiManager.ActionListener() {
+                @Override
+                public void onSuccess() {
+                    mSaveComplete = true;
+                    proceedDependOnNetworkState();
+                }
+
+                @Override
+                public void onFailure(int status) {
+                    notifyListener(StateMachine.RESULT_UNKNOWN_ERROR);
+                }
+            });
+        }
+
+
+        private boolean needsSave() {
+            WifiEntry wifiEntry = mUserChoiceInfo.getWifiEntry();
+            return wifiEntry == null || wifiEntry.getWifiConfiguration() == null
+                    || !TextUtils.isEmpty(mUserChoiceInfo.getPageSummary(UserChoiceInfo.PASSWORD));
         }
 
         private void notifyListener(int result) {
@@ -258,54 +334,8 @@
             }
         }
 
-        @Nullable
-        private NetworkCapabilities getActiveWifiNetworkCapabilities() {
-            Network[] networks = mConnectivityManager.getAllNetworks();
-
-            for (Network network : networks) {
-                NetworkInfo networkInfo = mConnectivityManager.getNetworkInfo(network);
-                if (networkInfo.isConnected()
-                        && networkInfo.getType() == ConnectivityManager.TYPE_WIFI) {
-                    return mConnectivityManager.getNetworkCapabilities(network);
-                }
-            }
-            return null;
-        }
-
-        private NetworkInfo getActiveWifiNetworkInfo() {
-            Network[] networks = mConnectivityManager.getAllNetworks();
-
-            for (Network network : networks) {
-                NetworkInfo networkInfo = mConnectivityManager.getNetworkInfo(network);
-                if (networkInfo.isConnected()
-                        && networkInfo.getType() == ConnectivityManager.TYPE_WIFI) {
-                    return networkInfo;
-                }
-            }
-            return null;
-        }
-
         private boolean isNetworkConnected() {
-            NetworkInfo netInfo = getActiveWifiNetworkInfo();
-            if (netInfo == null) {
-                if (DEBUG) Log.d(TAG, "NetworkInfo is null; network is not connected");
-                return false;
-            }
-
-            if (DEBUG) Log.d(TAG, "NetworkInfo: " + netInfo.toString());
-            if (netInfo.isConnected() && netInfo.getType() == ConnectivityManager.TYPE_WIFI) {
-                WifiInfo currentConnection = mWifiManager.getConnectionInfo();
-                if (DEBUG) {
-                    Log.d(TAG, "Connected to "
-                            + ((currentConnection == null)
-                            ? "nothing" : currentConnection.getSSID()));
-                }
-                return currentConnection != null
-                        && currentConnection.getSSID().equals(mWifiConfiguration.SSID);
-            } else {
-                if (DEBUG) Log.d(TAG, "Network is not connected");
-            }
-            return false;
+            return mConnectSucceeded;
         }
 
         private void postTimeout() {
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/EnterPasswordState.java b/Settings/src/com/android/tv/settings/connectivity/setup/EnterPasswordState.java
index 481d09b..34de45a 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/EnterPasswordState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/EnterPasswordState.java
@@ -16,6 +16,7 @@
 
 package com.android.tv.settings.connectivity.setup;
 
+import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.text.InputType;
@@ -30,6 +31,7 @@
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
@@ -188,7 +190,7 @@
 
         @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
+                                 Bundle savedInstanceState) {
             View view = super.onCreateView(inflater, container, savedInstanceState);
 
             // Update guidance to contain subtitle with action done icon
@@ -249,6 +251,12 @@
                     mUserChoiceInfo.put(UserChoiceInfo.PASSWORD, action.getTitle().toString());
                     mUserChoiceInfo.setPasswordHidden(mCheckBox.isChecked());
                     mStateMachine.getListener().onComplete(StateMachine.OPTIONS_OR_CONNECT);
+                } else {
+                    final Activity activity = getActivity();
+                    if (activity != null) {
+                        Toast.makeText(activity, R.string.wifi_short_password,
+                                Toast.LENGTH_SHORT).show();
+                    }
                 }
             }
             return action.getId();
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/KnownNetworkState.java b/Settings/src/com/android/tv/settings/connectivity/setup/KnownNetworkState.java
index bca7de6..a512036 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/KnownNetworkState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/KnownNetworkState.java
@@ -30,6 +30,7 @@
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.tv.settings.R;
+import com.android.tv.settings.connectivity.NetworkChangeStateManager;
 import com.android.tv.settings.connectivity.WifiConfigHelper;
 import com.android.tv.settings.connectivity.util.State;
 import com.android.tv.settings.connectivity.util.StateMachine;
@@ -53,6 +54,7 @@
         FragmentChangeListener listener = (FragmentChangeListener) mActivity;
         if (listener != null) {
             listener.onFragmentChange(mFragment, true);
+            NetworkChangeStateManager.getInstance().setIsNetworkStateKnown(true);
         }
     }
 
@@ -129,6 +131,7 @@
                     int networkId = mUserChoiceInfo.getWifiConfiguration().networkId;
                     ((WifiManager) getActivity().getApplicationContext().getSystemService(
                             Context.WIFI_SERVICE)).forget(networkId, null);
+                    NetworkChangeStateManager.getInstance().setIsNetworkStateKnown(false);
                 } else {
                     EnforcedAdmin admin = RestrictedLockUtils.getProfileOrDeviceOwner(getActivity(),
                             UserHandle.of(UserHandle.myUserId()));
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/SuccessState.java b/Settings/src/com/android/tv/settings/connectivity/setup/SuccessState.java
index ae6c568..1aaccfe 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/SuccessState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/SuccessState.java
@@ -17,6 +17,8 @@
 package com.android.tv.settings.connectivity.setup;
 
 import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -26,6 +28,8 @@
 import androidx.lifecycle.ViewModelProviders;
 
 import com.android.tv.settings.R;
+import com.android.tv.settings.connectivity.NetworkChangeDetectionConfigs;
+import com.android.tv.settings.connectivity.NetworkChangeStateManager;
 import com.android.tv.settings.connectivity.util.State;
 import com.android.tv.settings.connectivity.util.StateMachine;
 
@@ -34,10 +38,14 @@
  */
 public class SuccessState implements State {
     private final FragmentActivity mActivity;
+    private final SharedPreferences sharedPref;
+    private SharedPreferences.Editor mEditor;
     private Fragment mFragment;
 
     public SuccessState(FragmentActivity activity) {
         mActivity = activity;
+        sharedPref = mActivity.getApplicationContext().getSharedPreferences(
+                NetworkChangeDetectionConfigs.SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
     }
 
     @Override
@@ -46,6 +54,21 @@
                 mActivity.getString(R.string.wifi_setup_connection_success));
         FragmentChangeListener listener = (FragmentChangeListener) mActivity;
         if (listener != null) {
+            NetworkChangeStateManager manager = NetworkChangeStateManager.getInstance();
+            if (!manager.getIsNetworkStateKnown()) {
+                int currentNetworkCount = sharedPref.getInt(
+                        NetworkChangeDetectionConfigs.PREFERENCE_KEY, 0);
+                mEditor = sharedPref.edit();
+                mEditor.putInt(NetworkChangeDetectionConfigs.PREFERENCE_KEY,
+                        currentNetworkCount + 1);
+                mEditor.commit();
+
+                // Notify NetworkChange observers of change to the sharedpreferences data.
+                mActivity.getApplicationContext().getContentResolver().notifyChange(
+                        NetworkChangeDetectionConfigs.CONTENT_URI, null);
+            }
+
+            manager.setIsNetworkStateKnown(false);
             listener.onFragmentChange(mFragment, true);
         }
     }
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/UserChoiceInfo.java b/Settings/src/com/android/tv/settings/connectivity/setup/UserChoiceInfo.java
index 5cac0ca..3987b52 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/UserChoiceInfo.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/UserChoiceInfo.java
@@ -51,7 +51,6 @@
     private HashMap<Integer, Integer> mChoiceSummary = new HashMap<>();
     private WifiConfiguration mWifiConfiguration = new WifiConfiguration();
     private int mWifiSecurity;
-    private ScanResult mChosenNetwork;
     private String mConnectedNetwork;
     private boolean mIsPasswordHidden = true;
     private ConnectionFailedStatus mConnectionFailedStatus;
@@ -118,16 +117,6 @@
     /**
      * Get {@link ScanResult} of the chosen network.
      */
-    public ScanResult getChosenNetwork() {
-        return mChosenNetwork;
-    }
-
-    /**
-     * Set {@link ScanResult} of the chosen network.
-     */
-    public void setChosenNetwork(ScanResult result) {
-        mChosenNetwork = result;
-    }
 
     /**
      * Get {@link WifiConfiguration}
@@ -220,8 +209,6 @@
         mDataSummary = new HashMap<>();
         mWifiConfiguration = new WifiConfiguration();
         mWifiSecurity = 0;
-        mChosenNetwork = null;
-        mChosenNetwork = null;
         mIsPasswordHidden = true;
     }
 
diff --git a/Settings/src/com/android/tv/settings/device/displaysound/HdrFormatPreferenceController.java b/Settings/src/com/android/tv/settings/device/displaysound/HdrFormatPreferenceController.java
index e244de7..535b520 100644
--- a/Settings/src/com/android/tv/settings/device/displaysound/HdrFormatPreferenceController.java
+++ b/Settings/src/com/android/tv/settings/device/displaysound/HdrFormatPreferenceController.java
@@ -110,6 +110,7 @@
     private void onPreferenceClicked(SwitchPreference preference) {
         final boolean enabled = preference.isChecked();
 
+        boolean resetHdrConversion = false;
         if (enabled) {
             Display display = mDisplayManager.getDisplay(Display.DEFAULT_DISPLAY);
             if (mHdrType == HDR_TYPE_DOLBY_VISION
@@ -118,21 +119,29 @@
             } else {
                 enableHdrType(mDisplayManager, mHdrType);
             }
+            // If using SYSTEM conversion, the system may prefer the newly enabled type
+            if (mDisplayManager.getHdrConversionMode().getConversionMode()
+                    == HdrConversionMode.HDR_CONVERSION_SYSTEM) {
+                resetHdrConversion = true;
+            }
         } else {
             disableHdrType(mDisplayManager, mHdrType);
-            // If HDR output type is mHdrType, change the HDR output type. This can happen in 2
-            // cases:
-            // mHdrType is selected by implementation in case of AUTO - re-calling
-            // setHdrConversionMode will handle this as mHdrType is no longer permissible coz of
-            // setUserDisabledHdrTypes
-            // mHdrType is selected by user by using FORCE. Change the preferred strategy to AUTO
-            // and mHdrType is no longer permissible coz of setUserDisabledHdrTypes
-            if (mDisplayManager.getHdrConversionMode().getPreferredHdrOutputType()
-                    == mHdrType) {
-                mDisplayManager.setHdrConversionMode(
-                        new HdrConversionMode(HdrConversionMode.HDR_CONVERSION_SYSTEM));
+            // If the disabled HDR type is mHdrType, the current HDR output type, then the HDR
+            // conversion settings must be updated. This can happen in 2 cases:
+            //   1. mHdrType was selected by the OEM implementation of SYSTEM conversion (default)
+            //   2. mHdrType was selected by the user via FORCE
+            // Setting the HdrConversionMode to SYSTEM will handle both cases. The type is no longer
+            // allowed due to disableHdrType's call to setUserDisabledHdrTypes and SYSTEM conversion
+            // will choose an output type that is still allowed.
+            if (mDisplayManager.getHdrConversionMode().getPreferredHdrOutputType() == mHdrType) {
+                resetHdrConversion = true;
             }
         }
+
+        if (resetHdrConversion) {
+            mDisplayManager.setHdrConversionMode(
+                    new HdrConversionMode(HdrConversionMode.HDR_CONVERSION_SYSTEM));
+        }
     }
 
     private void enableDvAndChangeTo1080p60(Display display, SwitchPreference preference) {
diff --git a/Settings/src/com/android/tv/settings/device/displaysound/PreferredDynamicRangeFragment.java b/Settings/src/com/android/tv/settings/device/displaysound/PreferredDynamicRangeFragment.java
index 18e4685..c41c8ae 100644
--- a/Settings/src/com/android/tv/settings/device/displaysound/PreferredDynamicRangeFragment.java
+++ b/Settings/src/com/android/tv/settings/device/displaysound/PreferredDynamicRangeFragment.java
@@ -191,7 +191,7 @@
 
     static void selectForceHdrConversion(DisplayManager displayManager) {
         Display display = displayManager.getDisplay(Display.DEFAULT_DISPLAY);
-        int systemPreferredType = displayManager.getHdrConversionModeSetting()
+        int systemPreferredType = displayManager.getHdrConversionMode()
                 .getPreferredHdrOutputType();
         if (!isHdrFormatSupported(display.getMode(), systemPreferredType)) {
             displayManager.setHdrConversionMode(
diff --git a/Settings/src/com/android/tv/settings/device/eco/EnergyModesFragment.java b/Settings/src/com/android/tv/settings/device/eco/EnergyModesFragment.java
index c645b3b..5798e6a 100644
--- a/Settings/src/com/android/tv/settings/device/eco/EnergyModesFragment.java
+++ b/Settings/src/com/android/tv/settings/device/eco/EnergyModesFragment.java
@@ -178,19 +178,10 @@
 
             infoTitle.setText(mode.titleRes);
             infoSummary.setText(energyModesHelper.getSummary(mode));
-
-            boolean hasEcoHint = !TextUtils.isEmpty(getString(mode.ecoHintRes));
-            boolean hasEcoHintIcon = hasEcoHint && mode.ecoHintIconRes != 0;
-            ecoHint.setVisibility(hasEcoHint ? View.VISIBLE : View.GONE);
-            ecoHintIcon.setVisibility(hasEcoHintIcon ? View.VISIBLE : View.GONE);
-            ecoHint.setText(mode.ecoHintRes);
-            ecoHintIcon.setImageResource(mode.ecoHintIconRes);
-
-            if (mode.ecoHighlighted) {
-                titleIcon.setImageResource(R.drawable.ic_eco_leaf);
-            } else {
-                titleIcon.setImageResource(R.drawable.ic_info_outline_base);
-            }
+            //TODO(b/321811441): Hide hints until final copy is ready, if not we can remove views.
+            ecoHint.setVisibility(View.GONE);
+            ecoHintIcon.setVisibility(View.GONE);
+            titleIcon.setImageResource(mode.iconRes);
 
             return view;
         }
diff --git a/Settings/src/com/android/tv/settings/device/eco/EnergyModesHelper.java b/Settings/src/com/android/tv/settings/device/eco/EnergyModesHelper.java
index 7e00afc..b5a605a 100644
--- a/Settings/src/com/android/tv/settings/device/eco/EnergyModesHelper.java
+++ b/Settings/src/com/android/tv/settings/device/eco/EnergyModesHelper.java
@@ -33,6 +33,7 @@
 import android.util.ArraySet;
 
 import com.android.tv.settings.R;
+import com.android.tv.settings.overlay.FlavorUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -94,13 +95,6 @@
         @Nullable
         public final EnergyMode baseMode;
 
-        /**
-         * ResId of String added to the top of the feature list shown in the UI to indicate
-         * accumulated features from the base mode (eg. "All essential features").
-         */
-        @StringRes
-        public final int baseModeFeaturesRes;
-
         public EnergyMode(@StringRes int identifierRes, boolean ecoHighlighted,
                 boolean enableLowPowerStandby, @BoolRes int enabledRes, @StringRes int titleRes,
                 @StringRes int subtitleRes, int colorRes, @DrawableRes int iconRes,
@@ -108,8 +102,7 @@
                 @DrawableRes int ecoHintIconRes, @ArrayRes int baseExemptPackagesRes,
                 @ArrayRes int vendorExemptPackagesRes, @IntegerRes int baseAllowedReasonsRes,
                 @IntegerRes int vendorAllowedReasonsRes, @ArrayRes int baseAllowedFeaturesRes,
-                @ArrayRes int vendorAllowedFeaturesRes, @Nullable EnergyMode baseMode,
-                @StringRes int baseModeFeaturesRes) {
+                @ArrayRes int vendorAllowedFeaturesRes, @Nullable EnergyMode baseMode) {
             this.ecoHighlighted = ecoHighlighted;
             this.enableLowPowerStandby = enableLowPowerStandby;
             this.enabledRes = enabledRes;
@@ -129,7 +122,6 @@
             this.baseAllowedFeaturesRes = baseAllowedFeaturesRes;
             this.vendorAllowedFeaturesRes = vendorAllowedFeaturesRes;
             this.baseMode = baseMode;
-            this.baseModeFeaturesRes = baseModeFeaturesRes;
         }
     }
 
@@ -152,7 +144,7 @@
             R.integer.energy_mode_low_vendorAllowedReasons,
             R.array.energy_mode_low_baseAllowedFeatures,
             R.array.energy_mode_low_vendorAllowedFeatures,
-            /* baseMode= */ null, /* baseModeFeaturesRes= */ 0);
+            /* baseMode= */ null);
 
     public static EnergyMode MODE_MODERATE_ENERGY = new EnergyMode(
             R.string.energy_mode_moderate_identifier,
@@ -173,8 +165,7 @@
             R.integer.energy_mode_moderate_vendorAllowedReasons,
             R.array.energy_mode_moderate_baseAllowedFeatures,
             R.array.energy_mode_moderate_vendorAllowedFeatures,
-            MODE_LOW_ENERGY,
-            R.string.energy_mode_moderate_all_low_features);
+            MODE_LOW_ENERGY);
 
     public static EnergyMode MODE_HIGH_ENERGY = new EnergyMode(
             R.string.energy_mode_high_identifier,
@@ -195,8 +186,7 @@
             R.integer.energy_mode_high_vendorAllowedReasons,
             R.array.energy_mode_high_baseAllowedFeatures,
             R.array.energy_mode_high_vendorAllowedFeatures,
-            MODE_MODERATE_ENERGY,
-            R.string.energy_mode_moderate_all_moderate_features);
+            MODE_MODERATE_ENERGY);
 
     public static EnergyMode MODE_UNRESTRICTED = new EnergyMode(
             R.string.energy_mode_unrestricted_identifier,
@@ -211,8 +201,7 @@
             R.array.energy_mode_high_features,
             R.string.energy_mode_high_eco_hint,
             R.drawable.ic_bolt,
-            0, 0, 0, 0, 0, 0, null,
-            R.string.energy_mode_moderate_all_moderate_features);
+            0, 0, 0, 0, 0, 0, null);
 
     public static EnergyMode[] ENERGY_MODES = new EnergyMode[] {
             MODE_LOW_ENERGY, MODE_MODERATE_ENERGY, MODE_HIGH_ENERGY, MODE_UNRESTRICTED };
@@ -227,6 +216,10 @@
      * If false, energy modes are not supported.
      */
     public static boolean isLowPowerStandbySupported(Context context) {
+        if (FlavorUtils.getFeatureFactory(context).getBasicModeFeatureProvider()
+                .isBasicMode(context)) {
+            return false; // Basic mode does no background processing during standby.
+        }
         final PowerManager powerManager = context.getSystemService(PowerManager.class);
         return powerManager.isLowPowerStandbySupported();
     }
@@ -336,15 +329,6 @@
 
         StringBuilder featureList = new StringBuilder();
 
-        if (mode.baseModeFeaturesRes != 0) {
-            final String baseModeFeatures = mContext.getString(mode.baseModeFeaturesRes);
-            if (!TextUtils.isEmpty(baseModeFeatures)) {
-                featureList.append(LIST_ITEM_BULLET);
-                featureList.append(baseModeFeatures);
-                featureList.append("\n");
-            }
-        }
-
         for (int i = 0; i < features.length; i++) {
             featureList.append(LIST_ITEM_BULLET);
             featureList.append(features[i]);
diff --git a/Settings/src/com/android/tv/settings/privacy/SensorFragment.java b/Settings/src/com/android/tv/settings/privacy/SensorFragment.java
index 4c1fdba..064930d 100644
--- a/Settings/src/com/android/tv/settings/privacy/SensorFragment.java
+++ b/Settings/src/com/android/tv/settings/privacy/SensorFragment.java
@@ -89,8 +89,6 @@
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        mSensorPrivacyManager.addSensorPrivacyListener(mToggle.sensor,
-                mPrivacyChangedListener);
         updateSensorPrivacyState();
     }
 
@@ -111,6 +109,19 @@
         setPreferenceScreen(screen);
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        mSensorPrivacyManager.addSensorPrivacyListener(mToggle.sensor,
+                mPrivacyChangedListener);
+    }
+
+    @Override
+    public void onStop() {
+        mSensorPrivacyManager.removeSensorPrivacyListener(mToggle.sensor, mPrivacyChangedListener);
+        super.onStop();
+    }
+
     protected void addHardwareToggle(PreferenceScreen screen, Context themedContext) {
         // no-op
     }
@@ -275,12 +286,6 @@
     }
 
     @Override
-    public void onDestroyView() {
-        mSensorPrivacyManager.removeSensorPrivacyListener(mToggle.sensor, mPrivacyChangedListener);
-        super.onDestroyView();
-    }
-
-    @Override
     public boolean onPreferenceTreeClick(Preference preference) {
         if (SENSOR_TOGGLE_KEY.equals(preference.getKey())) {
             boolean physicalPrivacyEnabled = mSensorPrivacyManager.isSensorPrivacyEnabled(
diff --git a/Settings/src/com/android/tv/settings/system/TextToSpeechFragment.java b/Settings/src/com/android/tv/settings/system/TextToSpeechFragment.java
index 066a98f..1e5260c 100644
--- a/Settings/src/com/android/tv/settings/system/TextToSpeechFragment.java
+++ b/Settings/src/com/android/tv/settings/system/TextToSpeechFragment.java
@@ -39,6 +39,7 @@
 
 import com.android.tv.settings.R;
 import com.android.tv.settings.SettingsPreferenceFragment;
+import com.android.tv.twopanelsettings.TwoPanelSettingsFragment;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -54,7 +55,8 @@
 @Keep
 public class TextToSpeechFragment extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener,
-        TtsEnginePreference.RadioButtonGroupState {
+        TtsEnginePreference.RadioButtonGroupState,
+        TwoPanelSettingsFragment.NavigationCallback {
     private static final String TAG = "TextToSpeechSettings";
     private static final boolean DBG = false;
 
@@ -148,6 +150,20 @@
         }
     };
 
+    private final UtteranceProgressListener mUtteranceProgressListener =
+            new UtteranceProgressListener() {
+        @Override
+        public void onStart(String utteranceId) {}
+
+        @Override
+        public void onDone(String utteranceId) {}
+
+        @Override
+        public void onError(String utteranceId) {
+            Log.e(TAG, "Error while trying to synthesize sample text");
+        }
+    };
+
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.tts_settings);
@@ -175,11 +191,16 @@
         mTts = new TextToSpeech(getActivity().getApplicationContext(), mInitListener);
         mEnginesHelper = new TtsEngines(getActivity().getApplicationContext());
 
-        setTtsUtteranceProgressListener();
         initSettings();
     }
 
     @Override
+    public void onStart() {
+        super.onStart();
+        setTtsUtteranceProgressListener();
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
 
@@ -193,22 +214,10 @@
         }
     }
 
-    private void setTtsUtteranceProgressListener() {
-        if (mTts == null) {
-            return;
-        }
-        mTts.setOnUtteranceProgressListener(new UtteranceProgressListener() {
-            @Override
-            public void onStart(String utteranceId) {}
-
-            @Override
-            public void onDone(String utteranceId) {}
-
-            @Override
-            public void onError(String utteranceId) {
-                Log.e(TAG, "Error while trying to synthesize sample text");
-            }
-        });
+    @Override
+    public void onStop() {
+        mTts.setOnUtteranceProgressListener(null);
+        super.onStop();
     }
 
     @Override
@@ -220,6 +229,13 @@
         }
     }
 
+    private void setTtsUtteranceProgressListener() {
+        if (mTts == null) {
+            return;
+        }
+        mTts.setOnUtteranceProgressListener(mUtteranceProgressListener);
+    }
+
     private void initSettings() {
         final ContentResolver resolver = getActivity().getContentResolver();
 
@@ -246,9 +262,26 @@
             mEnginePreferenceCategory.addPreference(enginePref);
         }
 
+        if (!(getCallbackFragment() instanceof TwoPanelSettingsFragment)) {
+            checkVoiceData(mCurrentEngine);
+        }
+    }
+
+    @Override
+    public void onNavigateToPreview() {
         checkVoiceData(mCurrentEngine);
     }
 
+    @Override
+    public void onNavigateBack() {
+        // Do nothing.
+    }
+
+    @Override
+    public boolean canNavigateBackOnDPAD() {
+        return true;
+    }
+
     /**
      * Called when the TTS engine is initialized.
      */
@@ -283,9 +316,7 @@
         }
 
         mTts.setLanguage(defaultLocale);
-        if (evaluateDefaultLocale() && mSampleText == null) {
-            getSampleText();
-        }
+        evaluateDefaultLocale();
     }
 
     private boolean evaluateDefaultLocale() {
@@ -408,7 +439,7 @@
     }
 
     private void onSampleTextReceived(int resultCode, Intent data) {
-        String sample = getDefaultSampleString();
+        String sample = null;
 
         if (resultCode == TextToSpeech.LANG_AVAILABLE && data != null) {
             if (data.getStringExtra("sampleText") != null) {
@@ -418,16 +449,19 @@
         } else {
             if (DBG) Log.d(TAG, "Using default sample text :" + sample);
         }
-
-        mSampleText = sample;
-        if (mSampleText != null) {
-            updateWidgetState(true);
-        } else {
-            Log.e(TAG, "Did not have a sample string for the requested language. Using default");
+        if (sample == null) {
+            sample = getDefaultSampleString();
         }
+        mSampleText = sample;
+        // The sample text is only requested (and thus received) when calling speakSampleText().
+        // We need to call the method again if the text was previously not available.
+        speakSampleText();
     }
 
     private void speakSampleText() {
+        if (mSampleText == null && evaluateDefaultLocale()) {
+            getSampleText();
+        }
         final boolean networkRequired = isNetworkRequiredForSynthesis();
         if (!networkRequired ||
                 mTts.isLanguageAvailable(mCurrentDefaultLocale) >= TextToSpeech.LANG_AVAILABLE) {
@@ -600,9 +634,7 @@
             // Set mAvailableStrLocals to empty list
             mAvailableStrLocals = new ArrayList<>();
         }
-        if (evaluateDefaultLocale()) {
-            getSampleText();
-        }
+        evaluateDefaultLocale();
 
         final TextToSpeech.EngineInfo engineInfo = mEnginesHelper.getEngineInfo(engine);
         TtsEngineSettingsFragment.prepareArgs(mEngineSettingsPref.getExtras(),
diff --git a/Settings/src/com/android/tv/settings/system/locale/LanguagePickerFragment.java b/Settings/src/com/android/tv/settings/system/locale/LanguagePickerFragment.java
index 274811a..817fa69 100644
--- a/Settings/src/com/android/tv/settings/system/locale/LanguagePickerFragment.java
+++ b/Settings/src/com/android/tv/settings/system/locale/LanguagePickerFragment.java
@@ -181,11 +181,12 @@
             Preference pref = getPreferenceScreen().getPreference(i);
             LocaleStore.LocaleInfo localeInfo = (LocaleStore.LocaleInfo)
                     pref.getExtras().getSerializable(KEY_LOCALE_INFO);
-                if (localeInfo.getLocale() != null
-                        && localeInfo.getLocale().getLanguage().equals(
-                                currentLocale.getLanguage())) {
+                final Locale locale = localeInfo.getLocale();
+                if (locale != null
+                        && locale.getLanguage().equals(currentLocale.getLanguage())
+                        && locale.getScript().equals(currentLocale.getScript())) {
                     if (DEBUG) {
-                        Log.d(TAG, "Scroll to active locale: " + localeInfo.getLocale());
+                        Log.d(TAG, "Scroll to active locale: " + locale);
                     }
                     mHandler.post(() -> scrollToPreference(pref));
                 }
diff --git a/Settings/src/com/android/tv/settings/vendor/DisplayPreviewFragment.java b/Settings/src/com/android/tv/settings/vendor/DisplayPreviewFragment.java
index 85e18ae..9503d62 100644
--- a/Settings/src/com/android/tv/settings/vendor/DisplayPreviewFragment.java
+++ b/Settings/src/com/android/tv/settings/vendor/DisplayPreviewFragment.java
@@ -49,6 +49,7 @@
         DisplayManager.DisplayListener {
     private DisplayManager mDisplayManager;
     private Display.Mode mCurrentMode = null;
+    private Display mDisplay = null;
     private static final String KEY_RESOLUTION_TITLE = "resolution_selection";
     private static final String KEY_MATCH_CONTENT_FRAME_RATE = "match_content_frame_rate";
     private static final String KEY_RESOLUTION_SELECTION = "resolution_selection";
@@ -69,9 +70,8 @@
             );
         }
         mDisplayManager = getDisplayManager();
-        Display display = mDisplayManager.getDisplay(Display.DEFAULT_DISPLAY);
-        if (display.getSystemPreferredDisplayMode() != null) {
-            mDisplayManager.registerDisplayListener(this, null);
+        mDisplay = mDisplayManager.getDisplay(Display.DEFAULT_DISPLAY);
+        if (mDisplay.getSystemPreferredDisplayMode() != null) {
             mCurrentMode = mDisplayManager.getGlobalUserPreferredDisplayMode();
             updateResolutionTitleDescription(ResolutionSelectionUtils.modeToString(
                     mCurrentMode, getContext()));
@@ -121,6 +121,14 @@
     }
 
     @Override
+    public void onStart() {
+        super.onStart();
+        if (mDisplay.getSystemPreferredDisplayMode() != null) {
+            mDisplayManager.registerDisplayListener(this, null);
+        }
+    }
+
+    @Override
     public void onResume() {
         SwitchPreference dynamicRangePreference = findPreference(KEY_DYNAMIC_RANGE);
         if (dynamicRangePreference != null) {
@@ -129,6 +137,14 @@
         super.onResume();
     }
 
+    @Override
+    public void onStop() {
+        super.onStop();
+        if (mDisplay.getSystemPreferredDisplayMode() != null) {
+            mDisplayManager.unregisterDisplayListener(this);
+        }
+    }
+
     private void updateResolutionTitleDescription(String summary) {
         Preference titlePreference = findPreference(KEY_RESOLUTION_TITLE);
         if (titlePreference != null) {
diff --git a/Settings/src/com/android/tv/settings/widget/AccessPointPreference.java b/Settings/src/com/android/tv/settings/widget/AccessPointPreference.java
index 07b07e9..8d9b9d0 100644
--- a/Settings/src/com/android/tv/settings/widget/AccessPointPreference.java
+++ b/Settings/src/com/android/tv/settings/widget/AccessPointPreference.java
@@ -21,9 +21,9 @@
 import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
 
+import com.android.tv.settings.R;
 import com.android.tv.settings.library.network.AccessPoint;
 import com.android.tv.settings.library.network.AccessPoint.Speed;
-import com.android.tv.settings.R;
 
 public class AccessPointPreference extends Preference {
 
@@ -105,7 +105,6 @@
     mBadgeCache = cache;
     mAccessPoint = accessPoint;
     mForSavedNetworks = forSavedNetworks;
-    mAccessPoint.setTag(this);
     mLevel = level;
     mDefaultIconResId = iconResId;
     mFrictionSld = frictionSld;
diff --git a/Settings/tests/robotests/Android.bp b/Settings/tests/robotests/Android.bp
index 72ce36b..a57e039 100644
--- a/Settings/tests/robotests/Android.bp
+++ b/Settings/tests/robotests/Android.bp
@@ -20,7 +20,7 @@
     ],
 
     libs: ["services.core"],
-    
+
     static_libs: [
         "Robolectric_shadows_androidx_fragment_upstream",
         "Settings_robolectric_meta_service_file",
@@ -35,6 +35,8 @@
     test_options: {
         timeout: 36000,
     },
-    
+
     upstream: true,
+
+    strict_mode: false,
 }
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/connectivity/NetworkChangeContentProviderTest.java b/Settings/tests/robotests/src/com/android/tv/settings/connectivity/NetworkChangeContentProviderTest.java
new file mode 100644
index 0000000..b1cff8b
--- /dev/null
+++ b/Settings/tests/robotests/src/com/android/tv/settings/connectivity/NetworkChangeContentProviderTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2024 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
+ */
+package com.android.tv.settings.connectivity;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+/**
+ * Tests for {@link NetworkChangeContentProvider}.
+ */
+@RunWith(RobolectricTestRunner.class)
+public class NetworkChangeContentProviderTest {
+
+    private NetworkChangeContentProvider mContentProvider;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mContentProvider = new NetworkChangeContentProvider();
+        mContentProvider.attachInfo(mContext, null);
+    }
+
+    @Test
+    public void onCreate_defaultState_returnsTrue() {
+        assertThat(mContentProvider.onCreate()).isTrue();
+    }
+
+    @Test
+    public void query_currentNetworkCount_returnsInt() {
+        mContext.getSharedPreferences(NetworkChangeDetectionConfigs.SHARED_PREFERENCES_NAME,
+                Context.MODE_PRIVATE).edit().putInt(NetworkChangeDetectionConfigs.PREFERENCE_KEY,
+                1).commit();
+        Uri contentUri = Uri.parse(
+                "content://" + NetworkChangeDetectionConfigs.AUTHORITY + "/"
+                        + NetworkChangeDetectionConfigs.PREFERENCE_KEY);
+        Cursor cursor =
+                mContentProvider.query(
+                        contentUri,
+                        /* projection= */ null,
+                        /* selection= */ null,
+                        /* selectionArgs= */ null,
+                        /* sortOrder= */ null);
+
+        assertThat(cursor).isNotNull();
+        assertThat(cursor.getCount()).isEqualTo(1);
+        assertThat(cursor.getColumnCount()).isEqualTo(1);
+        assertThat(cursor.moveToFirst()).isTrue();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void query_incorrectContentUri_returnsNull() throws IllegalArgumentException {
+        String wrongKey = "wrong_test_key";
+        Uri contentUri = Uri.parse(
+                "content://" + NetworkChangeDetectionConfigs.AUTHORITY + "/" + wrongKey);
+
+        Cursor cursor =
+                mContentProvider.query(
+                        contentUri,
+                        /* projection= */ null,
+                        /* selection= */ null,
+                        /* selectionArgs= */ null,
+                        /* sortOrder= */ null);
+
+        assertThat(cursor).isNull();
+    }
+}
+
diff --git a/SettingsAPI/java/com/android/tv/settings/library/network/AccessPoint.java b/SettingsAPI/java/com/android/tv/settings/library/network/AccessPoint.java
index ceaab7a..38ffd13 100644
--- a/SettingsAPI/java/com/android/tv/settings/library/network/AccessPoint.java
+++ b/SettingsAPI/java/com/android/tv/settings/library/network/AccessPoint.java
@@ -32,8 +32,6 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.util.Map;
-import java.util.WeakHashMap;
 
 public class AccessPoint implements Comparable<AccessPoint> {
     public static final int SECURITY_NONE = WifiEntry.SECURITY_NONE;
@@ -71,8 +69,6 @@
         int VERY_FAST = 30;
     }
 
-    private static final Map<WifiEntry, Object> sTagMap = new WeakHashMap<>();
-
     private final WifiEntry mWifiEntry;
 
     private final WifiEntry.WifiEntryCallback mEntryCallback = new WifiEntry.WifiEntryCallback() {
@@ -214,14 +210,6 @@
         return mWifiEntry.isSaved();
     }
 
-    public Object getTag() {
-        return sTagMap.get(mWifiEntry);
-    }
-
-    public void setTag(Object tag) {
-        sTagMap.put(mWifiEntry, tag);
-    }
-
     public void setListener(AccessPoint.AccessPointListener listener) {
         mAccessPointListener = listener;
         mWifiEntry.setListener(listener != null ? mEntryCallback : null);
diff --git a/SettingsAPI/java/com/android/tv/settings/library/network/NetworkState.java b/SettingsAPI/java/com/android/tv/settings/library/network/NetworkState.java
index d2af992..a2051ef 100644
--- a/SettingsAPI/java/com/android/tv/settings/library/network/NetworkState.java
+++ b/SettingsAPI/java/com/android/tv/settings/library/network/NetworkState.java
@@ -58,8 +58,6 @@
     private static final String KEY_ETHERNET_STATUS = "ethernet_status";
     private static final String KEY_ETHERNET_PROXY = "ethernet_proxy";
     private static final String KEY_ETHERNET_DHCP = "ethernet_dhcp";
-    private static final String KEY_DATA_SAVER_SLICE = "data_saver_slice";
-    private static final String KEY_DATA_ALERT_SLICE = "data_alert_slice";
     private static final String KEY_NETWORK_DIAGNOSTICS = "network_diagnostics";
     private static final String NETWORK_DIAGNOSTICS_ACTION =
             "com.android.tv.settings.network.NETWORK_DIAGNOSTICS";
@@ -112,8 +110,6 @@
         mEthernetProxyPref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_ETHERNET_PROXY);
         mWifiNetworkCategoryPref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_WIFI_LIST);
         mWifiNetworkCategoryPref.setType(PreferenceCompat.TYPE_PREFERENCE_COLLAPSE_CATEGORY);
-        mDataSaverSlicePref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_DATA_SAVER_SLICE);
-        mDataAlertSlicePref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_DATA_ALERT_SLICE);
         mNetworkDiagnosticsPref = mPreferenceCompatManager.getOrCreatePrefCompat(
                 KEY_NETWORK_DIAGNOSTICS);
         Intent networkDiagnosticsIntent = makeNetworkDiagnosticsIntent();
diff --git a/SettingsAPI/lint-baseline.xml b/SettingsAPI/lint-baseline.xml
index bdcfc16..aa81cf0 100644
--- a/SettingsAPI/lint-baseline.xml
+++ b/SettingsAPI/lint-baseline.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.0.0-dev" type="baseline" dependencies="true" variant="all" version="8.0.0-dev">
+<issues format="6" by="lint 8.4.0-alpha01" type="baseline" client="" dependencies="true" name="" variant="all" version="8.4.0-alpha01">
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 34 (current min is 31): `android.os.UserManager#isAdminUser`"
+        errorLine1="        if (mUm.isAdminUser()) {"
+        errorLine2="                ~~~~~~~~~~~">
+        <location
+            file="packages/apps/TvSettings/SettingsAPI/java/com/android/tv/settings/library/about/AboutState.java"
+            line="207"
+            column="17"/>
+    </issue>
 
     <issue
         id="NewApi"
@@ -25,24 +36,24 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 34 (current min is 31): `android.os.UserManager#isAdminUser`"
-        errorLine1="        if (!mUm.isAdminUser()) {"
-        errorLine2="                 ~~~~~~~~~~~">
+        message="Call requires version 3 of the U Extensions SDK (current min is 0): `android.net.IpConfiguration#getIpAssignment`"
+        errorLine1="                    wifiConfiguration.getIpConfiguration().getIpAssignment();"
+        errorLine2="                                                           ~~~~~~~~~~~~~~~">
         <location
-            file="packages/apps/TvSettings/SettingsAPI/java/com/android/tv/settings/library/system/DevelopmentState.java"
-            line="260"
-            column="18"/>
+            file="packages/apps/TvSettings/SettingsAPI/java/com/android/tv/settings/library/network/IpSettingsPreferenceController.java"
+            line="61"
+            column="60"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 34 (current min is 31): `android.os.UserManager#isAdminUser`"
-        errorLine1="        if (mUm.isAdminUser()) {"
-        errorLine2="                ~~~~~~~~~~~">
+        message="Call requires version 3 of the U Extensions SDK (current min is 0): `android.net.IpConfiguration#getProxySettings`"
+        errorLine1="                    wifiConfiguration.getIpConfiguration().getProxySettings();"
+        errorLine2="                                                           ~~~~~~~~~~~~~~~~">
         <location
-            file="packages/apps/TvSettings/SettingsAPI/java/com/android/tv/settings/library/about/AboutState.java"
-            line="207"
-            column="17"/>
+            file="packages/apps/TvSettings/SettingsAPI/java/com/android/tv/settings/library/network/ProxySettingsPreferenceController.java"
+            line="62"
+            column="60"/>
     </issue>
 
 </issues>
\ No newline at end of file
diff --git a/TwoPanelSettingsLib/Android.bp b/TwoPanelSettingsLib/Android.bp
index c4390aa..4ea6d7a 100644
--- a/TwoPanelSettingsLib/Android.bp
+++ b/TwoPanelSettingsLib/Android.bp
@@ -19,9 +19,6 @@
     srcs: [
         ":statslog-tvsettings-java-gen",
     ],
-    lint: {
-        baseline_filename: "lint-baseline.xml",
-    },
 }
 
 android_library {
@@ -52,11 +49,10 @@
         "androidx.lifecycle_lifecycle-common-java8",
         "androidx.cardview_cardview",
         "statslog-tvsettings",
-        "TvSettingsAPI"
+        "TvSettingsAPI",
     ],
-    lint: {
-        baseline_filename: "lint-baseline.xml",
-    },
+    // TODO(b/319716205): re-enable use_resource_processor
+    use_resource_processor: false,
 }
 
 // For the test package.
diff --git a/TwoPanelSettingsLib/lint-baseline.xml b/TwoPanelSettingsLib/lint-baseline.xml
deleted file mode 100644
index 6f372c4..0000000
--- a/TwoPanelSettingsLib/lint-baseline.xml
+++ /dev/null
@@ -1,455 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.content.Context#getSystemService`"
-        errorLine1="            ctx.getSystemService(SliceManager.class).grantPermissionFromUser("
-        errorLine2="                ~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/ContextSingleton.java"
-            line="69"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.content.Context#getSystemService`"
-        errorLine1="            ctx.getSystemService(SliceManager.class).grantPermissionFromUser("
-        errorLine2="                ~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/ContextSingleton.java"
-            line="69"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Class requires API level 28 (current min is 21): `android.app.slice.SliceManager`"
-        errorLine1="            ctx.getSystemService(SliceManager.class).grantPermissionFromUser("
-        errorLine2="                                 ~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/ContextSingleton.java"
-            line="69"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Class requires API level 28 (current min is 21): `android.app.slice.SliceManager`"
-        errorLine1="            ctx.getSystemService(SliceManager.class).grantPermissionFromUser("
-        errorLine2="                                 ~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/ContextSingleton.java"
-            line="69"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.content.Context#getSystemService`"
-        errorLine1="            ctx.getSystemService(SliceManager.class).grantPermissionFromUser("
-        errorLine2="                ~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/ContextSingleton.java"
-            line="82"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.content.Context#getSystemService`"
-        errorLine1="            ctx.getSystemService(SliceManager.class).grantPermissionFromUser("
-        errorLine2="                ~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/ContextSingleton.java"
-            line="82"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Class requires API level 28 (current min is 21): `android.app.slice.SliceManager`"
-        errorLine1="            ctx.getSystemService(SliceManager.class).grantPermissionFromUser("
-        errorLine2="                                 ~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/ContextSingleton.java"
-            line="82"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Class requires API level 28 (current min is 21): `android.app.slice.SliceManager`"
-        errorLine1="            ctx.getSystemService(SliceManager.class).grantPermissionFromUser("
-        errorLine2="                                 ~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/ContextSingleton.java"
-            line="82"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.graphics.drawable.LayerDrawable#setLayerGravity`"
-        errorLine1="        compoundDrawable.setLayerGravity(0, Gravity.CENTER);"
-        errorLine2="                         ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/IconUtil.java"
-            line="54"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.graphics.drawable.LayerDrawable#setLayerGravity`"
-        errorLine1="        compoundDrawable.setLayerGravity(0, Gravity.CENTER);"
-        errorLine2="                         ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/IconUtil.java"
-            line="54"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.graphics.drawable.LayerDrawable#setLayerGravity`"
-        errorLine1="        compoundDrawable.setLayerGravity(1, Gravity.CENTER);"
-        errorLine2="                         ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/IconUtil.java"
-            line="55"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.graphics.drawable.LayerDrawable#setLayerGravity`"
-        errorLine1="        compoundDrawable.setLayerGravity(1, Gravity.CENTER);"
-        errorLine2="                         ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/IconUtil.java"
-            line="55"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.graphics.drawable.Icon#loadDrawable`"
-        errorLine1="            infoImage.setImageDrawable(image.loadDrawable(getContext()));"
-        errorLine2="                                             ~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/InfoFragment.java"
-            line="69"
-            column="46"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.graphics.drawable.Icon#loadDrawable`"
-        errorLine1="            infoImage.setImageDrawable(image.loadDrawable(getContext()));"
-        errorLine2="                                             ~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/InfoFragment.java"
-            line="69"
-            column="46"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.graphics.drawable.Icon#loadDrawable`"
-        errorLine1="            infoIcon.setImageDrawable(titleIcon.loadDrawable(getContext()));"
-        errorLine2="                                                ~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/InfoFragment.java"
-            line="72"
-            column="49"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.graphics.drawable.Icon#loadDrawable`"
-        errorLine1="            infoIcon.setImageDrawable(titleIcon.loadDrawable(getContext()));"
-        errorLine2="                                                ~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/InfoFragment.java"
-            line="72"
-            column="49"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 26 (current min is 21): `setTtl`"
-        errorLine1="        mImpl.setTtl(ttl);"
-        errorLine2="              ~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/builders/PreferenceSliceBuilder.java"
-            line="111"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 26 (current min is 21): `setTtl`"
-        errorLine1="        mImpl.setTtl(ttl);"
-        errorLine2="              ~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/builders/PreferenceSliceBuilder.java"
-            line="111"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Cast from `Icon` to `Parcelable` requires API level 23 (current min is 21)"
-        errorLine1="        outState.putParcelable(KEY_SCREEN_ICON, mScreenIcon);"
-        errorLine2="                                                ~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SliceFragment.java"
-            line="518"
-            column="49"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Cast from `Icon` to `Parcelable` requires API level 23 (current min is 21)"
-        errorLine1="        outState.putParcelable(KEY_SCREEN_ICON, mScreenIcon);"
-        errorLine2="                                                ~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SliceFragment.java"
-            line="518"
-            column="49"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.graphics.drawable.Icon#loadDrawable`"
-        errorLine1="            decorIcon.setImageDrawable(icon.loadDrawable(mContextThemeWrapper));"
-        errorLine2="                                            ~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SliceFragment.java"
-            line="599"
-            column="45"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.graphics.drawable.Icon#loadDrawable`"
-        errorLine1="            decorIcon.setImageDrawable(icon.loadDrawable(mContextThemeWrapper));"
-        errorLine2="                                            ~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SliceFragment.java"
-            line="599"
-            column="45"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.graphics.drawable.Icon#loadDrawable`"
-        errorLine1="                Drawable iconDrawable = icon.loadDrawable(contextThemeWrapper);"
-        errorLine2="                                             ~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SlicePreferencesUtil.java"
-            line="179"
-            column="46"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.graphics.drawable.Icon#loadDrawable`"
-        errorLine1="                Drawable iconDrawable = icon.loadDrawable(contextThemeWrapper);"
-        errorLine2="                                             ~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SlicePreferencesUtil.java"
-            line="179"
-            column="46"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `toIcon`"
-        errorLine1="                b.putParcelable(EXTRA_PREFERENCE_INFO_IMAGE, infoImage.toIcon());"
-        errorLine2="                                                                       ~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SlicePreferencesUtil.java"
-            line="216"
-            column="72"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `toIcon`"
-        errorLine1="                b.putParcelable(EXTRA_PREFERENCE_INFO_IMAGE, infoImage.toIcon());"
-        errorLine2="                                                                       ~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SlicePreferencesUtil.java"
-            line="216"
-            column="72"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Cast from `Icon` to `Parcelable` requires API level 23 (current min is 21)"
-        errorLine1="                b.putParcelable(EXTRA_PREFERENCE_INFO_IMAGE, infoImage.toIcon());"
-        errorLine2="                                                             ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SlicePreferencesUtil.java"
-            line="216"
-            column="62"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Cast from `Icon` to `Parcelable` requires API level 23 (current min is 21)"
-        errorLine1="                b.putParcelable(EXTRA_PREFERENCE_INFO_IMAGE, infoImage.toIcon());"
-        errorLine2="                                                             ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SlicePreferencesUtil.java"
-            line="216"
-            column="62"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `toIcon`"
-        errorLine1="                b.putParcelable(EXTRA_PREFERENCE_INFO_TITLE_ICON, infoTitleIcon.toIcon());"
-        errorLine2="                                                                                ~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SlicePreferencesUtil.java"
-            line="219"
-            column="81"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `toIcon`"
-        errorLine1="                b.putParcelable(EXTRA_PREFERENCE_INFO_TITLE_ICON, infoTitleIcon.toIcon());"
-        errorLine2="                                                                                ~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SlicePreferencesUtil.java"
-            line="219"
-            column="81"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Cast from `Icon` to `Parcelable` requires API level 23 (current min is 21)"
-        errorLine1="                b.putParcelable(EXTRA_PREFERENCE_INFO_TITLE_ICON, infoTitleIcon.toIcon());"
-        errorLine2="                                                                  ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SlicePreferencesUtil.java"
-            line="219"
-            column="67"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Cast from `Icon` to `Parcelable` requires API level 23 (current min is 21)"
-        errorLine1="                b.putParcelable(EXTRA_PREFERENCE_INFO_TITLE_ICON, infoTitleIcon.toIcon());"
-        errorLine2="                                                                  ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SlicePreferencesUtil.java"
-            line="219"
-            column="67"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `toIcon`"
-        errorLine1="                return icon.toIcon();"
-        errorLine2="                            ~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SlicePreferencesUtil.java"
-            line="480"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `toIcon`"
-        errorLine1="                return icon.toIcon();"
-        errorLine2="                            ~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SlicePreferencesUtil.java"
-            line="480"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 28 (current min is 21): `android.view.View#setAccessibilityPaneTitle`"
-        errorLine1="                    .setAccessibilityPaneTitle(newA11yTitle);"
-        errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java"
-            line="330"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 28 (current min is 21): `android.view.View#setAccessibilityPaneTitle`"
-        errorLine1="                    .setAccessibilityPaneTitle(newA11yTitle);"
-        errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java"
-            line="330"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.graphics.drawable.Icon#createWithResource`"
-        errorLine1="                Icon.createWithResource(getContext(), R.drawable.slice_error_icon));"
-        errorLine2="                     ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java"
-            line="1034"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.graphics.drawable.Icon#createWithResource`"
-        errorLine1="                Icon.createWithResource(getContext(), R.drawable.slice_error_icon));"
-        errorLine2="                     ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java"
-            line="1034"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Cast from `Icon` to `Parcelable` requires API level 23 (current min is 21)"
-        errorLine1="                Icon.createWithResource(getContext(), R.drawable.slice_error_icon));"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java"
-            line="1034"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Cast from `Icon` to `Parcelable` requires API level 23 (current min is 21)"
-        errorLine1="                Icon.createWithResource(getContext(), R.drawable.slice_error_icon));"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java"
-            line="1034"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="`android:trackTint` requires API level 23 (current min is 21)"
-        errorLine1="        &lt;item name=&quot;android:trackTint&quot;>@drawable/switch_track&lt;/item>"
-        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TvSettings/TwoPanelSettingsLib/res/values/themes.xml"
-            line="30"
-            column="15"/>
-    </issue>
-
-</issues>
diff --git a/TwoPanelSettingsLib/res/layout/info_fragment.xml b/TwoPanelSettingsLib/res/layout/info_fragment.xml
index 34f3745..527c628 100644
--- a/TwoPanelSettingsLib/res/layout/info_fragment.xml
+++ b/TwoPanelSettingsLib/res/layout/info_fragment.xml
@@ -93,7 +93,7 @@
             android:layout_alignWithParentIfMissing="true"
             android:focusable="false"
             android:importantForAccessibility="yes"
-            android:maxLines="12"
+            android:maxLines="34"
             android:ellipsize="end"
             style="@style/TwoPanelInfoSummaryTextStyle"/>
 
diff --git a/TwoPanelSettingsLib/res/values/themes.xml b/TwoPanelSettingsLib/res/values/themes.xml
index 15dc777..ab8da9a 100644
--- a/TwoPanelSettingsLib/res/values/themes.xml
+++ b/TwoPanelSettingsLib/res/values/themes.xml
@@ -27,7 +27,9 @@
         <item name="android:imageButtonStyle">@style/TwoPanelPreferenceIconStyle</item>
         <item name="android:colorControlNormal">#FF808080</item>
         <item name="android:thumbTint">@drawable/switch_thumb</item>
+        <item name="thumbTint">@drawable/switch_thumb</item><!-- For SwitchPreferenceCompat -->
         <item name="android:trackTint">@drawable/switch_track</item>
+        <item name="trackTint">@drawable/switch_track</item><!-- For SwitchPreferenceCompat -->
         <item name="android:listPreferredItemPaddingStart">20dp</item>
         <item name="android:listPreferredItemPaddingEnd">20dp</item>
     </style>
diff --git a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/SettingsPreferenceFragmentBase.java b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/SettingsPreferenceFragmentBase.java
index 10d77ec..761010d 100644
--- a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/SettingsPreferenceFragmentBase.java
+++ b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/SettingsPreferenceFragmentBase.java
@@ -22,6 +22,7 @@
 import androidx.annotation.NonNull;
 
 import com.android.tv.settings.library.instrumentation.InstrumentedPreferenceFragment;
+import androidx.leanback.preference.LeanbackPreferenceFragmentCompat;
 
 /**
  * Child preference fragment should extend this class to make two panel settings functionality work,
@@ -29,8 +30,8 @@
  */
 public abstract class SettingsPreferenceFragmentBase extends InstrumentedPreferenceFragment {
     @Override
-    public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
+    public void onResume() {
+        super.onResume();
         if (getCallbackFragment() instanceof TwoPanelSettingsFragment) {
             TwoPanelSettingsFragment parentFragment =
                     (TwoPanelSettingsFragment) getCallbackFragment();
@@ -39,8 +40,8 @@
     }
 
     @Override
-    public void onDestroyView() {
-        super.onDestroyView();
+    public void onPause() {
+        super.onPause();
         if (getCallbackFragment() instanceof TwoPanelSettingsFragment) {
             TwoPanelSettingsFragment parentFragment =
                     (TwoPanelSettingsFragment) getCallbackFragment();
diff --git a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java
index 6d70fa7..0ecf6c5 100644
--- a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java
+++ b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java
@@ -39,7 +39,6 @@
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.transition.Fade;
-import android.util.ArrayMap;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -78,7 +77,6 @@
 import com.android.tv.twopanelsettings.slices.SliceSwitchPreference;
 import com.android.tv.twopanelsettings.slices.SlicesConstants;
 
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -125,8 +123,6 @@
     private Preference mFocusedPreference;
     private boolean mIsWaitingForUpdatingPreview = false;
     private AudioManager mAudioManager;
-    private final Map<VerticalGridView, OnChildViewHolderSelectedListenerTwoPanel>
-            mHasOnChildViewHolderSelectedListener = new ArrayMap<>();
 
     private static final String DELAY_MS = "delay_ms";
     private static final String CHECK_SCROLL_STATE = "check_scroll_state";
@@ -397,20 +393,10 @@
                 (LeanbackPreferenceFragmentCompat) fragment;
         VerticalGridView listView = (VerticalGridView) leanbackPreferenceFragment.getListView();
         if (listView != null) {
-            if (isAddingListener) {
-                if (!mHasOnChildViewHolderSelectedListener.containsKey(listView)) {
-                    OnChildViewHolderSelectedListenerTwoPanel listener =
-                            new OnChildViewHolderSelectedListenerTwoPanel(mPrefPanelIdx);
-                    listView.addOnChildViewHolderSelectedListener(listener);
-                    mHasOnChildViewHolderSelectedListener.put(listView, listener);
-                }
-            } else {
-                if (mHasOnChildViewHolderSelectedListener.containsKey(listView)) {
-                    listView.removeOnChildViewHolderSelectedListener(
-                            mHasOnChildViewHolderSelectedListener.get(listView));
-                    mHasOnChildViewHolderSelectedListener.remove(listView);
-                }
-            }
+            listView.setOnChildViewHolderSelectedListener(
+                    isAddingListener
+                            ? new OnChildViewHolderSelectedListenerTwoPanel(mPrefPanelIdx)
+                            : null);
         }
     }
 
diff --git a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SliceFragment.java b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SliceFragment.java
index 5e61bbb..5599e3c 100644
--- a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SliceFragment.java
+++ b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SliceFragment.java
@@ -74,8 +74,10 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * A screen presenting a slice in TV settings.
@@ -163,7 +165,6 @@
         this.setTitle(mScreenTitle);
         this.setSubtitle(mScreenSubtitle);
         this.setIcon(mScreenIcon);
-        this.getPreferenceScreen().removeAll();
 
         showProgressBar();
         if (!TextUtils.isEmpty(mUriString)) {
@@ -387,21 +388,18 @@
         // (c) Preference with key which does appear in the new list, but the preference has changed
         // ability to handle slices and needs to be replaced instead of re-used.
         int index = 0;
+        IdentityHashMap<Preference, Preference> newToOld = new IdentityHashMap<>();
         while (index < screen.getPreferenceCount()) {
             boolean needToRemoveCurrentPref = true;
             Preference oldPref = screen.getPreference(index);
-            if (oldPref != null && oldPref.getKey() != null) {
-                for (Preference newPref : newPrefs) {
-                    if (newPref.getKey() != null && newPref.getKey().equals(oldPref.getKey())
-                            && (newPref instanceof HasSliceUri)
-                            == (oldPref instanceof HasSliceUri)
-                            && (newPref instanceof EmbeddedSlicePreference)
-                            == (oldPref instanceof EmbeddedSlicePreference)) {
-                        needToRemoveCurrentPref = false;
-                        break;
-                    }
+            for (Preference newPref : newPrefs) {
+                if (isSamePreference(oldPref, newPref)) {
+                    needToRemoveCurrentPref = false;
+                    newToOld.put(newPref, oldPref);
+                    break;
                 }
             }
+
             if (needToRemoveCurrentPref) {
                 screen.removePreference(oldPref);
             } else {
@@ -420,61 +418,52 @@
         //Iterate the new preferences list and give each preference a correct order
         for (int i = 0; i < newPrefs.size(); i++) {
             Preference newPref = newPrefs.get(i);
-            boolean neededToAddNewPref = true;
             // If the newPref has a key and has a corresponding old preference, update the old
             // preference and give it a new order.
-            if (newPref.getKey() != null) {
-                for (int j = 0; j < screen.getPreferenceCount(); j++) {
-                    Preference oldPref = screen.getPreference(j);
-                    // EmbeddedSlicePreference has its own slice observer
-                    // (EmbeddedSlicePreferenceHelper). Should therefore not be updated by
-                    // slice observer in SliceFragment.
-                    // The order will however still need to be updated, as this can not be handled
-                    // by EmbeddedSlicePreferenceHelper.
-                    boolean allowUpdate = !(oldPref instanceof EmbeddedSlicePreference);
-                    boolean sameKey = oldPref.getKey() != null
-                            && oldPref.getKey().equals(newPref.getKey());
-                    if (sameKey) {
-                        if (allowUpdate) {
-                            oldPref.setIcon(newPref.getIcon());
-                            oldPref.setTitle(newPref.getTitle());
-                            oldPref.setSummary(newPref.getSummary());
-                            oldPref.setEnabled(newPref.isEnabled());
-                            oldPref.setSelectable(newPref.isSelectable());
-                            oldPref.setFragment(newPref.getFragment());
-                            oldPref.getExtras().putAll(newPref.getExtras());
-                            if ((oldPref instanceof HasSliceAction)
-                                    && (newPref instanceof HasSliceAction)) {
-                                ((HasSliceAction) oldPref)
-                                        .setSliceAction(
-                                                ((HasSliceAction) newPref).getSliceAction());
-                            }
-                            if ((oldPref instanceof HasSliceUri)
-                                    && (newPref instanceof HasSliceUri)) {
-                                ((HasSliceUri) oldPref)
-                                        .setUri(((HasSliceUri) newPref).getUri());
-                        }
-                        if ((oldPref instanceof HasCustomContentDescription)
-                                && (newPref instanceof HasCustomContentDescription)) {
-                            ((HasCustomContentDescription) oldPref).setContentDescription(
-                                    ((HasCustomContentDescription) newPref)
-                                            .getContentDescription());
-                            }
-                        }
 
-                        oldPref.setOrder(i);
-                        neededToAddNewPref = false;
-                        break;
-                    }
-                }
-            }
-            // If the newPref cannot find a corresponding old preference, or it does not have a key,
-            // add it to the screen with the correct order.
-            if (neededToAddNewPref) {
+            Preference oldPref = newToOld.get(newPref);
+            if (oldPref == null) {
                 newPref.setOrder(i);
                 screen.addPreference(newPref);
+                continue;
+            }
+
+            oldPref.setOrder(i);
+            if (oldPref instanceof EmbeddedSlicePreference) {
+                // EmbeddedSlicePreference has its own slice observer
+                // (EmbeddedSlicePreferenceHelper). Should therefore not be updated by
+                // slice observer in SliceFragment.
+                // The order will however still need to be updated, as this can not be handled
+                // by EmbeddedSlicePreferenceHelper.
+                continue;
+            }
+
+            oldPref.setIcon(newPref.getIcon());
+            oldPref.setTitle(newPref.getTitle());
+            oldPref.setSummary(newPref.getSummary());
+            oldPref.setEnabled(newPref.isEnabled());
+            oldPref.setSelectable(newPref.isSelectable());
+            oldPref.setFragment(newPref.getFragment());
+            oldPref.getExtras().putAll(newPref.getExtras());
+            if ((oldPref instanceof HasSliceAction)
+                    && (newPref instanceof HasSliceAction)) {
+                ((HasSliceAction) oldPref)
+                        .setSliceAction(
+                                ((HasSliceAction) newPref).getSliceAction());
+            }
+            if ((oldPref instanceof HasSliceUri)
+                    && (newPref instanceof HasSliceUri)) {
+                ((HasSliceUri) oldPref)
+                        .setUri(((HasSliceUri) newPref).getUri());
+            }
+            if ((oldPref instanceof HasCustomContentDescription)
+                    && (newPref instanceof HasCustomContentDescription)) {
+                ((HasCustomContentDescription) oldPref).setContentDescription(
+                        ((HasCustomContentDescription) newPref)
+                                .getContentDescription());
             }
         }
+
         //addPreference will reset the checked status of TwoStatePreference.
         //So we need to add them back
         for (int i = 0; i < screen.getPreferenceCount(); i++) {
@@ -499,6 +488,24 @@
         }
     }
 
+    private static boolean isSamePreference(Preference oldPref, Preference newPref) {
+        if (oldPref == null || newPref == null) {
+            return false;
+        }
+
+        if (newPref instanceof HasSliceUri != oldPref instanceof HasSliceUri) {
+            return false;
+        }
+
+        if (newPref instanceof EmbeddedSlicePreference) {
+            return oldPref instanceof EmbeddedSlicePreference
+                    && Objects.equals(((EmbeddedSlicePreference) newPref).getUri(),
+                    ((EmbeddedSlicePreference) oldPref).getUri());
+        }
+
+        return newPref.getKey() != null && newPref.getKey().equals(oldPref.getKey());
+    }
+
     @Override
     public void onPreferenceFocused(Preference preference) {
         setLastFocused(preference);
diff --git a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/lint-baseline.xml b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/lint-baseline.xml
index 3d2c1dd..96b4b06 100644
--- a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/lint-baseline.xml
+++ b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/lint-baseline.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">
+<issues format="6" by="lint 8.4.0-alpha01" type="baseline" client="" dependencies="true" name="" variant="all" version="8.4.0-alpha01">
 
     <issue
         id="NewApi"
-        message="Call requires API level 26 (current min is 21): `setTtl`">
+        message="Call requires API level 26 (current min is 21): `setTtl`"
+        errorLine1="        mImpl.setTtl(ttl);"
+        errorLine2="              ~~~~~~">
         <location
             file="packages/apps/TvSettings/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/builders/PreferenceSliceBuilder.java"
-            line="112"/>
+            line="112"
+            column="15"/>
     </issue>
 
 </issues>
\ No newline at end of file
diff --git a/unbundle/lint-baseline.xml b/unbundle/lint-baseline.xml
index 9648a7f..432e164 100644
--- a/unbundle/lint-baseline.xml
+++ b/unbundle/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.0.0-dev" type="baseline" dependencies="true" variant="all" version="8.0.0-dev">
+<issues format="6" by="lint 8.4.0-alpha01" type="baseline" client="" dependencies="true" name="" variant="all" version="8.4.0-alpha01">
 
     <issue
         id="NewApi"